diff --git a/hosts/kima/modules.nix b/hosts/kima/modules.nix index b55f53d9..09225c53 100644 --- a/hosts/kima/modules.nix +++ b/hosts/kima/modules.nix @@ -3,8 +3,8 @@ boot = { kernel = { variant = "latest"; - hardware = ["amd"]; - extraKernelParams = []; + hardware = [ "amd" ]; + extraKernelParams = [ ]; amdOverdrive.enable = true; }; loader = { @@ -22,7 +22,7 @@ }; graphics = { enable = true; - vendors = ["amd"]; + vendors = [ "amd" ]; }; logitech = { enable = true; @@ -73,7 +73,7 @@ }; }; gamescope = { - enable = true; + enable = false; }; gimp = { enable = true; diff --git a/modules/nixos/programs/pkgs/default.nix b/modules/nixos/programs/pkgs/default.nix index b6058d68..80457cfc 100644 --- a/modules/nixos/programs/pkgs/default.nix +++ b/modules/nixos/programs/pkgs/default.nix @@ -3,16 +3,17 @@ config, lib, ... -}: let - inherit - (lib) +}: +let + inherit (lib) mkIf mkOption mkMerge types ; cfg = config.nixos.programs.pkgs; -in { +in +{ options = { nixos.programs.pkgs = { enable = mkOption { @@ -50,7 +51,8 @@ in { }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; + environment.systemPackages = + with pkgs; mkMerge [ [ pciutils @@ -95,9 +97,6 @@ in { ]) (mkIf cfg.desktop.enable [ - protonup - winetricks - wine geekbench unigine-heaven ]) diff --git a/modules/nixos/programs/steam/default.nix b/modules/nixos/programs/steam/default.nix index 8e047522..669363e8 100644 --- a/modules/nixos/programs/steam/default.nix +++ b/modules/nixos/programs/steam/default.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: let @@ -17,6 +18,20 @@ in enable = true; gamescopeSession.enable = true; }; + gamescope = { + enable = true; + capSysNice = true; + args = [ + "--rt" + "--expose-wayland" + ]; + }; }; + environment.systemPackages = with pkgs; [ + protonup + wine + winetricks + wine-wayland + ]; }; }