Rebase to flake parts #10

2026-05-15 00:24:13 -03:00
parent f02606902c
commit fba5a7a2aa
24 changed files with 565 additions and 83 deletions
@@ -19,6 +19,14 @@
        }) names
      );
      inboundUsersAttr = usersLib.inboundHostsAttr selected;
+
+      # HM configures fish in ~/.config/fish but no longer sets /etc/passwd or /etc/shells.
+      hmFishUsers =
+        if !hmAvailable then { }
+        else
+          lib.filterAttrs (
+            name: hmUser: (hmUser.programs.fish.enable or false) && builtins.elem name names
+          ) config.home-manager.users;
    in
    {
      config = lib.mkMerge [
@@ -46,6 +54,18 @@
          chiasson.ssh.inbound.enable = true;
          chiasson.ssh.inbound.userAuthorizedHosts = inboundUsersAttr;
        })
+        (lib.mkIf (hmFishUsers != { }) {
+          environment.shells = lib.mkAfter (
+            lib.mapAttrsToList (
+              _: hmUser: lib.getExe hmUser.programs.fish.package
+            ) hmFishUsers
+          );
+          users.users = lib.mapAttrs (
+            name: hmUser: {
+              shell = lib.mkForce (lib.getExe hmUser.programs.fish.package);
+            }
+          ) hmFishUsers;
+        })
      ];
    };
 }