暂存

bbb

@@ -1 +0,0 @@
-aaa

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"; };

modules/system/fileSystems/cluster.nix

@@ -3,8 +3,8 @@ inputs:
   config = inputs.lib.mkMerge
   [
     # for cluster master, export NFS
-    (inputs.lib.mkIf (inputs.config.nixos.model.cluster.nodeType or null == "master")
-      { nixos.services.nfs = { root = "/"; exports = [ "/nix/persistent/home" ]; accessLimit = "192.168.178.0/24"; }; })
+    (inputs.lib.mkIf true
+      { nixos.services.nfs = { root = "/"; exports = [ "/nix/persistent/home" ]; accessLimit = "127.0.0.0/8"; }; })
     # for cluster worker, mount nfs, disable some home manager files
     (inputs.lib.mkIf (inputs.config.nixos.model.cluster.nodeType or null == "worker")
     {
@@ -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);
     }
   ];
 }

modules/system/fileSystems/impermanence.nix

@@ -20,7 +20,12 @@ inputs:
       "/nix/rootfs/current" =
       {
         hideMounts = true;
-        directories = [ { directory = "/var/lib/docker"; mode = "0710"; } "/var/lib/flatpak" ]
+        directories =
+        [
+          # dummy option to make /nix/rootfs/current/home with correct permission
+          "/home"
+          { directory = "/var/lib/docker"; mode = "0710"; } "/var/lib/flatpak"
+        ]
           ++ builtins.map (f: "/var/lib/systemd/${f}") [ "linger" "coredump" "backlight" ];
       };
       "/nix/nodatacow" =