chore: Merge remote-tracking branch 'origin/modules2' into modules2

lib/modules/home/default.nix

@@ -45,7 +45,8 @@ in
         };
       };
 
-      config = {
+      config = lib.mkIf config.lyte.shell.enable {
+        programs.fish.enable = true;
         programs.helix.enable = true;
         programs.zellij.enable = true;
         programs.eza.enable = true;
@@ -1289,9 +1290,9 @@ in
         # zellij does not support modern terminal keyboard input:
         # https://github.com/zellij-org/zellij/issues/735
         programs.zellij = {
-          # enable = true;
-          # This causes fish to start zellij immediately
-          # enableFishIntegration = true;
+
+          # do not start immediately
+          enableFishIntegration = false;
 
           # uses home manager's toKDL generator
           settings = {

lib/modules/nixos/default-module.nix

@@ -10,6 +10,7 @@
   modulesPath,
   lib,
   config,
+  pkgs,
   ...
 }:
 {
@@ -92,6 +93,7 @@
 
     users.users.root = {
       openssh.authorizedKeys.keys = lib.mkDefault [ self.outputs.pubkey ];
+      shell = lib.mkIf config.lyte.shell.enable pkgs.fish;
     };
 
     services = {
@@ -177,6 +179,7 @@
       createHome = true;
       openssh.authorizedKeys.keys = [ self.outputs.pubkey ];
       group = "daniel";
+      shell = lib.mkIf config.lyte.shell.enable pkgs.fish;
       extraGroups = [
         "users"
         "wheel"