diff --git a/config.local.nix b/config.local.nix index d675b38..6042dc6 100644 --- a/config.local.nix +++ b/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 - sudo darwin-rebuild switch --flake ~/.config/nixos#macos - else - sudo nixos-rebuild switch --flake ~/.config/nixos#desktop && home-manager switch --flake ~/.config/nixos#desktop - fi + sh -c ' + if [ "$(uname)" = "Darwin" ]; then + sudo darwin-rebuild switch --flake ~/.config/nixos#macos + else + 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. diff --git a/pkgs/fish/default.nix b/pkgs/fish/default.nix index 73402d1..c618985 100644 --- a/pkgs/fish/default.nix +++ b/pkgs/fish/default.nix @@ -12,7 +12,7 @@ zoxide init fish | source ''; - shellAliases = terminal.fishAliases; + shellAliases = terminal.shellAliases; plugins = with pkgs.fishPlugins; [ ];