From b3681cdac94b431b5eb7a753ee7640dd6b44892e Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Sat, 19 Apr 2025 13:13:55 +0800
Subject: [PATCH] modules.services.nspawn: move

---
 devices/pc/default.nix      |  5 +----
 modules/services/nspawn.nix | 11 +++++++++++
 modules/virtualization.nix  | 16 ----------------
 3 files changed, 12 insertions(+), 20 deletions(-)
 create mode 100644 modules/services/nspawn.nix
 delete mode 100644 modules/virtualization.nix

diff --git a/devices/pc/default.nix b/devices/pc/default.nix
index f2262494..5a3788f5 100644
--- a/devices/pc/default.nix
+++ b/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 = {}; };
diff --git a/modules/services/nspawn.nix b/modules/services/nspawn.nix
new file mode 100644
index 00000000..c7b7d418
--- /dev/null
+++ b/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);
+  };
+}
diff --git a/modules/virtualization.nix b/modules/virtualization.nix
deleted file mode 100644
index 10985ad2..00000000
--- a/modules/virtualization.nix
+++ /dev/null
@@ -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);
-    }
-  ];
-}