Update export.fish script

This commit is contained in:
ark-lamp-umbrella 2024-03-28 20:16:31 -07:00
parent ed40fa4e5f
commit b66ce68ece
Signed by: ark-lamp-umbrella
GPG Key ID: 15E48F7B97025652
2 changed files with 45 additions and 13 deletions

View File

@ -141,6 +141,7 @@ in
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11";
# BUG: Nix keeps complaining about xdg-portals
xdg.portal = {
enable = true;
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
@ -154,28 +155,34 @@ in
pkgs.bun
pkgs.elixir
pkgs.blender
pkgs.prismlauncher
pkgs.zulu17
pkgs.janet
pkgs.prismlauncher # Minecraft launcher
pkgs.zulu17 # Java 17 binary
pkgs.janet # Janet lang, for later testing
];
programs = {
vscode = {
enable = true;
# Allow Nix to handle these updates
enableUpdateCheck = false;
enableExtensionUpdateCheck = false;
package = pkgs.vscodium;
package = pkgs.vscodium; # Open-source binary
extensions = with pkgs.vscode-extensions; [
catppuccin.catppuccin-vsc
catppuccin.catppuccin-vsc-icons
jnoortheen.nix-ide
editorconfig.editorconfig
bmalehorn.vscode-fish
catppuccin.catppuccin-vsc # Catppuccin color schemes
catppuccin.catppuccin-vsc-icons # Catppuccin file icons
jnoortheen.nix-ide # Nix lang
editorconfig.editorconfig # Editorconfig linting
bmalehorn.vscode-fish # Fish shell support
];
userSettings = {
# Enable catppuccin theme
"workbench.colorTheme" = "Catppuccin Macchiato";
"workbench.iconTheme" = "catppuccin-macchiato";
# Set activityBar position (Files, Git, Extensions)
"workbench.activityBar.location" = "side";
# Hide top bar for nicer appearance
# Dropdown with alt
"window.menuBarVisibility" = "hidden";
# Use monospace nerd font
"editor.fontFamily" = "'BlexMono Nerd Font Mono', 'monospace', monospace";
};
};
@ -192,6 +199,7 @@ in
settings = {
add_newline = false;
format = lib.concatStrings [
"$elixir\n"
"$character"
];
character = {
@ -199,6 +207,9 @@ in
error_symbol = "󰔷 ~";
};
palette = "catppuccin_macchiato";
elixir = {
symbol = "";
};
} //
builtins.fromTOML (
builtins.readFile(

View File

@ -3,9 +3,30 @@
source scripts/shared.fish
if fish_is_root_user
cp -r "nixos/" "/etc/"
sudo nixos-rebuild switch
echo "[ERROR] Running with root permissions is not supported"
else
echo "[ERROR] No root access"
exit 0
read -sP "[INPUT] Root password: " rpass
echo "$rpass" | sudo -S cp -r "nixos/" "/etc/"
read -P "[INPUT] Trigger rebuild Y/n: " rebuild
if [ "$rebuild" = "" ]
set rebuild "y"
end
set rebuild "$(string lower $rebuild)"
if [ "$rebuild" = "y" ]
sudo nixos-rebuild switch
end
read -P "[INPUT] Git update Y/n: " gitpush
if [ "$gitpush" = "" ]
set gitpush "y"
end
set gitpush "$(string lower $gitpush)"
if [ "$gitpush" = "y" ]
read -P "[INPUT] Commit message: " cmessage
echo "[INFO] Adding to git"
git add .
echo "[INFO] Creating commit with message $cmessage"
git commit -m "$cmessage"
echo "[INFO] Pushing to external repository"
git push
end
end