use overlays instead of custom defined packages when possibleHEADmaster

4 files changed, 9 insertions, 34 deletions

diff --git a/modules/desktop/apps/games/freeciv.nix b/modules/desktop/apps/games/freeciv.nix
deleted file mode 100644
index cb5e462..0000000
--- a/modules/desktop/apps/games/freeciv.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    config,
-    options,
-    lib,
-    pkgs,
-    rootPath,
-    ...
-}: let
-    freecivConf = config.modules.desktop.apps.games.freeciv;
-    configDir = config.nixosConfig.configDir;
-in {
-    options.modules.desktop.apps.games.freeciv = {
-        enable = lib.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = lib.mkIf (freecivConf.enable) {
-      home.packages = with pkgs; [
-        (callPackage (rootPath + /packages/freeciv/default.nix) {})
-      ];
-    };
-}
diff --git a/modules/desktop/apps/games/unciv.nix b/modules/desktop/apps/games/lunati.nix
index 1eec540..1c06b4f 100644
--- a/modules/desktop/apps/games/unciv.nix
+++ b/modules/desktop/apps/games/lunati.nix
@@ -6,19 +6,19 @@
     rootPath,
     ...
 }: let
-    uncivConf = config.modules.desktop.apps.games.unciv;
+    luantiConf = config.modules.desktop.apps.games.luanti;
     configDir = config.nixosConfig.configDir;
 in {
-    options.modules.desktop.apps.games.unciv = {
+    options.modules.desktop.apps.games.luanti = {
         enable = lib.mkOption {
             type = lib.types.bool;
             default = false;
         };
     };
 
-    config = lib.mkIf (uncivConf.enable) {
+    config = lib.mkIf (luantiConf.enable) {
       home.packages = with pkgs; [
-        (callPackage (rootPath + /packages/unciv/default.nix) {})
+        luanti
       ];
     };
 }
diff --git a/modules/desktop/apps/games/steam.nix b/modules/desktop/apps/games/steam.nix
index 50b5c62..51396f1 100644
--- a/modules/desktop/apps/games/steam.nix
+++ b/modules/desktop/apps/games/steam.nix
@@ -29,6 +29,11 @@ in {
             remotePlay.openFirewall = true;
             dedicatedServer.openFirewall = true;
             gamescopeSession.enable = true;
+            protontricks.enable = true;
         };
+
+        environment.systemPackages = with pkgs; [
+            protonup-qt
+        ];
     };
 }
diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix
index 45ad967..2839b9a 100644
--- a/modules/desktop/hyprland.nix
+++ b/modules/desktop/hyprland.nix
@@ -197,12 +197,6 @@ in {
                     "__GLX_VENDOR_LIBRARY_NAME,nvidia"
                     "LIBVA_DRIVER_NAME,nvidia"
                     "NVD_BACKEND,direct"
-                    "PROTON_ENABLE_NGX_UPDATER,1"
-                    "__GL_GSYNC_ALLOWED,1"
-                    "__GL_VRR_ALLOWED,1"
-                    "__GL_MaxFramesAllowed,1"
-                    "__NV_PRIME_RENDER_OFFLOAD,1"
-                    "__VK_LAYER_NV_optimus,NIVIDA_only"
                     "WLR_DRM_NO_ATOMIC,1"
                     "WLR_USE_LIBINPUT,1"
                     "WLR_RENDERER_ALLOW_SOFTWARE,1"