1 files changed, 4 insertions, 53 deletions
diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix
index 077d25a6..fc20ef7c 100644
--- a/hosts/sif/hw.nix
+++ b/hosts/sif/hw.nix
@@ -12,59 +12,11 @@
        fsType = "bcachefs";
        neededForBoot = true;
      };
-    "/nix" =
+    "/var/lib/sops-nix".neededForBoot = true;
-      { device = "/.bcachefs/nix";
+    "/var/lib/systemd".neededForBoot = true;
-        fsType = "none";
-        options = [ "bind" ]; # "x-systemd.after=bcachefs.service" "x-systemd.requires=bcachefs.service" "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
-      };
-    "/root" =
-      { device = "/.bcachefs/root";
-        fsType = "none";
-        options = [ "bind" ]; # "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
-      };
-    "/var/log" =
-      { device = "/.bcachefs/var/log";
-        fsType = "none";
-        options = [ "bind" ]; # "x-systemd.after=bcachefs.service" "x-systemd.requires=bcachefs.service" "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
-      };
-    "/var/lib/sops-nix" =
-      { device = "/.bcachefs/var/lib/sops-nix";
-        fsType = "none";
-        options = [ "bind" ]; # "x-systemd.after=bcachefs.service" "x-systemd.requires=bcachefs.service" "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
-        neededForBoot = true;
-      };
-    "/var/lib/nixos" =
-      { device = "/.bcachefs/var/lib/nixos";
-        fsType = "none";
-        options = [ "bind" ]; # "x-systemd.after=bcachefs.service" "x-systemd.requires=bcachefs.service" "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
-      };
-    "/var/lib/chrony" =
-      { device = "/.bcachefs/var/lib/chrony";
-        fsType = "none";
-        options = [ "bind" ]; # "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
-      };
-    "/var/lib/fprint" =
-      { device = "/.bcachefs/var/lib/fprint";
-        fsType = "none";
-        options = [ "bind" ]; # "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
-      };
-    "/var/lib/systemd" =
-      { device = "/.bcachefs/var/lib/systemd";
-        fsType = "none";
-        options = [ "bind" ]; # "x-systemd.after=bcachefs.service" "x-systemd.requires=bcachefs.service" "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
-        neededForBoot = true;
-      };
-    "/home" =
-      { device = "/.bcachefs/home";
-        fsType = "none";
-        options = [ "bind" ]; # "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
-      };
-    "/etc/NetworkManager/system-connections" =
-      { device = "/.bcachefs/etc/NetworkManager/system-connections";
-        fsType = "none";
-        options = [ "bind" ]; # "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
-      };
  };
+  system.etc.overlay.enable = false;
+  systemd.sysusers.enable = false;
  # boot.initrd.supportedFilesystems.bcachefs = true;
  # boot.initrd.systemd.units."dev-sif-nvm0:-dev-sif-nvm1.device".enable = false;
@@ -91,7 +43,6 @@
  #   };
  # };
-  nix.settings.max-jobs = 12;
  # High-DPI console
  console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";

diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix index 077d25a6..fc20ef7c 100644 --- a/hosts/sif/hw.nix +++ b/hosts/sif/hw.nix
@@ -12,59 +12,11 @@
12	fsType = "bcachefs";	12	fsType = "bcachefs";
13	neededForBoot = true;	13	neededForBoot = true;
14	};	14	};
15	"/nix" =	15	"/var/lib/sops-nix".neededForBoot = true;
16	{ device = "/.bcachefs/nix";	16	"/var/lib/systemd".neededForBoot = true;
17	fsType = "none";
18	options = [ "bind" ]; # "x-systemd.after=bcachefs.service" "x-systemd.requires=bcachefs.service" "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
19	};
20	"/root" =
21	{ device = "/.bcachefs/root";
22	fsType = "none";
23	options = [ "bind" ]; # "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
24	};
25	"/var/log" =
26	{ device = "/.bcachefs/var/log";
27	fsType = "none";
28	options = [ "bind" ]; # "x-systemd.after=bcachefs.service" "x-systemd.requires=bcachefs.service" "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
29	};
30	"/var/lib/sops-nix" =
31	{ device = "/.bcachefs/var/lib/sops-nix";
32	fsType = "none";
33	options = [ "bind" ]; # "x-systemd.after=bcachefs.service" "x-systemd.requires=bcachefs.service" "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
34	neededForBoot = true;
35	};
36	"/var/lib/nixos" =
37	{ device = "/.bcachefs/var/lib/nixos";
38	fsType = "none";
39	options = [ "bind" ]; # "x-systemd.after=bcachefs.service" "x-systemd.requires=bcachefs.service" "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
40	};
41	"/var/lib/chrony" =
42	{ device = "/.bcachefs/var/lib/chrony";
43	fsType = "none";
44	options = [ "bind" ]; # "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
45	};
46	"/var/lib/fprint" =
47	{ device = "/.bcachefs/var/lib/fprint";
48	fsType = "none";
49	options = [ "bind" ]; # "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
50	};
51	"/var/lib/systemd" =
52	{ device = "/.bcachefs/var/lib/systemd";
53	fsType = "none";
54	options = [ "bind" ]; # "x-systemd.after=bcachefs.service" "x-systemd.requires=bcachefs.service" "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
55	neededForBoot = true;
56	};
57	"/home" =
58	{ device = "/.bcachefs/home";
59	fsType = "none";
60	options = [ "bind" ]; # "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
61	};
62	"/etc/NetworkManager/system-connections" =
63	{ device = "/.bcachefs/etc/NetworkManager/system-connections";
64	fsType = "none";
65	options = [ "bind" ]; # "x-systemd.after=\\x2ebcachefs.mount" "x-systemd.requires=\\x2ebcachefs.mount" ];
66	};
67	};	17	};
		18	system.etc.overlay.enable = false;
		19	systemd.sysusers.enable = false;
68		20
69	# boot.initrd.supportedFilesystems.bcachefs = true;	21	# boot.initrd.supportedFilesystems.bcachefs = true;
70	# boot.initrd.systemd.units."dev-sif-nvm0:-dev-sif-nvm1.device".enable = false;	22	# boot.initrd.systemd.units."dev-sif-nvm0:-dev-sif-nvm1.device".enable = false;
@@ -91,7 +43,6 @@
91	# };	43	# };
92	# };	44	# };
93		45
94	nix.settings.max-jobs = 12;
95	# High-DPI console	46	# High-DPI console
96	console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";	47	console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
97		48