modules.services.nspawn: move

devices/pc/default.nix

@@ -54,10 +54,6 @@ inputs:
         gpu = { type = "nvidia"; nvidia = { dynamicBoost = true; driver = "beta"; }; };
         legion = {};
       };
-      virtualization =
-      {
-        nspawn = [ "arch" "ubuntu-22.04" "fedora" ];
-      };
       services =
       {
         samba =
@@ -130,6 +126,7 @@ inputs:
         lumericalLicenseManager = {};
         searx = {};
         kvm = {};
+        nspawn = [ "arch" "ubuntu-22.04" "fedora" ];
       };
       bugs = [ "xmunet" "backlight" "amdpstate" "iwlwifi" ];
       packages = { android-studio = {}; mathematica = {}; };

modules/services/nspawn.nix

@@ -0,0 +1,11 @@
+inputs:
+{
+  options.nixos.services.nspawn = let inherit (inputs.lib) mkOption types; in mkOption
+    { type = types.listOf types.nonEmptyStr; default = []; };
+  config = let inherit (inputs.config.nixos.services) nspawn; in
+  {
+    systemd.nspawn = builtins.listToAttrs (builtins.map
+      (name: { inherit name; value = { execConfig.PrivateUsers = false; networkConfig.VirtualEthernet = false; }; }) 
+      nspawn);
+  };
+}

modules/virtualization.nix

@@ -1,16 +0,0 @@
-inputs:
-{
-  options.nixos.virtualization = let inherit (inputs.lib) mkOption types; in
-  {
-    nspawn = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
-  };
-  config = inputs.lib.mkMerge
-  [
-    # nspawn
-    {
-      systemd.nspawn = builtins.listToAttrs (builtins.map
-        (name: { inherit name; value = { execConfig.PrivateUsers = false; networkConfig.VirtualEthernet = false; }; }) 
-        inputs.config.nixos.virtualization.nspawn);
-    }
-  ];
-}