From 6ede6e89b08d40687f6c88fd5108109506bcb4a0 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 9 Jun 2022 01:41:33 +0200
Subject: [PATCH] dacbert: move nfsroot, remove separate /nix/store mount

---
 hosts/dacbert/default.nix     | 2 +-
 hosts/rpi-netboot/default.nix | 7 +++++++
 modules/rpi-netboot.nix       | 7 -------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hosts/dacbert/default.nix b/hosts/dacbert/default.nix
index 46efb8bf..5b3d6229 100644
--- a/hosts/dacbert/default.nix
+++ b/hosts/dacbert/default.nix
@@ -33,7 +33,7 @@
   #   fkms-3d.enable = true;
   # };
   fileSystems."/" = {
-    device = "${hostRegistry.hosts.nix-build.ip4}:/var/lib/nfsroot/dacbert";
+    device = "${hostRegistry.hosts.nfsroot.ip4}:/var/lib/nfsroot/dacbert";
     fsType = "nfs";
     options = [ "nfsvers=3" "proto=tcp" "nolock" "hard" "async" "rw" ];
   };
diff --git a/hosts/rpi-netboot/default.nix b/hosts/rpi-netboot/default.nix
index 1b173ddf..972d4161 100644
--- a/hosts/rpi-netboot/default.nix
+++ b/hosts/rpi-netboot/default.nix
@@ -32,6 +32,13 @@
     firewall.enable = false;
   };
 
+  # mount the server's /nix/store
+  fileSystems."/nix/store" = {
+    device = "${hostRegistry.hosts.nix-build.ip4}:/nix/store";
+    fsType = "nfs";
+    options = [ "nfsvers=3" "proto=tcp" "nolock" "hard" "async" "ro" ];
+    neededForBoot = true;
+  };
   # volatile system: everything is tmpfs
   fileSystems."/" = {
     fsType = "tmpfs";
diff --git a/modules/rpi-netboot.nix b/modules/rpi-netboot.nix
index b0118da1..4b93f108 100644
--- a/modules/rpi-netboot.nix
+++ b/modules/rpi-netboot.nix
@@ -37,13 +37,6 @@
     tmpOnTmpfs = true;
   };
 
-  fileSystems."/nix/store" = {
-    device = "${hostRegistry.hosts.nix-build.ip4}:/nix/store";
-    fsType = "nfs";
-    options = [ "nfsvers=3" "proto=tcp" "nolock" "hard" "async" "ro" ];
-    neededForBoot = true;
-  };
-
   hardware.deviceTree.enable = true;
 
   environment.systemPackages = with pkgs; [