peperunas/nixos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(nvidia): remove nvidia patch (upcoming sunshine doesn't need it)

Browse Source
This commit is contained in:
Giulio De Pasquale 2024-07-13 14:27:43 +01:00
parent 12eb35233f
commit f433081a8e
3 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
flake.lock generated
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717527182, "lastModified": 1720042825,
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "845a5c4c073f74105022533907703441e0464bc3", "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -35,27 +35,27 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1717244666, "lastModified": 1720875497,
"narHash": "sha256-ulXScQazlg5gIPbxQ4ZmxuItAaVS/ECee/tUULu3W3Y=", "narHash": "sha256-1Al1qDC8Q/s4viPq4ln8jfHWZxYl+Nb49dNFISFpqBY=",
"owner": "r-ryantm", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "239c8ca5385287a05ececa3a029354561b88b9f9", "rev": "b729601a9e6c459fd8884dea513af143111bed54",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "r-ryantm", "owner": "NixOS",
"ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "239c8ca5385287a05ececa3a029354561b88b9f9",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1717533996, "lastModified": 1720866271,
"narHash": "sha256-bBHBsdTaxfsldfvTzGGMyq3NCAd+mGjN5GsnL7/D5Kw=", "narHash": "sha256-ISkfXBgSXTufNStMgdXZ3ihCkUQMfcRnvtYM2XBbprE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ce4901de3c01fa0e8de0f92c39e5b585ff83e037", "rev": "bd39ef70892b6fd786bc9569219d7531f05a9988",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +73,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1714473972, "lastModified": 1720463530,
"narHash": "sha256-J1o+D45PXCmPZHvGpA8mhzb7BolvBv0wWY8vYo+WMp8=", "narHash": "sha256-oHFul4EmOfWVEuo7lbdjSZ6UAzRVOlYMyYj1H4ZTTLk=",
"owner": "icewind1991", "owner": "icewind1991",
"repo": "nvidia-patch-nixos", "repo": "nvidia-patch-nixos",
"rev": "0baf075bedfc84dc488000ae6c7cb4ed56967e2f", "rev": "2877c51b2b40a51a04c432dced00ee280fc932d2",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
flake.nix
View File

@ -7,13 +7,9 @@
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nvidia-patch = {
url = "github:icewind1991/nvidia-patch-nixos";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { self, nixpkgs, nixos-unstable, local-unstable, home-manager, nvidia-patch }: outputs = { self, nixpkgs, nixos-unstable, local-unstable, home-manager }:
let let
sysLinuxX64 = "x86_64-linux"; sysLinuxX64 = "x86_64-linux";
sysDarwin = "aarch64-darwin"; sysDarwin = "aarch64-darwin";
@ -40,7 +36,6 @@
overlays = [ overlays = [
(final: prev: { inherit unstablePkgs; }) (final: prev: { inherit unstablePkgs; })
(final: prev: { inherit localPkgs; }) (final: prev: { inherit localPkgs; })
(nvidia-patch.overlays.default)
]; ];
}; };

4
hosts/architect/sunshine.nix
View File

@ -1,9 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
# nvidia package to patch
nvidiaPackage = config.boot.kernelPackages.nvidiaPackages.latest;
user = "sunshine"; user = "sunshine";
resolutionScript = pkgs.writeTextFile { resolutionScript = pkgs.writeTextFile {
name = "sunshine-resolution-script"; name = "sunshine-resolution-script";
@ -83,7 +80,6 @@ in
powerManagement.finegrained = false; powerManagement.finegrained = false;
open = false; open = false;
nvidiaSettings = true; nvidiaSettings = true;
package = with pkgs; nvidia-patch.patch-nvenc (nvidia-patch.patch-fbc nvidiaPackage);
}; };
}; };