From ce0c2f52c90e64aea801ec28ad333ca476752286 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Sat, 4 Dec 2021 19:58:08 -0500
Subject: [PATCH] simplify bind mounts

---
 hosts/x86_64-linux/hp/default.nix     | 6 ++----
 hosts/x86_64-linux/lenny/default.nix  | 6 ++----
 hosts/x86_64-linux/nixdev/default.nix | 7 +++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/hosts/x86_64-linux/hp/default.nix b/hosts/x86_64-linux/hp/default.nix
index 844759b..9d693a5 100644
--- a/hosts/x86_64-linux/hp/default.nix
+++ b/hosts/x86_64-linux/hp/default.nix
@@ -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";
 }
diff --git a/hosts/x86_64-linux/lenny/default.nix b/hosts/x86_64-linux/lenny/default.nix
index 8b27c1c..1e00538 100644
--- a/hosts/x86_64-linux/lenny/default.nix
+++ b/hosts/x86_64-linux/lenny/default.nix
@@ -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";
 }
diff --git a/hosts/x86_64-linux/nixdev/default.nix b/hosts/x86_64-linux/nixdev/default.nix
index 1b801d2..afc6344 100644
--- a/hosts/x86_64-linux/nixdev/default.nix
+++ b/hosts/x86_64-linux/nixdev/default.nix
@@ -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";
 }