From a2c3d48fed6ed68818ee0267fd236f9d5510e7fa Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Fri, 4 Apr 2025 18:04:57 +0200
Subject: [PATCH] chore(hosts/backstage): cleanup

---
 hosts/backstage/boot.nix                   | 45 ++++++++++++++++++++++
 hosts/backstage/configuration.nix          | 39 -------------------
 hosts/backstage/default.nix                |  1 +
 hosts/backstage/hardware-configuration.nix | 15 --------
 hosts/backstage/network.nix                | 13 ++++++-
 5 files changed, 57 insertions(+), 56 deletions(-)
 create mode 100644 hosts/backstage/boot.nix

diff --git a/hosts/backstage/boot.nix b/hosts/backstage/boot.nix
new file mode 100644
index 0000000..abd9a3b
--- /dev/null
+++ b/hosts/backstage/boot.nix
@@ -0,0 +1,45 @@
+{config, lib, ...}:
+{
+  # Use the systemd-boot EFI boot loader.
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi = {
+        canTouchEfiVariables = true;
+        efiSysMountPoint = "/boot/efi";
+      };
+    };
+    initrd = {
+      network = {
+        enable = true;
+        ssh = {
+          enable = true;
+          port = 22;
+          authorizedKeys = config.users.users.root.openssh.authorizedKeys.keys;
+          hostKeys = [
+            "/boot/efi/initrd_id_ed25519"
+            "/boot/efi/initrd_id_rsa4096"
+          ];
+        };
+      };
+      systemd = {
+        enable = true;
+        network = config.systemd.network;
+        targets.initrd.wants = [
+          "systemd-networkd-wait-online@enp1s0.service"
+        ];
+        users.root.shell = "/bin/systemd-tty-ask-password-agent";
+      };
+      availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "virtio_pci" "r8169" ];
+      kernelModules = [ "dm-snapshot" ];
+      luks.devices."backstage" = {
+        preLVM = true;
+        device = "/dev/disk/by-uuid/7f3ccd2d-8022-491e-baa1-675805919fd7";
+      };
+    };
+    kernelModules = [ "kvm-intel" ];
+    kernelParams = [
+      "zfs.zfs_arc_max=1024000000"
+    ];
+  };
+}
diff --git a/hosts/backstage/configuration.nix b/hosts/backstage/configuration.nix
index 44d1ad3..61aaadf 100644
--- a/hosts/backstage/configuration.nix
+++ b/hosts/backstage/configuration.nix
@@ -6,45 +6,6 @@
       ../../services/sshd
     ];
 
-  # Use the systemd-boot EFI boot loader.
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot/efi";
-      };
-    };
-    initrd = {
-      network = {
-        enable = true;
-        ssh = {
-          enable = true;
-          port = 22;
-          authorizedKeys = config.users.users.root.openssh.authorizedKeys.keys;
-          hostKeys = [
-            "/boot/efi/initrd_id_ed25519"
-            "/boot/efi/initrd_id_rsa4096"
-          ];
-        };
-      };
-      systemd = {
-        enable = true;
-        network = {
-          enable = true;
-          networks."10-dhcp" = {
-            matchConfig.Name = "enp1s0";
-            DHCP = "yes";
-          };
-        };
-        targets.initrd.wants = [
-          "systemd-networkd-wait-online@enp1s0.service"
-        ];
-        users.root.shell = "/bin/systemd-tty-ask-password-agent";
-      };
-    };
-  };
-
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 
diff --git a/hosts/backstage/default.nix b/hosts/backstage/default.nix
index 39a4e28..72b3230 100644
--- a/hosts/backstage/default.nix
+++ b/hosts/backstage/default.nix
@@ -5,5 +5,6 @@
     ./hardware-configuration.nix
     ./configuration.nix
     ./network.nix
+    ./boot.nix
   ];
 }
diff --git a/hosts/backstage/hardware-configuration.nix b/hosts/backstage/hardware-configuration.nix
index 3d94fc9..a7ba7ae 100644
--- a/hosts/backstage/hardware-configuration.nix
+++ b/hosts/backstage/hardware-configuration.nix
@@ -5,21 +5,6 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot = {
-    initrd = {
-      availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "virtio_pci" "r8169" ];
-      kernelModules = [ "dm-snapshot" ];
-      luks.devices."backstage" = {
-        preLVM = true;
-        device = "/dev/disk/by-uuid/7f3ccd2d-8022-491e-baa1-675805919fd7";
-      };
-    };
-    kernelModules = [ "kvm-intel" ];
-    kernelParams = [
-      "zfs.zfs_arc_max=1024000000"
-    ];
-  };
-
   fileSystems."/" =
     { device = "zpool/root";
       fsType = "zfs";
diff --git a/hosts/backstage/network.nix b/hosts/backstage/network.nix
index e228c1e..a2e3dca 100644
--- a/hosts/backstage/network.nix
+++ b/hosts/backstage/network.nix
@@ -1,10 +1,19 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, ... }:
 
 {
   networking = {
     useNetworkd = true;
-    useDHCP = lib.mkDefault true;
     hostName = "backstage";
     hostId = "0ccd2304";
   };
+
+  systemd.network = {
+    enable = true;
+    networks = {
+      "enp1s0" = {
+        matchConfig.Name = "enp1s0";
+        DHCP = "yes";
+      };
+    };
+  };
 }