diff --git a/flake.nix b/flake.nix index fd317db5..6fa11bc7 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,7 @@ user = "xenia"; system = "x86_64-linux"; group = "users"; - shell = "fish"; + shell = "zsh"; systemModules = [ ./system/hyprland.nix ]; homeModules = [ ./home/accounts/default.nix @@ -183,7 +183,7 @@ ]; in { root = { - shell = pkgs.bash; + shell = pkgs.${shell}; openssh = { inherit authorizedKeys; }; }; ${user} = { diff --git a/home/default.nix b/home/default.nix index 11039ba0..29440bb0 100644 --- a/home/default.nix +++ b/home/default.nix @@ -3,8 +3,6 @@ { programs = { bash.enable = true; - bat.enable = true; - fish.enable = true; readline = { enable = true; includeSystemConfig = true; @@ -21,9 +19,9 @@ fzf = { enable = true; enableBashIntegration = true; - enableFishIntegration = true; enableZshIntegration = true; }; + bat.enable = true; git = { enable = true; package = pkgs.gitFull; @@ -90,7 +88,6 @@ starship = { enable = true; enableBashIntegration = true; - enableFishIntegration = true; enableZshIntegration = true; settings = { command_timeout = 1000;