整理 steam wine

flake.nix

@@ -188,7 +188,10 @@
 										};
 										packages =
 										{
-											packages = [ "genshin-impact" "honkers-starrail" ];
+											packages =
+											[
+												"genshin-impact" "honkers-starrail" "steam" "wine"
+											];
 										};
 										boot.grub =
 										{
@@ -236,7 +239,6 @@
 								./modules/boot/chn-PC.nix
 								[ ./modules/hardware/nvidia-prime.nix { intelBusId = "PCI:0:2:0"; nvidiaBusId = "PCI:1:0:0"; } ]
 								./modules/hardware/chn-PC.nix
-								./modules/networking/basic.nix
 								./modules/networking/samba.nix
 								./modules/networking/ssh.nix
 								./modules/networking/wall_client.nix
@@ -244,7 +246,6 @@
 								./modules/networking/chn-PC.nix
 								./modules/packages/terminal.nix
 								./modules/packages/gui.nix
-								./modules/packages/gaming.nix
 								./modules/packages/hpc.nix
 								[ ./modules/users/root.nix {} ]
 								[ ./modules/users/chn.nix {} ]

modules/networking/basic.nix

@@ -1 +0,0 @@
-{ config.networking.networkmanager.enable = true; }

modules/networking/samba.nix

@@ -5,7 +5,6 @@ inputs:
 		# make shares visible for windows 10 clients
 		services.samba-wsdd.enable = true;
 		# networking.firewall = { allowedTCPPorts = [ 5357 ]; allowedUDPPorts = [ 3702 ]; };
-		
 		services.samba =
 		{
 			enable = true;

modules/packages/default.nix

@@ -5,7 +5,9 @@ inputs:
     packages = mkOption { default = []; type = types.listOf (types.enum
     [
       # games
-      "genshin-impact" "honkers-starrail"
+      "genshin-impact" "honkers-starrail" "steam"
+      # emulators
+      "wine"
     ]); };
   };
   config = let inherit (inputs.lib) mkMerge mkIf; in mkMerge
@@ -18,5 +20,13 @@ inputs:
       mkIf (builtins.elem "honkers-starrail" inputs.config.nixos.packages.packages)
         { programs.honkers-railway-launcher.enable = true; }
     )
+    (
+      mkIf (builtins.elem "steam" inputs.config.nixos.packages.packages)
+        { programs.steam.enable = true; }
+    )
+    (
+      mkIf (builtins.elem "wine" inputs.config.nixos.packages.packages)
+        { environment.systemPackages = [ inputs.pkgs.wine ]; }
+    )
   ];
 }

modules/packages/gaming.nix

@@ -1,8 +0,0 @@
-inputs:
-{
-	config =
-	{
-		environment.systemPackages = [ inputs.config.nur.repos.ataraxiasjel.proton-ge inputs.pkgs.wine ];
-		programs.steam.enable = true;
-	};
-}

modules/system/default.nix

@@ -20,6 +20,7 @@ inputs:
 				ACTION=="add|change", KERNEL=="[sv]d[a-z]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
 				ACTION=="add|change", KERNEL=="nvme[0-9]n[0-9]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
 			'';
+      networking.networkmanager.enable = true;
     }
     # hostname
     { networking.hostName = inputs.config.nixos.system.hostname; }