pud

config.local.nix

@@ -12,42 +12,20 @@
     termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font
     termSize = "24";
     termShell = "fish";
+
     shellAliases = {
       ls = "ls --color=auto";
       update = ''
-        if [[ $(uname) == "Darwin" ]]; then
+        sh -c '
-          sudo darwin-rebuild switch --flake ~/.config/nixos#macos
+          if [ "$(uname)" = "Darwin" ]; then
-        else
+            sudo darwin-rebuild switch --flake ~/.config/nixos#macos
-          sudo nixos-rebuild switch --flake ~/.config/nixos#desktop && home-manager switch --flake ~/.config/nixos#desktop
+          else
-        fi
+            sudo nixos-rebuild switch --flake ~/.config/nixos#desktop && home-manager switch --flake ~/.config/nixos#desktop
+          fi
+        '
       '';
       agu = "pkill gjs & ags run ~/.config/nixos/pkgs/ags/biscuit/app.ts & disown (jobs -p) &";
     };
-    fishAliases = {
-      shellAliases = {
-        ls = "ls --color=auto";
-      };
-
-      functions = {
-        update = {
-          body = ''
-            if test (uname) = "Darwin"
-              sudo darwin-rebuild switch --flake ~/.config/nixos#macos
-            else
-              sudo nixos-rebuild switch --flake ~/.config/nixos#desktop; and home-manager switch --flake ~/.config/nixos#desktop
-            end
-          '';
-        };
-
-        agu = {
-          body = ''
-            pkill gjs
-            ags run ~/.config/nixos/pkgs/ags/biscuit/app.ts &
-            disown (jobs -p)
-          '';
-        };
-      };
-    };
   };
 
   allowUnfree = true; # allows installation of commercial apps.

pkgs/fish/default.nix

@@ -12,7 +12,7 @@
       zoxide init fish | source
 
     '';
-    shellAliases = terminal.fishAliases;
+    shellAliases = terminal.shellAliases;
 
     plugins = with pkgs.fishPlugins; [
     ];