From 513e426f8922a9e28326ee8bfd2a73ccab308ed1 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Fri, 9 Jan 2026 12:52:16 -0500
Subject: [PATCH] nit: cleanup imports

---
 disk-config.nix          | 5 +++++
 flake.nix                | 9 ---------
 modules/age-secrets.nix  | 5 +++++
 modules/impermanence.nix | 5 +++++
 services/minecraft.nix   | 2 ++
 services/wg.nix          | 8 +++++---
 tests/minecraft.nix      | 3 +--
 7 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/disk-config.nix b/disk-config.nix
index 9a487ca..b3eb30d 100644
--- a/disk-config.nix
+++ b/disk-config.nix
@@ -1,4 +1,9 @@
+{ inputs, ... }:
 {
+  imports = [
+    inputs.disko.nixosModules.disko
+  ];
+
   disko.devices = {
     disk = {
       main = {
diff --git a/flake.nix b/flake.nix
index f7052e3..309aa81 100644
--- a/flake.nix
+++ b/flake.nix
@@ -208,15 +208,8 @@
           srvos.nixosModules.mixins-terminfo
 
           ./disk-config.nix
-          disko.nixosModules.disko
           ./configuration.nix
 
-          impermanence.nixosModules.impermanence
-
-          vpn-confinement.nixosModules.default
-
-          # get nix-minecraft working!
-          nix-minecraft.nixosModules.minecraft-servers
           {
             nixpkgs.overlays = [
               nix-minecraft.overlay
@@ -226,8 +219,6 @@
 
           lanzaboote.nixosModules.lanzaboote
 
-          agenix.nixosModules.default
-
           home-manager.nixosModules.home-manager
           (
             {
diff --git a/modules/age-secrets.nix b/modules/age-secrets.nix
index a4088dc..bdc56eb 100644
--- a/modules/age-secrets.nix
+++ b/modules/age-secrets.nix
@@ -2,9 +2,14 @@
   config,
   lib,
   pkgs,
+  inputs,
   ...
 }:
 {
+  imports = [
+    inputs.agenix.nixosModules.default
+  ];
+
   # Configure all agenix secrets
   age.secrets = {
     # ZFS encryption key
diff --git a/modules/impermanence.nix b/modules/impermanence.nix
index 4fbe6f6..9fd5fde 100644
--- a/modules/impermanence.nix
+++ b/modules/impermanence.nix
@@ -4,9 +4,14 @@
   pkgs,
   username,
   service_configs,
+  inputs,
   ...
 }:
 {
+  imports = [
+    inputs.impermanence.nixosModules.impermanence
+  ];
+
   environment.persistence."/persistent" = {
     hideMounts = true;
     directories = [
diff --git a/services/minecraft.nix b/services/minecraft.nix
index e416655..f94d979 100644
--- a/services/minecraft.nix
+++ b/services/minecraft.nix
@@ -3,6 +3,7 @@
   service_configs,
   lib,
   config,
+  inputs,
   ...
 }:
 {
@@ -13,6 +14,7 @@
         "${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name}"
       ]
     )
+    inputs.nix-minecraft.nixosModules.minecraft-servers
   ];
 
   environment.systemPackages = [
diff --git a/services/wg.nix b/services/wg.nix
index 2688da0..283e381 100644
--- a/services/wg.nix
+++ b/services/wg.nix
@@ -1,11 +1,14 @@
 {
   pkgs,
-  service_configs,
-  eth_interface,
   config,
+  inputs,
   ...
 }:
 {
+  imports = [
+    inputs.vpn-confinement.nixosModules.default
+  ];
+
   # network namespace that is proxied through mullvad
   vpnNamespaces.wg = {
     enable = true;
@@ -14,5 +17,4 @@
       # "192.168.0.0/24"
     ];
   };
-
 }
diff --git a/tests/minecraft.nix b/tests/minecraft.nix
index bc71db8..aa65ec9 100644
--- a/tests/minecraft.nix
+++ b/tests/minecraft.nix
@@ -22,7 +22,7 @@ let
     {
       imports = [
         (import ../services/minecraft.nix {
-          inherit lib config;
+          inherit lib config inputs;
           pkgs = testPkgs;
           service_configs = {
             minecraft = {
@@ -50,7 +50,6 @@ testPkgs.testers.runNixOSTest {
     { ... }:
     {
       imports = [
-        inputs.nix-minecraft.nixosModules.minecraft-servers
         minecraftService
       ];