nit: cleanup imports

disk-config.nix

@@ -1,4 +1,9 @@
+{ inputs, ... }:
 {
+  imports = [
+    inputs.disko.nixosModules.disko
+  ];
+
   disko.devices = {
     disk = {
       main = {

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
           (
             {

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

modules/impermanence.nix

@@ -4,9 +4,14 @@
   pkgs,
   username,
   service_configs,
+  inputs,
   ...
 }:
 {
+  imports = [
+    inputs.impermanence.nixosModules.impermanence
+  ];
+
   environment.persistence."/persistent" = {
     hideMounts = true;
     directories = [

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 = [

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"
     ];
   };
-
 }

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
       ];