From 0477b8b4e3f40216bbc7db5d7db1d257ed102c77 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sat, 26 Jul 2025 20:06:08 +0200 Subject: [PATCH] chore: remove steam; remove desktop profile since it is not used --- modules/core/default.nix | 1 - modules/core/steam.nix | 9 --------- modules/core/system.nix | 20 ++++++++++++++------ modules/core/user.nix | 4 +--- modules/home/default.desktop.nix | 5 ----- modules/home/gaming.nix | 10 ---------- modules/home/steam.nix | 20 -------------------- 7 files changed, 15 insertions(+), 54 deletions(-) delete mode 100644 modules/core/steam.nix delete mode 100644 modules/home/default.desktop.nix delete mode 100644 modules/home/gaming.nix delete mode 100644 modules/home/steam.nix diff --git a/modules/core/default.nix b/modules/core/default.nix index a91aa3a..10c17fa 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -17,6 +17,5 @@ ++ [ (import ./user.nix) ] ++ [ (import ./bluetooth.nix) ] ++ [ (import ./yubikey.nix) ] - # ++ [ (import ./steam.nix) ] ++ [ (import ./wayland.nix) ]; } diff --git a/modules/core/steam.nix b/modules/core/steam.nix deleted file mode 100644 index 0901a55..0000000 --- a/modules/core/steam.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: -{ - programs.steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers - }; -} diff --git a/modules/core/system.nix b/modules/core/system.nix index 7ac70fe..3fff33f 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -1,12 +1,20 @@ -{ self, pkgs, lib, inputs, ...}: { - # imports = [ inputs.nix-gaming.nixosModules.default ]; + self, + pkgs, + lib, + inputs, + ... +}: +{ nix = { settings = { auto-optimise-store = true; - experimental-features = [ "nix-command" "flakes" ]; - substituters = [ "https://nix-gaming.cachix.org" ]; - trusted-public-keys = [ "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ]; + experimental-features = [ + "nix-command" + "flakes" + ]; + # substituters = [ "" ]; + # trusted-public-keys = [ "" ]; }; gc = { automatic = true; @@ -41,7 +49,7 @@ "en_US.UTF-8/UTF-8" "ja_JP.UTF-8/UTF-8" ]; - + # Font packages environment.systemPackages = with pkgs; [ noto-fonts-cjk-sans diff --git a/modules/core/user.nix b/modules/core/user.nix index 5ddb8db..a6b72b9 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -17,9 +17,7 @@ extraSpecialArgs = { inherit inputs username host; }; users.${username} = { imports = - if (host == "desktop") then - [ ./../home/default.desktop.nix ] - else if (host == "violet") then + if (host == "violet") then [ ./../home/default.server.nix ] else if (host == "dandelion") then [ ./../home/default.server.nix ] diff --git a/modules/home/default.desktop.nix b/modules/home/default.desktop.nix deleted file mode 100644 index 4e658d9..0000000 --- a/modules/home/default.desktop.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ...}: { - imports = - [(import ./default.nix)] - ++ [ (import ./steam.nix) ]; -} diff --git a/modules/home/gaming.nix b/modules/home/gaming.nix deleted file mode 100644 index c9e167f..0000000 --- a/modules/home/gaming.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, config, inputs, ... }: -{ - home.packages = with pkgs;[ - ## Utils - # gamemode - # gamescope - # winetricks - # inputs.nix-gaming.packages.${pkgs.system}.wine-ge - ]; -} diff --git a/modules/home/steam.nix b/modules/home/steam.nix deleted file mode 100644 index 4b559a5..0000000 --- a/modules/home/steam.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, lib, ... }: -{ - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = false; - }; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-runtime" - ]; - # proton-ge-bin - -# warning: The package proton-ge in nix-gaming has been deprecated as of 2024-03-17. - -# You should use proton-ge-bin from Nixpkgs, which conforms to -# the new `extraCompatTools` module option under `programs.steam` -# For details, see the relevant pull request: -}