From db9ee7056538c276a22f457d60c202bfd85be9e0 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Sat, 22 Jul 2023 18:29:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=20steam=20wine?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flake.nix                    |  7 ++++---
 modules/networking/basic.nix |  1 -
 modules/networking/samba.nix |  1 -
 modules/packages/default.nix | 12 +++++++++++-
 modules/packages/gaming.nix  |  8 --------
 modules/system/default.nix   |  1 +
 6 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 modules/networking/basic.nix
 delete mode 100644 modules/packages/gaming.nix

diff --git a/flake.nix b/flake.nix
index 49757309..03df2a3c 100644
--- a/flake.nix
+++ b/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 {} ]
diff --git a/modules/networking/basic.nix b/modules/networking/basic.nix
deleted file mode 100644
index 7239e618..00000000
--- a/modules/networking/basic.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ config.networking.networkmanager.enable = true; }
diff --git a/modules/networking/samba.nix b/modules/networking/samba.nix
index 2a1111bd..b628afd2 100644
--- a/modules/networking/samba.nix
+++ b/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;
diff --git a/modules/packages/default.nix b/modules/packages/default.nix
index 77896d6a..0651c108 100644
--- a/modules/packages/default.nix
+++ b/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 ]; }
+    )
   ];
 }
diff --git a/modules/packages/gaming.nix b/modules/packages/gaming.nix
deleted file mode 100644
index 7d231def..00000000
--- a/modules/packages/gaming.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-inputs:
-{
-	config =
-	{
-		environment.systemPackages = [ inputs.config.nur.repos.ataraxiasjel.proton-ge inputs.pkgs.wine ];
-		programs.steam.enable = true;
-	};
-}
diff --git a/modules/system/default.nix b/modules/system/default.nix
index d174fe6d..28b164b3 100644
--- a/modules/system/default.nix
+++ b/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; }