From 66917ab4d476fc5063be83ecf71ed8f62e40a4cc Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Mon, 11 Nov 2024 19:36:04 -0500 Subject: [PATCH] fix(nix): specify fish shell in sys.nix Signed-off-by: Lucas Sta Maria --- nix/hosts/framework/home.nix | 12 ------------ nix/hosts/framework/sys.nix | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/nix/hosts/framework/home.nix b/nix/hosts/framework/home.nix index 02f0ad2..448e6e2 100644 --- a/nix/hosts/framework/home.nix +++ b/nix/hosts/framework/home.nix @@ -190,18 +190,6 @@ }; }; - programs.fish = { - enable = true; - shellAliases = { - psax = "ps -ax | grep -i"; - ls = "eza"; - ll = "eza --all --long"; - e = "emacs"; - ed = "emacs --daemon"; - ec = ''emacsclient -n -c -a ""''; - }; - }; - programs.git = { enable = true; userName = "Lucas Sta Maria"; diff --git a/nix/hosts/framework/sys.nix b/nix/hosts/framework/sys.nix index e67cd8e..3cf4119 100644 --- a/nix/hosts/framework/sys.nix +++ b/nix/hosts/framework/sys.nix @@ -93,6 +93,7 @@ description = "Lucas"; extraGroups = [ "networkmanager" "wheel" "docker" ]; packages = with pkgs; [ ]; + shell = pkgs.fish; }; documentation.dev.enable = true; @@ -139,6 +140,18 @@ programs.steam.enable = true; programs.dconf.enable = true; + programs.fish = { + enable = true; + shellAliases = { + psax = "ps -ax | grep -i"; + ls = "eza"; + ll = "eza --all --long"; + e = "emacs"; + ed = "emacs --daemon"; + ec = ''emacsclient -n -c -a ""''; + }; + }; + programs.gnupg.agent = { enable = true; enableSSHSupport = true;