diff --git a/home/isabel/gui/chromium.nix b/home/isabel/gui/chromium.nix index 39f5352f..73ee7eac 100644 --- a/home/isabel/gui/chromium.nix +++ b/home/isabel/gui/chromium.nix @@ -1,12 +1,10 @@ { lib, pkgs, - osConfig, ... }: let inherit (lib) - optionals concatLists concatMapStrings enableFeature @@ -21,10 +19,6 @@ in "aihndpeeoneojofmliffjknbegmipbim" # at://wormhole "mnjggcdmjocbbbhaepdhchncahnbgone" # SponsorBlock "jghecgabfgfdldnmbfkhmffcabddioke" # Volume Master - ] - ++ optionals osConfig.garden.profiles.gaming.enable [ - "ngonfifpkpeefnhelnfdkficaiihklid" # ProtonDB - "dnhpnfgdlenaccegplpojghhmaamnnfp" # Augmented Steam ]; package = pkgs.chromium.override { diff --git a/modules/generic/profiles.nix b/modules/generic/profiles.nix index 5aff12f8..83710bab 100644 --- a/modules/generic/profiles.nix +++ b/modules/generic/profiles.nix @@ -7,8 +7,6 @@ in graphical.enable = mkEnableOption "Graphical interface"; headless.enable = mkEnableOption "Headless"; workstation.enable = mkEnableOption "Workstation"; - gaming.enable = mkEnableOption "Gaming"; - laptop.enable = mkEnableOption "Laptop"; server = { diff --git a/modules/home/profiles.nix b/modules/home/profiles.nix index 5cc64790..c69813f4 100644 --- a/modules/home/profiles.nix +++ b/modules/home/profiles.nix @@ -11,9 +11,6 @@ in laptop ; - # we don't inherit these as there is extra options here - gaming = { inherit (cfg.gaming) enable; }; - server = { inherit (cfg.server) enable; oracle.enable = cfg.server.oracle.enable; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 4586d88e..0ca3472d 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -9,7 +9,6 @@ ./emulation.nix ./environment ./extras.nix - ./gaming ./hardware ./headless.nix ./kernel diff --git a/modules/nixos/gaming/default.nix b/modules/nixos/gaming/default.nix deleted file mode 100644 index d42e36a5..00000000 --- a/modules/nixos/gaming/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./gamemode.nix # cool scripts, and programs to improve gaming performance - ./steam.nix # steam, the gaming platform - ]; -} diff --git a/modules/nixos/gaming/gamemode.nix b/modules/nixos/gaming/gamemode.nix deleted file mode 100644 index d31e10af..00000000 --- a/modules/nixos/gaming/gamemode.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - config, - ... -}: -let - inherit (lib) mkIf mkEnableOption; - - cfg = config.garden.profiles.gaming.gamemode; -in -{ - options.garden.profiles.gaming.gamemode.enable = mkEnableOption "Gamemode" // { - default = config.garden.profiles.gaming.enable; - }; - - config.programs.gamemode = mkIf cfg.enable { - enable = true; - enableRenice = true; - - settings = { - general = { - softrealtime = "auto"; - renice = 15; - }; - }; - }; -} diff --git a/modules/nixos/gaming/steam.nix b/modules/nixos/gaming/steam.nix deleted file mode 100644 index e6e12672..00000000 --- a/modules/nixos/gaming/steam.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ - lib, - pkgs, - config, - ... -}: -let - inherit (lib) mkIf mkOption mkEnableOption; - - cfg = config.garden.profiles.gaming.steam; -in -{ - options.garden.profiles.gaming.steam = { - enable = mkEnableOption "Enable Steam" // { - default = config.garden.profiles.gaming.enable; - }; - - gamescopeSession = { - enable = mkEnableOption "gamescope TTY session" // { - default = cfg.enable; - }; - - tty = mkOption { - default = 4; - type = lib.types.int; - description = "tty to connect gamescope session on"; - }; - }; - }; - - config = mkIf cfg.enable { - programs.steam = { - enable = true; - # Open ports in the firewall for Steam Remote Play - # remotePlay.openFirewall = true; - # Open ports in the firewall for Source Dedicated Server - # dedicatedServer.openFirewall = true; - # Compatibility tools to install - # this option used to be provided by modules/shared/nixos/steam - extraCompatPackages = [ pkgs.proton-ge-bin.steamcompattool ]; - gamescopeSession.enable = true; - }; - - programs.gamescope = { - enable = true; - capSysNice = true; - }; - - garden.packages = { - exec-gamescope = pkgs.writeShellApplication { - name = "exec-gamescope"; - text = '' - exec gamescope --adaptive-sync --rt --steam -- steam -pipewire-dmabuf -tenfoot - ''; - }; - }; - - environment.loginShellInit = mkIf cfg.gamescopeSession.enable '' - [[ "$(tty)" = "/dev/tty${toString cfg.gamescopeSession.tty}" ]] && exec-gamescope - ''; - - nixpkgs.overlays = [ - (_: prev: { - steam = prev.steam.override ( - { - extraPkgs ? _: [ ], - ... - }: - { - extraPkgs = - pkgs': - builtins.attrValues { - extras = extraPkgs pkgs'; - - inherit (pkgs') - # keep-sorted start - at-spi2-atk - fmodex - gtk3 - gtk3-x11 - harfbuzz - icu - inetutils - keyutils - libgdiplus - libkrb5 - libpng - libpulseaudio - libthai - libunwind # for titanfall 2 Northstar launcher - libvorbis - mono5 - pango - strace - zlib - # keep-sorted end - ; - - inherit (pkgs.stdenv.cc.cc) lib; - - inherit (pkgs.xorg) - # keep-sorted start - libXScrnSaver - libXcursor - libXi - libXinerama - # keep-sorted end - ; - }; - } - ); - }) - ]; - }; -}