Update files

hardware/mounts.nix

@@ -1,47 +1,10 @@
-{ pkgs, ... }:
+{ pkgs, hostname, ... }:
 
 {
     # Ensure NFS support is installed
     environment.systemPackages = [ pkgs.nfs-utils ];
 
-    fileSystems = {
+    imports = [
-        "/home/chris/Stardust" = {
+        ./${hostname}-mounts.nix
-            device = "192.168.2.158:/mnt/tower/stardust/chris/files";
+    ];
-            fsType = "nfs4";
-            options = [ 
-                "defaults"
-                "x-systemd.mount-timeout=5"
-                "user"
-                "exec"
-                "x-systemd.automount" # Mounts on access
-                "noauto"              # Doesn't block boot if server is down
-            ];
-        };
-
-        "/home/chris/Foundry" = {
-            device = "192.168.2.158:/mnt/tower/foundry/Data";
-            fsType = "nfs4";
-            options = [ 
-                "defaults"
-                "x-systemd.mount-timeout=5"
-                "user"
-                "exec"
-                "x-systemd.automount"
-                "noauto"
-            ];
-        };
-
-        "/home/chris/Games" = {
-            device = "/dev/disk/by-label/Games";
-            fsType = "ext4";
-            options = [ 
-                "defaults"
-                "x-systemd.mount-timeout=5"
-                "user"
-                "exec"
-                "x-systemd.automount"
-                "noauto"
-            ];
-        };
-    };
 }

hardware/nas-mounts.nix

@@ -0,0 +1,31 @@
+{ pkgs, ... }:
+
+{
+    fileSystems = {
+        "/home/chris/Stardust" = {
+            device = "192.168.2.158:/mnt/tower/stardust/chris/files";
+            fsType = "nfs4";
+            options = [ 
+                "defaults"
+                "x-systemd.mount-timeout=5"
+                "user"
+                "exec"
+                "x-systemd.automount" # Mounts on access
+                "noauto"              # Doesn't block boot if server is down
+            ];
+        };
+
+        "/home/chris/Foundry" = {
+            device = "192.168.2.158:/mnt/tower/foundry/Data";
+            fsType = "nfs4";
+            options = [ 
+                "defaults"
+                "x-systemd.mount-timeout=5"
+                "user"
+                "exec"
+                "x-systemd.automount"
+                "noauto"
+            ];
+        };
+    };
+}

hardware/station-hardware-configuration.nix

@@ -4,15 +4,13 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
+    imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" ];
+    boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" ];
-  boot.initrd.kernelModules = [ ];
+    boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+    boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
+    boot.extraModulePackages = [ ];
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hardware/station-mounts.nix

@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+
+{
+    imports = [
+        ./nas-mounts.nix
+    ];
+
+    fileSystems = {
+        "/home/chris/Games" = {
+            device = "/dev/disk/by-label/Games";
+            fsType = "ext4";
+            options = [ 
+                "defaults"
+                "x-systemd.mount-timeout=5"
+                "user"
+                "exec"
+                "x-systemd.automount"
+                "noauto"
+            ];
+        };
+    };
+}

hardware/stationette-mounts.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+    imports = [
+        ./nas-mounts.nix
+    ];
+}