diff --git a/flake.lock b/flake.lock index daa06c0..46527c1 100644 --- a/flake.lock +++ b/flake.lock @@ -227,24 +227,6 @@ "type": "indirect" } }, - "flake-parts_6": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1629284811, @@ -482,27 +464,6 @@ "type": "github" } }, - "nix-gaming": { - "inputs": { - "flake-parts": "flake-parts_6", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1710810847, - "narHash": "sha256-l1DacjuZny7i7YRbxIsa6DhXWoKJZEnM3Em8gt6Fsfk=", - "owner": "fufexan", - "repo": "nix-gaming", - "rev": "03d036f41beaa8c31b2b2261918d248f5c4d45c8", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "nix-gaming", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -577,24 +538,6 @@ "type": "github" } }, - "nixpkgs-lib_2": { - "locked": { - "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1710628718, @@ -668,7 +611,6 @@ "hardware": "hardware", "home-manager": "home-manager_2", "neovim-config": "neovim-config", - "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", "nixpkgs": "nixpkgs_3", diff --git a/flake.nix b/flake.nix index 5f47bd1..dd983aa 100644 --- a/flake.nix +++ b/flake.nix @@ -51,11 +51,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nix-gaming = { - url = "github:fufexan/nix-gaming"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - sops-nix.url = "github:Mic92/sops-nix"; agenix = { diff --git a/home/profiles/hopper/default.nix b/home/profiles/hopper/default.nix index 542854b..c9dae7b 100644 --- a/home/profiles/hopper/default.nix +++ b/home/profiles/hopper/default.nix @@ -7,7 +7,6 @@ ../../programs/browsers/firefox.nix ../../programs/desktop/awesome - ../../programs/games/steam.nix ../../programs/media ../../programs/media/jellyfin.nix diff --git a/home/profiles/nixdesk/default.nix b/home/profiles/nixdesk/default.nix index 7298e11..00b3935 100644 --- a/home/profiles/nixdesk/default.nix +++ b/home/profiles/nixdesk/default.nix @@ -24,7 +24,6 @@ ../../programs/media/jellyfin.nix # gaming ../../programs/games - ../../programs/games/steam.nix # media services ../../services/media/playerctl.nix diff --git a/home/programs/games/steam.nix b/home/programs/games/steam.nix deleted file mode 100644 index 3bddcf4..0000000 --- a/home/programs/games/steam.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - pkgs, - inputs, - ... -}: let - steam-with-pkgs = pkgs.steam.override { - extraPkgs = pkgs: - with pkgs; [ - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXScrnSaver - libpng - libpulseaudio - libvorbis - stdenv.cc.cc.lib - libkrb5 - keyutils - gamescope - gamemode - mangohud - ]; - extraProfile = "export STEAM_EXTRA_COMPAT_TOOLS_PATHS='${inputs.nix-gaming.packages.${pkgs.system}.proton-ge}'"; - }; -in { - home.packages = with pkgs; [ - steam-with-pkgs - steam-run - steamtinkerlaunch - protontricks - ]; -} diff --git a/hosts/default.nix b/hosts/default.nix index 7f7d71f..5da2e7d 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -36,6 +36,9 @@ in { "${mod}/services/syncthing.nix" "${mod}/desktop/x11/nosleep.nix" + "${mod}/programs/gamemode.nix" + "${mod}/programs/steam.nix" + { home-manager = { users.xun.imports = homeImports."xun@nixdesk"; @@ -57,6 +60,7 @@ in { "${mod}/core" "${mod}/programs/home-manager.nix" + "${mod}/programs/steam.nix" "${mod}/desktop" "${mod}/desktop/awesome.nix" diff --git a/system/nix/substituters.nix b/system/nix/substituters.nix index b21c0e2..bb2d804 100644 --- a/system/nix/substituters.nix +++ b/system/nix/substituters.nix @@ -4,13 +4,11 @@ # high priority since it's almost always used "https://cache.nixos.org?priority=10" "https://nix-community.cachix.org" - "https://nix-gaming.cachix.org" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ]; }; } diff --git a/system/programs/steam.nix b/system/programs/steam.nix new file mode 100644 index 0000000..fdd9ac3 --- /dev/null +++ b/system/programs/steam.nix @@ -0,0 +1,12 @@ +{pkgs, ...}: { + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; + extraCompatPackages = with pkgs; [ + proton-ge-bin + ]; + extest.enable = true; + gamescopeSession.enable = true; + }; +}