From 870f8fdde570885d1bba340c8a2363514488bbdd Mon Sep 17 00:00:00 2001 From: Nickolaj Jepsen Date: Tue, 15 Apr 2025 20:13:15 +0200 Subject: [PATCH] chore: update nvidia drivers --- flake.lock | 108 ++++++++++++++++++------------------- hosts/desktop/monitors.nix | 4 +- hosts/desktop/nvidia.nix | 8 ++- hosts/desktop/ssh.nix | 1 + hosts/work/ssh.nix | 1 - modules/base/ssh.nix | 2 +- 6 files changed, 65 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index 122e382..b3fe408 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1743265529, - "narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=", + "lastModified": 1744289235, + "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "1d2dbd72c2bbaceab031c592d4810f744741d203", + "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1743598667, - "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", + "lastModified": 1744145203, + "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", "owner": "nix-community", "repo": "disko", - "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", + "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", "type": "github" }, "original": { @@ -327,11 +327,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1743808813, - "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", + "lastModified": 1744117652, + "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", + "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", "type": "github" }, "original": { @@ -507,11 +507,11 @@ ] }, "locked": { - "lastModified": 1739049071, - "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", + "lastModified": 1743953322, + "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", + "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d", "type": "github" }, "original": { @@ -536,11 +536,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1743975687, - "narHash": "sha256-k21wOvAEzCLHIUsVG551y6cMxmQ7sXQLOtlxQXV09xk=", + "lastModified": 1744646317, + "narHash": "sha256-Vs5vKsYOtUBdUyHZ9zmKZxhcEnwm9KM8LUhww44JKtE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "51838fb5f5b5b03bca99b324fb1f6494d3854f89", + "rev": "8b7b169043de2a9d95f8505edb8b6576fac586fd", "type": "github" }, "original": { @@ -658,11 +658,11 @@ ] }, "locked": { - "lastModified": 1741191527, - "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", + "lastModified": 1744468525, + "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", + "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", "type": "github" }, "original": { @@ -723,11 +723,11 @@ }, "mnw": { "locked": { - "lastModified": 1742255973, - "narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=", + "lastModified": 1744592022, + "narHash": "sha256-QuWrCRiF3CUM99sgj3gXbIzB1IAVWS5IEfFHadbMA2g=", "owner": "Gerg-L", "repo": "mnw", - "rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d", + "rev": "cf9e19413b6c2d995b55565cd99facf9c751b653", "type": "github" }, "original": { @@ -769,11 +769,11 @@ ] }, "locked": { - "lastModified": 1743911143, - "narHash": "sha256-4j4JPwr0TXHH4ZyorXN5yIcmqIQr0WYacsuPA4ktONo=", + "lastModified": 1744518957, + "narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a36f6a7148aec2c77d78e4466215cceb2f5f4bfb", + "rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd", "type": "github" }, "original": { @@ -788,11 +788,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1743991003, - "narHash": "sha256-9nEnUVjeOWMS9MJ/WSPqQHRk4VA4mW+fSCEmYTWSTYU=", + "lastModified": 1744682419, + "narHash": "sha256-mS501Cff7cxofR5YwV5e8lyKuZz07uF/U7EKFy9IIv4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "afea163e70930ffffcf967b66a1c107f8a18be13", + "rev": "317477b679d95ad2f40c960272324987e81786a4", "type": "github" }, "original": { @@ -882,11 +882,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1740877520, - "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", "type": "github" }, "original": { @@ -897,11 +897,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1743827369, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "42a1c966be226125b48c384171c44c651c236c22", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -913,11 +913,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743827369, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "42a1c966be226125b48c384171c44c651c236c22", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -945,11 +945,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1743813633, - "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -984,11 +984,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1744007743, - "narHash": "sha256-u+qG0X7Cos1EnoI4F74F+e2gINv/fhy5iHi4PrzNOkQ=", + "lastModified": 1744739247, + "narHash": "sha256-UAtagy5rLeiUMrGV+6VkXKyhKXf/NHRmKSJ2OobrocM=", "owner": "nix-community", "repo": "NUR", - "rev": "7721197bf367c022b0f3573a33516b6ee0a4e8c9", + "rev": "6f7e7406290a793d1c9bff22d79d1b2b83d13084", "type": "github" }, "original": { @@ -1009,11 +1009,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1743917753, - "narHash": "sha256-rtMPRr5aqspypIdCfU8KjuKGlFkBEYnC5sv/sjZW2AQ=", + "lastModified": 1744639354, + "narHash": "sha256-AwUtAeDokimPucrPVj0YuoFWZ/xFVL4wy2wxZN5+u20=", "owner": "notashelf", "repo": "nvf", - "rev": "585dfca7ca75c8190bd1596f3ebc6fde6751c7a5", + "rev": "f516cb43ceb2b071e6b9a6d5c9d681c8a3187f5f", "type": "github" }, "original": { @@ -1250,11 +1250,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1743748085, - "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", + "lastModified": 1744707583, + "narHash": "sha256-IPFcShGro/UUp8BmwMBkq+6KscPlWQevZi9qqIwVUWg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", + "rev": "49d05555ccdd2592300099d6a657cc33571f4fe0", "type": "github" }, "original": { @@ -1291,11 +1291,11 @@ ] }, "locked": { - "lastModified": 1741934139, - "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", + "lastModified": 1744644585, + "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", + "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26", "type": "github" }, "original": { diff --git a/hosts/desktop/monitors.nix b/hosts/desktop/monitors.nix index 937cbac..76ec460 100644 --- a/hosts/desktop/monitors.nix +++ b/hosts/desktop/monitors.nix @@ -1,7 +1,7 @@ _: { monitors = [ { - name = "DP-2"; + name = "DP-3"; resolution = "2560x1440"; refreshRate = 144; position = "2560x1080"; @@ -19,7 +19,7 @@ _: { position = "5120x1080"; } { - name = "DP-3"; + name = "DP-2"; resolution = "1920x1080"; refreshRate = 60; position = "2880x0"; diff --git a/hosts/desktop/nvidia.nix b/hosts/desktop/nvidia.nix index 3f5f82b..47dae8d 100644 --- a/hosts/desktop/nvidia.nix +++ b/hosts/desktop/nvidia.nix @@ -1,4 +1,8 @@ -_: { +{ + config, + pkgsUnstable, + ... +}: { hardware = { graphics = { enable = true; @@ -6,8 +10,10 @@ _: { nvidia = { open = true; modesetting.enable = true; + package = config.boot.kernelPackages.nvidiaPackages.beta; }; }; + boot.kernelPackages = pkgsUnstable.linuxPackages_6_14; services.xserver.videoDrivers = ["nvidia"]; fireproof.home-manager.wayland.windowManager.hyprland.settings = { diff --git a/hosts/desktop/ssh.nix b/hosts/desktop/ssh.nix index 82203ad..fd51ca7 100644 --- a/hosts/desktop/ssh.nix +++ b/hosts/desktop/ssh.nix @@ -1,6 +1,7 @@ {lib, ...}: { fireproof.home-manager.programs.ssh.matchBlocks = { "bastion.ao" = { + hostname = "62.199.221.53"; proxyJump = lib.mkForce null; }; }; diff --git a/hosts/work/ssh.nix b/hosts/work/ssh.nix index b8cf2bb..bd64e8f 100644 --- a/hosts/work/ssh.nix +++ b/hosts/work/ssh.nix @@ -10,7 +10,6 @@ hostname = "192.168.2.6"; }; "clickhouse.ao" = { - hostname = "51.158.205.48"; proxyJump = "bastion.ao"; }; "server" = { diff --git a/modules/base/ssh.nix b/modules/base/ssh.nix index c7df139..464a048 100644 --- a/modules/base/ssh.nix +++ b/modules/base/ssh.nix @@ -40,7 +40,7 @@ in { }; "clickhouse.ao" = { user = "ubuntu"; - proxyJump = lib.mkDefault "bastion.ao"; + hostname = "51.158.205.48"; identityFile = "${config.age.secrets.ssh-key-ao.path}"; }; "flex.ao" = {