rose-pine-hyprcursor, fnott修正

hosts/default.nix

@@ -10,21 +10,18 @@ let
     }:
     {
       nixos = inputs.nixpkgs.lib.nixosSystem {
-        modules =
-          with inputs;
-          systemModules
-          ++ [
-            {
-              users.users.${username} = {
-                isNormalUser = true;
-                description = "";
-                extraGroups = [
-                  "networkmanager"
-                  "wheel"
-                ];
-              };
-            }
-          ];
+        modules = systemModules ++ [
+          {
+            users.users.${username} = {
+              isNormalUser = true;
+              description = "";
+              extraGroups = [
+                "networkmanager"
+                "wheel"
+              ];
+            };
+          }
+        ];
         inherit system;
         specialArgs = {
           inherit inputs hostname username;
@@ -88,14 +85,6 @@ rec {
       ];
     };
   };
-  nixos = {
-    arcadia = hosts.arcadia.nixos;
-    fungus = hosts.fungus.nixos;
-    x1carbon = hosts.x1carbon.nixos;
-  };
-  home-manager = {
-    arcadia = hosts.arcadia.home-manager;
-    fungus = hosts.fungus.home-manager;
-    x1carbon = hosts.x1carbon.home-manager;
-  };
+  nixos = builtins.mapAttrs (_: host: host.nixos) hosts;
+  home-manager = builtins.mapAttrs (_: host: host.home-manager) hosts;
 }

hosts/x1carbon/nixos.nix

@@ -25,10 +25,8 @@ in
   environment.systemPackages = with pkgs; [
     openssl
 
-    bluez
-    bluez-tools
     bluetuith
-    
+
     brightnessctl
 
     fzf
@@ -61,7 +59,9 @@ in
   networking.firewall.allowedUDPPorts = [ ];
 
   services.openvpn.servers = {
-    homeVPN = { config = '' config /root/nixos/openvpn/homeVPN.conf ''; };
+    homeVPN = {
+      config = ''config /root/nixos/openvpn/homeVPN.conf '';
+    };
   };
 
   services.udev.extraRules = ''