mirror of
https://github.com/nmasur/dotfiles
synced 2024-11-09 23:22:57 +00:00
switch from proton-ge overlay to nixpkgs proton-ge-bin
This commit is contained in:
parent
e43fc0f8db
commit
c066d27909
16
flake.lock
16
flake.lock
@ -52,7 +52,7 @@
|
|||||||
"bypass-paywalls-clean": {
|
"bypass-paywalls-clean": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-OlHiORYigNwOncKNaaq/EDgWutnWbdt0AFXGeUpOoC4=",
|
"narHash": "sha256-VioYGvLdF8Nxdyu7Jcj3k0ufUUhTIo0v+R+u+goAXN4=",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://github.com/bpc-clone/bpc_updates/releases/download/latest/bypass_paywalls_clean-latest.xpi"
|
"url": "https://github.com/bpc-clone/bpc_updates/releases/download/latest/bypass_paywalls_clean-latest.xpi"
|
||||||
},
|
},
|
||||||
@ -483,19 +483,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"proton-ge": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1710987994,
|
|
||||||
"narHash": "sha256-NqBzKonCYH+hNpVZzDhrVf+r2i6EwLG/IFBXjE2mC7s=",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-2/GE-Proton9-2.tar.gz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-2/GE-Proton9-2.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ren": {
|
"ren": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -555,7 +542,6 @@
|
|||||||
"nvim-lspconfig-src": "nvim-lspconfig-src",
|
"nvim-lspconfig-src": "nvim-lspconfig-src",
|
||||||
"nvim-tree-lua-src": "nvim-tree-lua-src",
|
"nvim-tree-lua-src": "nvim-tree-lua-src",
|
||||||
"nvim-treesitter-src": "nvim-treesitter-src",
|
"nvim-treesitter-src": "nvim-treesitter-src",
|
||||||
"proton-ge": "proton-ge",
|
|
||||||
"ren": "ren",
|
"ren": "ren",
|
||||||
"rep": "rep",
|
"rep": "rep",
|
||||||
"telescope-nvim-src": "telescope-nvim-src",
|
"telescope-nvim-src": "telescope-nvim-src",
|
||||||
|
@ -174,14 +174,6 @@
|
|||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
# GE version of Proton for game compatibility
|
|
||||||
# Alternatively, could consider using https://github.com/fufexan/nix-gaming
|
|
||||||
proton-ge = {
|
|
||||||
# https://github.com/GloriousEggroll/proton-ge-custom/releases
|
|
||||||
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-2/GE-Proton9-2.tar.gz";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Firefox addon from outside the extension store
|
# Firefox addon from outside the extension store
|
||||||
bypass-paywalls-clean = {
|
bypass-paywalls-clean = {
|
||||||
# https://gitlab.com/magnolia1234/bpc-uploads/-/commits/master/?ref_type=HEADS
|
# https://gitlab.com/magnolia1234/bpc-uploads/-/commits/master/?ref_type=HEADS
|
||||||
@ -260,7 +252,6 @@
|
|||||||
(import ./overlays/mpv-scripts.nix inputs)
|
(import ./overlays/mpv-scripts.nix inputs)
|
||||||
(import ./overlays/nextcloud-apps.nix inputs)
|
(import ./overlays/nextcloud-apps.nix inputs)
|
||||||
(import ./overlays/betterlockscreen.nix)
|
(import ./overlays/betterlockscreen.nix)
|
||||||
(import ./overlays/proton-ge.nix inputs)
|
|
||||||
(import ./overlays/gh-collaborators.nix)
|
(import ./overlays/gh-collaborators.nix)
|
||||||
(import ./overlays/bypass-paywalls-clean.nix inputs)
|
(import ./overlays/bypass-paywalls-clean.nix inputs)
|
||||||
(import ./overlays/ren-rep.nix inputs)
|
(import ./overlays/ren-rep.nix inputs)
|
||||||
|
@ -20,13 +20,7 @@
|
|||||||
programs.steam = {
|
programs.steam = {
|
||||||
enable = true;
|
enable = true;
|
||||||
remotePlay.openFirewall = true;
|
remotePlay.openFirewall = true;
|
||||||
package = pkgs.steam.override {
|
extraCompatPackages = [ pkgs.proton-ge-bin ];
|
||||||
# Adapted in part from: https://github.com/Shawn8901/nix-configuration/blob/1c48be94238a9f463cf0bbd1e1842a4454286514/modules/nixos/steam-compat-tools/default.nix
|
|
||||||
# Based on: https://github.com/NixOS/nixpkgs/issues/73323
|
|
||||||
extraEnv = {
|
|
||||||
STEAM_EXTRA_COMPAT_TOOLS_PATHS = lib.makeBinPath [ pkgs.proton-ge-custom ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
# Adapted from:
|
|
||||||
# https://github.com/Shawn8901/nix-configuration/blob/182a45a6b193143ff7ff8e78bb66f7b869ea48d4/packages/proton-ge-custom/default.nix
|
|
||||||
# Based on: https://github.com/NixOS/nixpkgs/issues/73323
|
|
||||||
|
|
||||||
inputs: _final: prev: {
|
|
||||||
proton-ge-custom = prev.stdenv.mkDerivation (finalAttrs: rec {
|
|
||||||
name = "proton-ge-custom";
|
|
||||||
version = prev.lib.removeSuffix "\n" (
|
|
||||||
builtins.head (builtins.match ".*GE-Proton(.*)" (builtins.readFile "${inputs.proton-ge}/version"))
|
|
||||||
);
|
|
||||||
src = inputs.proton-ge;
|
|
||||||
# Took from https://github.com/AtaraxiaSjel/nur/blob/cf83b14b102985a587a498ba2c56f9f2bd9b9eb6/pkgs/proton-ge/default.nix
|
|
||||||
installPhase = ''
|
|
||||||
runHook preBuild
|
|
||||||
mkdir -p $out/bin
|
|
||||||
cp -r ${src}/* -t $out/bin/
|
|
||||||
runHook postBuild
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user