simplify bind mounts

This commit is contained in:
Sean Buckley 2021-12-04 19:58:08 -05:00
parent 4f5ca30b2d
commit ce0c2f52c9
3 changed files with 7 additions and 12 deletions

View file

@ -36,10 +36,8 @@
"/nix" = { device = "zroot/locker/nix"; fsType = "zfs"; };
"/home" = { device = "zroot/locker/home"; fsType = "zfs"; };
"/boot" = { device = "/dev/disk/by-partlabel/EFI\\x20system\\x20partition"; fsType = "vfat"; };
}
// builtins.listToAttrs (map
(name: { inherit name; value = { device = "/nix/persist${name}"; noCheck = true; options = [ "bind" ]; }; })
[ "/var/log" ]);
"/var/log" = { device = "/nix/persist/var/log"; noCheck = true; options = [ "bind" ]; };
};
system.stateVersion = "21.05";
}

View file

@ -36,10 +36,8 @@
"/nix" = { device = "lenny/locker/nix"; fsType = "zfs"; };
"/home" = { device = "lenny/locker/home"; fsType = "zfs"; };
"/boot" = { device = "/dev/disk/by-partlabel/_esp"; fsType = "vfat"; };
}
// builtins.listToAttrs (map
(name: { inherit name; value = { device = "/nix/persist${name}"; noCheck = true; options = [ "bind" ]; }; })
[ "/var/log" ]);
"/var/log" = { device = "/nix/persist/var/log"; noCheck = true; options = [ "bind" ]; };
};
system.stateVersion = "21.11";
}

View file

@ -31,10 +31,9 @@
"/" = { device = "tmpfs"; fsType = "tmpfs"; options = [ "mode=755" ]; };
"/boot" = { device = "/dev/disk/by-partlabel/_esp"; fsType = "vfat"; options = [ "discard" "noatime" ]; };
"/nix" = { device = "/dev/disk/by-partlabel/_nix"; fsType = "ext4"; options = [ "discard" "noatime" ]; };
}
// builtins.listToAttrs (map
(name: { inherit name; value = { device = "/nix/persist${name}"; noCheck = true; options = [ "bind" ]; }; })
[ "/home" "/var/log" ]);
"/home" = { device = "/nix/persist/home"; noCheck = true; options = [ "bind" ]; };
"/var/log" = { device = "/nix/persist/var/log"; noCheck = true; options = [ "bind" ]; };
};
system.stateVersion = "21.05";
}