Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nvidia: Update to 560.35.03 #360

Merged
merged 2 commits into from
Aug 30, 2024
Merged

nvidia: Update to 560.35.03 #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0310be0
bump(nvidia): Update nvidia to 560.35.03
TLATER Aug 29, 2024
b20aa35
fix(nvidia): Bump sway to unstable to prevent flickering
TLATER Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
inputs = {
# NixOS related inputs
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";

nixos-hardware.url = "github:NixOS/nixos-hardware/master";
sops-nix = {
Expand Down
56 changes: 49 additions & 7 deletions nixos-config/hosts/yui/nvidia/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
{ config, lib, ... }:
{ pkgs, flake-inputs, config, lib, ... }:
let
unstable = flake-inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
in
{
imports = [ ./vaapi.nix ];

hardware.nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "555.58.02";
sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
sha256_aarch64 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY=";
openSha256 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY=";
settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
persistencedSha256 = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
version = "560.35.03";
sha256_64bit = "sha256-8pMskvrdQ8WyNBvkU/xPc/CtcYXCa7ekP73oGuKfH+M=";
sha256_aarch64 = "sha256-s8ZAVKvRNXpjxRYqM3E5oss5FdqW+tv1qQC2pDjfG+s=";
openSha256 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg=";
settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk=";
persistencedSha256 = "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs=";
};

# The nvidia-settings build is currently broken due to a missing
# vulkan header; re-enable whenever
# 0384602eac8bc57add3227688ec242667df3ffe3the hits stable.
nvidiaSettings = false;

modesetting.enable = true;
# Power management is required to get nvidia GPUs to behave on
# suspend, due to firmware bugs. Aren't nvidia great?
Expand All @@ -24,6 +32,40 @@
};
};

nixpkgs.overlays = [
(final: _prev: {
sway-unwrapped = unstable.sway-unwrapped.overrideAttrs (attrs: {
version = "0-unstable-2024-08-28";
src = final.fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = "980a4e02113789d0cca94aa023557c6f6e87ec73";
hash = "sha256-qciZeQghlLV5aMuOnex3LvFU9vTa941RMlUkdvj0QTU=";
};
buildInputs = attrs.buildInputs ++ [ final.wlroots ];
mesonFlags =
let
inherit (lib.strings) mesonEnable mesonOption;
in
[
(mesonOption "sd-bus-provider" "libsystemd")
(mesonEnable "tray" attrs.trayEnabled)
];
});

wlroots = unstable.wlroots.overrideAttrs (_attrs: {
version = "0-unstable-2024-08-29";
src = final.fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = "beb9a9ad0a38867154b7606911c33ffa5ecf759f";
hash = "sha256-ZlNFxwj3c5zKiSfokA27zhJ+Yar8cma4fj6N/ulI0VM=";
};
});
})
];

boot = {
kernelParams = [
"nvidia-drm.fbdev=1"
Expand Down