3 files changed, 7 insertions, 4 deletions
diff --git a/modules/by-name/fi/fish/module.nix b/modules/by-name/fi/fish/module.nix
index 42746c5c..d3ec97df 100644
--- a/modules/by-name/fi/fish/module.nix
+++ b/modules/by-name/fi/fish/module.nix
@@ -40,6 +40,9 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    # Ensure that the default shell of the user is actually enabled.
+    programs.fish.enable = true;
+
     home-manager.users.soispha = {
       home.sessionPath = lib.mkForce [];
 
diff --git a/modules/by-name/us/users/module.nix b/modules/by-name/us/users/module.nix
index 65b75d2e..d9097fe1 100644
--- a/modules/by-name/us/users/module.nix
+++ b/modules/by-name/us/users/module.nix
@@ -35,9 +35,6 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    # Ensure that the default shell of the user is actually enabled.
-    programs.zsh.enable = true;
-
     users = {
       mutableUsers = false;
 
@@ -46,7 +43,7 @@ in {
           isNormalUser = true;
           home = "/home/soispha";
           createHome = true;
-          shell = pkgs.zsh;
+          shell = config.home-manager.users.soispha.programs.fish.package;
           initialHashedPassword = cfg.hashedPassword;
           extraGroups = cfg.groups ++ lib.optional cfg.enableDeprecatedPlugdev "plugdev";
 
diff --git a/modules/by-name/zs/zsh/module.nix b/modules/by-name/zs/zsh/module.nix
index fee2eae3..cd2e917f 100644
--- a/modules/by-name/zs/zsh/module.nix
+++ b/modules/by-name/zs/zsh/module.nix
@@ -42,6 +42,9 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    # Ensure that the default shell of the user is actually enabled.
+    programs.zsh.enable = true;
+
     environment.variables = {
       ZDOTDIR = zDotDir;
     };