From ab020ae8eba577ce39df11faeb64395f2704d81c Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 6 Dec 2024 10:27:41 +0100
Subject: [PATCH] refactor(sj-srv1)

---
 nix/os/devices/sj-srv1/boot.nix          | 1 -
 nix/os/devices/sj-srv1/configuration.nix | 3 ---
 nix/os/devices/sj-srv1/hw.nix            | 3 +++
 3 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 nix/os/devices/sj-srv1/boot.nix

diff --git a/nix/os/devices/sj-srv1/boot.nix b/nix/os/devices/sj-srv1/boot.nix
deleted file mode 100644
index 974f788..0000000
--- a/nix/os/devices/sj-srv1/boot.nix
+++ /dev/null
@@ -1 +0,0 @@
-_: { boot.extraModulePackages = [ ]; }
diff --git a/nix/os/devices/sj-srv1/configuration.nix b/nix/os/devices/sj-srv1/configuration.nix
index 9f49bd1..5184bd1 100644
--- a/nix/os/devices/sj-srv1/configuration.nix
+++ b/nix/os/devices/sj-srv1/configuration.nix
@@ -17,10 +17,7 @@
       };
     }
 
-    ../../modules/opinionatedDisk.nix
-
     ./system.nix
     ./hw.nix
-    ./boot.nix
   ];
 }
diff --git a/nix/os/devices/sj-srv1/hw.nix b/nix/os/devices/sj-srv1/hw.nix
index 328266b..ca9158b 100644
--- a/nix/os/devices/sj-srv1/hw.nix
+++ b/nix/os/devices/sj-srv1/hw.nix
@@ -41,6 +41,9 @@ let
   ];
 in
 {
+  imports = [
+    ../../modules/opinionatedDisk.nix
+  ];
   hardware.opinionatedDisk = {
     enable = true;
     encrypted = false;