nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix gamescope

This commit is contained in:
Nathan McCarty 2022-11-29 00:19:59 -05:00
parent 3303b42960
commit d33096c296
Signed by: thatonelutenist
GPG Key ID: D70DA3DD4D1E9F96
4 changed files with 31 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
flake.lock
View File

@ -185,55 +185,12 @@
"type": "github" "type": "github"
} }
}, },
"gamescope": {
"inputs": {
"gamescope-src": "gamescope-src",
"nixpkgs": [
"nixpkgs-unstable"
],
"nixpkgs-unstable": [
"nixpkgs-unstable"
],
"utils": "utils"
},
"locked": {
"lastModified": 1665632996,
"narHash": "sha256-v5Zg5nPuIFtzk4wJQu74vQzZ4H/gLIDjbrqMUNdNzNI=",
"owner": "nathans-flakes",
"repo": "gamescope",
"rev": "47b1930844af94f2bdbd619ae62beecb805960b1",
"type": "github"
},
"original": {
"owner": "nathans-flakes",
"repo": "gamescope",
"type": "github"
}
},
"gamescope-src": {
"flake": false,
"locked": {
"lastModified": 1665507944,
"narHash": "sha256-+0ekpjSb/1PRX84uGY8fDN2r4N+zn1xnbvG++QSvRb4=",
"ref": "master",
"rev": "f51b7229ae80794e514be20e6080ba4e93864a57",
"revCount": 1234,
"submodules": true,
"type": "git",
"url": "https://github.com/Plagman/gamescope.git"
},
"original": {
"submodules": true,
"type": "git",
"url": "https://github.com/Plagman/gamescope.git"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils_2" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1669071065, "lastModified": 1669071065,
@ -293,7 +250,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils_3" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1656122108, "lastModified": 1656122108,
@ -315,7 +272,7 @@
"quilt-server", "quilt-server",
"nixpkgs" "nixpkgs"
], ],
"utils": "utils_4" "utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1656122108, "lastModified": 1656122108,
@ -641,7 +598,6 @@
"emacs": "emacs", "emacs": "emacs",
"fenix": "fenix", "fenix": "fenix",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"gamescope": "gamescope",
"home-manager": "home-manager", "home-manager": "home-manager",
"idris2": "idris2", "idris2": "idris2",
"java": "java", "java": "java",
@ -681,11 +637,11 @@
"swaywm-toggler": "swaywm-toggler" "swaywm-toggler": "swaywm-toggler"
}, },
"locked": { "locked": {
"lastModified": 1668270994, "lastModified": 1669435317,
"narHash": "sha256-6VSgifOGtkF58MPH/y8UMsPk3Zw8AgzlSsE+unleg68=", "narHash": "sha256-9ZO5kpNPvpLQM0yKfJUBhz8yg47jx66Fdz1Rt/2dogk=",
"ref": "trunk", "ref": "trunk",
"rev": "caabaeb229ad9fd25bece81bdec9b5d3ce6a103e", "rev": "000a38cb2a4189d7aa1c2f530630111866f4dba1",
"revCount": 3, "revCount": 4,
"type": "git", "type": "git",
"url": "https://git.sr.ht/~thatonelutenist/Scripts" "url": "https://git.sr.ht/~thatonelutenist/Scripts"
}, },
@ -753,21 +709,6 @@
} }
}, },
"utils": { "utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -782,7 +723,7 @@
"type": "github" "type": "github"
} }
}, },
"utils_3": { "utils_2": {
"locked": { "locked": {
"lastModified": 1653893745, "lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
@ -797,7 +738,7 @@
"type": "github" "type": "github"
} }
}, },
"utils_4": { "utils_3": {
"locked": { "locked": {
"lastModified": 1653893745, "lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",

11
flake.nix
View File

@ -53,13 +53,6 @@
url = "github:nix-community/NixOS-WSL"; url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
gamescope = {
url = "github:nathans-flakes/gamescope";
inputs = {
nixpkgs.follows = "nixpkgs-unstable";
nixpkgs-unstable.follows = "nixpkgs-unstable";
};
};
idris2 = { idris2 = {
url = "github:idris-lang/idris2"; url = "github:idris-lang/idris2";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -69,8 +62,8 @@
outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, nixos-hardware outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, nixos-hardware
, fenix, emacs, sops-nix, home-manager, darwin, prismlauncher, java , fenix, emacs, sops-nix, home-manager, darwin, prismlauncher, java
, quilt-server, nixos-generators, wsl, gamescope, nix-on-droid, idris2 , quilt-server, nixos-generators, wsl, nix-on-droid, idris2, scripts
, scripts }@inputs: }@inputs:
let let
makeNixosSystem = makeNixosSystem =
{ system, hostName, extraModules ? [ ], ourNixpkgs ? nixpkgs }: { system, hostName, extraModules ? [ ], ourNixpkgs ? nixpkgs }:

9
machines/levitation/configuration.nix
View File

@ -70,15 +70,6 @@
# TPM setup # TPM setup
security = { tpm2 = { enable = true; }; }; security = { tpm2 = { enable = true; }; };
# Install gamescope
environment.systemPackages =
[ inputs.gamescope.defaultPackage."x86_64-linux" ];
nixpkgs.config.packageOverrides = pkgs: {
steam = pkgs.steam.override {
extraPkgs = pkgs: [ inputs.gamescope.defaultPackage."x86_64-linux" ];
};
};
# Configure nix build # Configure nix build
nix.settings = { nix.settings = {
cores = 8; cores = 8;

20
modules/linux/programs/games.nix
View File

@ -18,6 +18,7 @@ in with lib; {
# Prism Launcher minecraft stuff # Prism Launcher minecraft stuff
inputs.prismlauncher.packages."${system}".prismlauncher inputs.prismlauncher.packages."${system}".prismlauncher
glfw-patched glfw-patched
gamescope
]; ];
unstable-packages = unstable-packages =
with inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}"; with inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}";
@ -28,5 +29,24 @@ in with lib; {
in stable-packages ++ unstable-packages; in stable-packages ++ unstable-packages;
# Install steam # Install steam
programs.steam.enable = true; programs.steam.enable = true;
# Make steam work with gamescope
nixpkgs.config.packageOverrides = pkgs: {
steam = pkgs.steam.override {
extraPkgs = pkgs:
with pkgs; [
xorg.libXcursor
xorg.libXi
xorg.libXinerama
xorg.libXScrnSaver
libpng
libpulseaudio
libvorbis
stdenv.cc.cc.lib
libkrb5
keyutils
gtk3
];
};
};
}; };
} }