diff --git a/modules/packages/zsh/default.nix b/modules/packages/zsh/default.nix
index e76ae5f0..33d64b9d 100644
--- a/modules/packages/zsh/default.nix
+++ b/modules/packages/zsh/default.nix
@@ -27,6 +27,8 @@ inputs:
             plugins = [ "git" "colored-man-pages" "extract" "history-substring-search" "autojump" ];
             theme = inputs.lib.mkDefault "clean";
           };
+          # ensure ~/.zlogin exists
+          loginExtra = " ";
         };
         # set bash history file path, avoid overwriting zsh history
         bash = { enable = true; historyFile =  "${home-inputs.config.xdg.dataHome}/bash/bash_history"; };
diff --git a/modules/system/fileSystems/cluster.nix b/modules/system/fileSystems/cluster.nix
index 6345d0ac..379bd405 100644
--- a/modules/system/fileSystems/cluster.nix
+++ b/modules/system/fileSystems/cluster.nix
@@ -23,21 +23,18 @@ inputs:
             [ ".zshrc" ".zshenv" ".profile" ".bashrc" ".bash_profile" ".zlogin" ]);
         })
         inputs.config.nixos.user.users);
-      systemd.mounts = builtins.filter (mount: mount != null) (builtins.concatLists (builtins.map
+      systemd.mounts = builtins.concatLists (builtins.map
         (user: builtins.map
           (file:
-            let f = inputs.config.home-manager.users.${user}.config.home.file.${file}.source or null;
-            in if f == null then null else
-            {
-              what = "${f}";
-              where = "/home/${user}/${file}";
-              options = [ "bind" ];
-              wantedBy = [ "local-fs.target" ];
-            }
-          )
+          {
+            what = "${inputs.config.home-manager.users.${user}.home.file.${file}.source}";
+            where = "/home/${user}/${file}";
+            options = "bind";
+            wantedBy = [ "local-fs.target" ];
+          })
           [ ".zshrc" ".zshenv" ".profile" ".bashrc" ".bash_profile" ".zlogin" ]
         )
-        inputs.config.nixos.user.users));
+        inputs.config.nixos.user.users);
     }
   ];
 }