diff --git a/flake.lock b/flake.lock index 03f278b..cb1d621 100644 --- a/flake.lock +++ b/flake.lock @@ -232,11 +232,11 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -341,11 +341,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -480,11 +480,11 @@ ] }, "locked": { - "lastModified": 1733317578, - "narHash": "sha256-anN/LcP5IuqEARvhPETg1vnbyG3IQ0wdvSAYEJfIQzA=", + "lastModified": 1733769654, + "narHash": "sha256-aVvYDt8eitZVF6fdOrSoIzYRkQ5Gh6kfRvqkiaDRLL0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ad48eb25cd0b00ce730da00fa1f8e6e6c27b397d", + "rev": "e952e94955dcc6fa2120c1430789fc41363f5237", "type": "github" }, "original": { @@ -601,6 +601,7 @@ "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner", @@ -610,11 +611,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1733335924, - "narHash": "sha256-1B5MWkNhZutZV11u3ysnPkam8lgQREW7wpihiXdWjlE=", + "lastModified": 1733864105, + "narHash": "sha256-/mIDAiJZyC8gcY5CfHQqP40xGvkRVklDEO34AR2TAC8=", "ref": "refs/heads/main", - "rev": "f9e4998a6d7713b19947b0db2c43ad88c5b71d80", - "revCount": 5513, + "rev": "4d05677e8d398b6fa144eae7a98ad4f2a54acb92", + "revCount": 5529, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -650,6 +651,35 @@ "type": "github" } }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733472316, + "narHash": "sha256-PvXiFLIExJEJj+goLbIuXLTN5CSDSAUsAfiYSdbbWg0=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "969427419276c7ee170301ef1ebe0f68eb6eb2e2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -852,11 +882,11 @@ ] }, "locked": { - "lastModified": 1733024876, - "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", + "lastModified": 1733629314, + "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", + "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", "type": "github" }, "original": { @@ -874,11 +904,11 @@ ] }, "locked": { - "lastModified": 1733273965, - "narHash": "sha256-VEDZCVm26QdoafSTnQhOWSTHA8amcc7OZJf/oScynPA=", + "lastModified": 1733706056, + "narHash": "sha256-qJi6QS+ODvguG9M8nURg3EmLvmgKN8jbEQgAJcfLH5o=", "owner": "Silveere", "repo": "nix-minecraft", - "rev": "df9166a8e4256ce1df87ec2481210ebc40a0b453", + "rev": "ad2eb4f6e26f8e64d4b1906ac64c1577525b7b1c", "type": "github" }, "original": { @@ -897,11 +927,11 @@ ] }, "locked": { - "lastModified": 1733277378, - "narHash": "sha256-jPhKF6d2UXBr2nkJIFuUjVXdo6kEwLuIMK3RyJeA60s=", + "lastModified": 1733709556, + "narHash": "sha256-u0ll0DDrKlO7tiLGGtmphv3wFy5ReDuf0USo/OlfROU=", "owner": "infinidoge", "repo": "nix-minecraft", - "rev": "ea8246bb2a70d33b5d332667a57da75e95c89af9", + "rev": "8d11f147df83fe137d3d94f6f3646e3a52bec855", "type": "github" }, "original": { @@ -919,11 +949,11 @@ ] }, "locked": { - "lastModified": 1731682434, - "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=", + "lastModified": 1733854371, + "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd", + "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888", "type": "github" }, "original": { @@ -957,11 +987,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -1021,11 +1051,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733097829, - "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", + "lastModified": 1733686850, + "narHash": "sha256-NQEO/nZWWGTGlkBWtCs/1iF1yl2lmQ1oY/8YZrumn3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", + "rev": "dd51f52372a20a93c219e8216fe528a648ffcbf4", "type": "github" }, "original": { @@ -1037,11 +1067,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733220138, - "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", + "lastModified": 1733730953, + "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", + "rev": "7109b680d161993918b0a126f38bc39763e5a709", "type": "github" }, "original": { @@ -1062,11 +1092,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -1158,11 +1188,11 @@ ] }, "locked": { - "lastModified": 1733279627, - "narHash": "sha256-NCNDAGPkdFdu+DLErbmNbavmVW9AwkgP7azROFFSB0U=", + "lastModified": 1733798086, + "narHash": "sha256-XHIh0h84xDnjkqampyNI/r2FAkKmwbL719ZsygiJHKE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4da5a80ef76039e80468c902f1e9f5c0eab87d96", + "rev": "8a19e07800d64462913f3dbf5c9a20ea7b50e6cd", "type": "github" }, "original": { @@ -1194,11 +1224,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1733262405, - "narHash": "sha256-/AT315It87ll6mlZLYcmfoe6Uogx9MjPBCCZZZTq8xY=", + "lastModified": 1733858997, + "narHash": "sha256-PMZdRUZQlouWgHFCFW8ANDFL6fUjZ67KAEaqRXwRwvc=", "owner": "danth", "repo": "stylix", - "rev": "ffba1f1bab63ea49541f812c72a4fcf305461d67", + "rev": "bc25f3d69d3bb54548b772d7c2771e65cc37dc10", "type": "github" }, "original": { @@ -1420,11 +1450,11 @@ ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1733157064, + "narHash": "sha256-NetqJHAN4bbZDQADvpep+wXk2AbMZ2bN6tINz8Kpz6M=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "fd85ef39369f95eed67fdf3f025e86916edeea2f", "type": "github" }, "original": { diff --git a/hosts/slab/nvidia-optimus.nix b/hosts/slab/nvidia-optimus.nix index ad69e9e..a195d8b 100644 --- a/hosts/slab/nvidia-optimus.nix +++ b/hosts/slab/nvidia-optimus.nix @@ -28,12 +28,8 @@ # Optionally, you may need to select the appropriate driver version for your specific GPU. package = let - - # security vulnerability fix stable = config.boot.kernelPackages.nvidiaPackages.stable; - beta = config.boot.kernelPackages.nvidiaPackages.beta; - - version = if (lib.versionOlder stable.version "565.57.01") then beta else stable; + version = stable; in version; prime = { diff --git a/overlays/mitigations.nix b/overlays/mitigations.nix index 39e7144..98e1c5b 100644 --- a/overlays/mitigations.nix +++ b/overlays/mitigations.nix @@ -48,6 +48,12 @@ in { now = 1724786296; in hold now 7 stable unstable; + qgis = let + stable = pkgsStable.qgis; + unstable = prev.qgis; + now = 1733871491; + in hold now 7 stable unstable; + redlib = let redlib-new = final.callPackage nixfiles.packages.${prev.system}.redlib.override {}; inherit (prev) redlib; diff --git a/system/hardware/nvidia.nix b/system/hardware/nvidia.nix index 5ebf16e..fa24303 100644 --- a/system/hardware/nvidia.nix +++ b/system/hardware/nvidia.nix @@ -69,12 +69,8 @@ in # Optionally, you may need to select the appropriate driver version for your specific GPU. package = let - - # security vulnerability fix stable = config.boot.kernelPackages.nvidiaPackages.stable; - beta = config.boot.kernelPackages.nvidiaPackages.beta; - - version = if (lib.versionOlder stable.version "565.57.01") then beta else stable; + version = stable; in lib.mkDefault version; }; };