switch to programs.steam and proton-ge-bin from nixpkgs

proton-ge from nix-gaming is deprecated now that proton-ge-bin is in
nixpkgs
This commit is contained in:
xunuwu 2024-03-19 18:21:09 +01:00
parent 2fd037f3d8
commit a18ceb4f2e
Signed by: xun
SSH key fingerprint: SHA256:Uot/1WoAjWAeqLOHA5vYy4phhVydsH7jCPmBjaPZfgI
8 changed files with 16 additions and 99 deletions

58
flake.lock generated
View file

@ -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",

View file

@ -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 = {

View file

@ -7,7 +7,6 @@
../../programs/browsers/firefox.nix
../../programs/desktop/awesome
../../programs/games/steam.nix
../../programs/media
../../programs/media/jellyfin.nix

View file

@ -24,7 +24,6 @@
../../programs/media/jellyfin.nix
# gaming
../../programs/games
../../programs/games/steam.nix
# media services
../../services/media/playerctl.nix

View file

@ -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
];
}

View file

@ -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"

View file

@ -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="
];
};
}

12
system/programs/steam.nix Normal file
View file

@ -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;
};
}