From a49dc7014861c76af1f50e07b38ac6e0bbf93dea Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Tue, 29 Apr 2025 20:26:52 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=EF=B8=8F=20[desktop]=20Update=20pa?= =?UTF-8?q?ckages,=20update=20Linux=20kernel=20to=20latest,=20update=20Nvi?= =?UTF-8?q?dia=20drivers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 66 ++++++++++----------- hosts/desktop/default.nix | 3 + shared/modules/hardware/graphics/nvidia.nix | 25 +++++++- 3 files changed, 58 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index e569a15..44a7173 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744793570, - "narHash": "sha256-BzulTVLpbapBxsJ1b1ZNPSg94YIbgs/75fNyiv2uWNg=", + "lastModified": 1745598511, + "narHash": "sha256-GWYB7PngGwTJrp7gr0w6E5nnvwiblPvN2kjRCQw3ZEg=", "owner": "catppuccin", "repo": "nix", - "rev": "192378974a131c402633bee18dc892b804a663e0", + "rev": "199cb288a85b15ed203089804c024ae5b3eacd7c", "type": "github" }, "original": { @@ -67,11 +67,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1744513122, - "narHash": "sha256-DPxL9yHkIvmNfpd49LeOOpT9NYrzHpgYbTO1yQg6Zh4=", + "lastModified": 1745469639, + "narHash": "sha256-LNIzSWQ+xoVpanW4NKdN7Np8z9CtoU2+yXaztH1Upt4=", "owner": "rishabh5321", "repo": "grayjay-flake", - "rev": "84accd21a2e69709040a0eea22fccdb743c9e64c", + "rev": "da25d4ae2cd44954d6655ceb4781e766c2b1cccb", "type": "github" }, "original": { @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "lastModified": 1745557122, + "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", "owner": "nix-community", "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744098102, - "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -159,11 +159,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -191,11 +191,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1745234285, + "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", "type": "github" }, "original": { @@ -223,11 +223,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { @@ -274,11 +274,11 @@ ] }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1745310711, + "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", "owner": "mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", "type": "github" }, "original": { @@ -295,11 +295,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1744682091, - "narHash": "sha256-zudMf0YW3mB0f2XnWPAjYdKioJPaJQchhO4bCeBOZAI=", + "lastModified": 1745727291, + "narHash": "sha256-YW/V93WgJur6a3BVa1jynlKr2pyZlEpiXXjQjpSHc5s=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "44ed9eb751a6966ffb291edbda2e9bebd3ebcd4a", + "rev": "9e5c7a2e7f1ab3118ec9b7179eb28667a3575f0e", "type": "github" }, "original": { @@ -329,11 +329,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1744777359, - "narHash": "sha256-20REqJW54bbQIBuP19fcjPamV9mpWN0+RPcp5hQwwLI=", + "lastModified": 1745757285, + "narHash": "sha256-kDCv++sAfALKJM4unFdX6Pz3R4y2twchJ8lSLOIOkbQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d2bb30f451ef7802aca1954a6eb75efbc4c25872", + "rev": "e70d270a3927d8e78254ad049908b3535ba40f73", "type": "github" }, "original": { diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 26e06e8..f463c93 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -1,5 +1,6 @@ { lib, + pkgs, ... }: @@ -8,4 +9,6 @@ (lib.custom.relativeToRoot "shared/modules") ./hardware-configuration.nix ]; + + boot.kernelPackages = pkgs.linuxPackages_latest; } diff --git a/shared/modules/hardware/graphics/nvidia.nix b/shared/modules/hardware/graphics/nvidia.nix index 5b30c84..30284b8 100644 --- a/shared/modules/hardware/graphics/nvidia.nix +++ b/shared/modules/hardware/graphics/nvidia.nix @@ -1,4 +1,5 @@ { + config, pkgs, lib, systemConfig, @@ -19,12 +20,30 @@ lib.mkIf systemConfig.nvidia.enable { nvidia = { # Required modesetting.enable = true; - # Use closed-source drivers - open = false; + # Use open-source kernel module + open = true; # Enable the Nvidia settings menu nvidiaSettings = true; # Enable nvidia-suspend.service, nvidia-hibernate.service and nvidia-resume.service - powerManagement.enable = true; + powerManagement = { + enable = true; + finegrained = false; + }; + + # https://discourse.nixos.org/t/nvidia-dgpu-prime-offload-mode-amd-igpu-wayland/63194/3 + package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + version = "570.133.07"; + # this is the third one it will complain is wrong + sha256_64bit = "sha256-LUPmTFgb5e9VTemIixqpADfvbUX1QoTT2dztwI3E3CY="; + # unused + sha256_aarch64 = "sha256-2l8N83Spj0MccA8+8R1uqiXBS0Ag4JrLPjrU3TaXHnM="; + # this is the second one it will complain is wrong + openSha256 = "sha256-9l8N83Spj0MccA8+8R1uqiXBS0Ag4JrLPjrU3TaXHnM="; + # this is the first one it will complain is wrong + settingsSha256 = "sha256-XMk+FvTlGpMquM8aE8kgYK2PIEszUZD2+Zmj2OpYrzU="; + # unused + persistencedSha256 = "sha256-4l8N83Spj0MccA8+8R1uqiXBS0Ag4JrLPjrU3TaXHnM="; + }; }; };