From 2389ca1a05e0ae50f184343a6bcb325eb3fde3d9 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Tue, 27 May 2025 20:10:51 +0200 Subject: [PATCH 01/19] nixos/shell: patch kitty for `copy-ansi-to-clipboard` fix https://github.com/kovidgoyal/kitty/issues/8682 --- nixos/modules/shell.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/shell.nix b/nixos/modules/shell.nix index 891e3b9..21d7088 100644 --- a/nixos/modules/shell.nix +++ b/nixos/modules/shell.nix @@ -15,7 +15,17 @@ in aliasDrag ranger-git ripgrep - kitty + (kitty.overrideAttrs (superAttrs: { + patches = superAttrs.patches or [] ++ [ + (fetchpatch { + url = "https://github.com/AmirulAndalib/kitty/commit/61fd8c4003b361503160424cbed1960153f40290.patch"; + excludes = lib.map lib.escapeRegex [ + "docs/changelog.rst" + ]; + hash = "sha256-TqO/pLRkxN+Mz4nfNfTntGpPoy6OgbtAGmdohG/1BFs="; + }) + ]; + })) zoxide ]) ++ [ ( From a1208a79b2785b7b2f504776ceb61702fd185662 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Tue, 27 May 2025 22:01:39 +0200 Subject: [PATCH 02/19] lock: update --- lock.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lock.nix b/lock.nix index 64f2376..916cb9b 100644 --- a/lock.nix +++ b/lock.nix @@ -4,19 +4,19 @@ sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY="; }; nixpkgs = { - revision = "55d1f923c480dadce40f5231feb472e81b0bab48"; - sha256 = "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ="; + revision = "7c43f080a7f28b2774f3b3f43234ca11661bf334"; + sha256 = "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8="; }; nixpkgs-unstable = { - revision = "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f"; - sha256 = "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q="; + revision = "62b852f6c6742134ade1abdd2a21685fd617a291"; + sha256 = "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE="; }; nix-bitcoin = { - revision = "e7e6353b3a72205b037be53eda2e71e24e46b45e"; - sha256 = "sha256-Y53kyw7CQUEUiKPVQQzCMB4OIiZtOoFNurJhhM6Xvx4="; + revision = "a06d1d8118865af14a9187e7d1a7a141dd89af74"; + sha256 = "sha256-F4zdOfeg0xjEnvFjlHvoMmdmh/FxK1qIsZyscnGDgA0="; }; cosmic-modules = { - revision = "e3bea95daa167bf84a4bf3387ef6f01f081152b6"; - sha256 = "sha256-QhmqgiAGqR7VYxyNsdpR2qfejRnviyf7ElZ8v8MtwwY="; + revision = "0a1296763984091aaf89edb20f58c8a9a7f6c35f"; + sha256 = "sha256-YqrBiFjWatkfZqMqdZQyF9JOdw4ujcVTlcnWS5EASv0="; }; } From 4aa82369574c310bf582f40625a2c775ea073557 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 30 May 2025 19:05:18 +0200 Subject: [PATCH 03/19] nixos/shell: make sure zoxide is evaled latest --- nixos/modules/shell.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/nixos/modules/shell.nix b/nixos/modules/shell.nix index 21d7088..2c70c93 100644 --- a/nixos/modules/shell.nix +++ b/nixos/modules/shell.nix @@ -39,15 +39,19 @@ in HISTCONTROL=ignoreboth ''; - programs.bash.interactiveShellInit = '' - HISTCONTROL=ignoreboth - if test -n "$KITTY_INSTALLATION_DIR"; then - export KITTY_SHELL_INTEGRATION="enabled,no-sudo" - source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash" - fi - eval "''$(zoxide init bash)" - alias bye=exit - ''; + programs.bash.interactiveShellInit = lib.mkMerge [ + '' + HISTCONTROL=ignoreboth + if test -n "$KITTY_INSTALLATION_DIR"; then + export KITTY_SHELL_INTEGRATION="enabled,no-sudo" + source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash" + fi + alias bye=exit + '' + (lib.mkAfter '' + eval "''$(${lib.getExe pkgs.zoxide} init bash)" + '') + ]; environment.etc."xdg/kitty/kitty.conf".text = '' font_family MesloLGS Nerd Font From 91e4fdba560493cac5cdf258ab07eaa6165fb820 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 30 May 2025 20:58:02 +0200 Subject: [PATCH 04/19] pkgs/overlays/unstable-from-source: remove unnecesary function --- pkgs/overlays/unstable-from-source.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/overlays/unstable-from-source.nix b/pkgs/overlays/unstable-from-source.nix index bca6b9f..dbd0728 100644 --- a/pkgs/overlays/unstable-from-source.nix +++ b/pkgs/overlays/unstable-from-source.nix @@ -15,26 +15,26 @@ let "parsed" ]; - unstablePkgsForNixpkgs = nixpkgs: import unstableSource { + unstablePkgs = import unstableSource { # localSystem -> pkgs.stdenv.buildPlatform - localSystem = sanitizePlatform nixpkgs.stdenv.buildPlatform; + localSystem = sanitizePlatform self.stdenv.buildPlatform; # crossSystem -> pkgs.stdenv.hostPlatform or pkgs.stdenv.targetPlatform ?? # passing below # config -> pkgs.config - config = nixpkgs.config; + config = self.config; # overlays -> partial of pkgs.overlays - overlays = nixpkgs.overlays; + overlays = self.overlays; # crossOverlays -> partial of pkgs.overlays # crossOverlays are merged to overlays, not sure what issues that might raise. # ignoring. } // self.lib.optionalAttrs ( - self.lib.systems.equals nixpkgs.stdenv.buildPlatform nixpkgs.stdenv.hostPlatform + self.lib.systems.equals self.stdenv.buildPlatform self.stdenv.hostPlatform ) { # workaround for some odd structured packages that changes behaviour # when crossSystem is passed. - crossSystem = sanitizePlatform nixpkgs.stdenv.hostPlatform; + crossSystem = sanitizePlatform self.stdenv.hostPlatform; }; in { - "${attributeName}" = if useUnstable then unstablePkgsForNixpkgs self else self; + "${attributeName}" = if useUnstable then unstablePkgs else self; } From f54c76a6ceb43efcf6a323d65f92ba6aee0a485f Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 30 May 2025 20:04:05 +0200 Subject: [PATCH 05/19] nixos/razer: update openrazer package to 3.10.3 --- nixos/modules/razer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/razer.nix b/nixos/modules/razer.nix index f299e95..cfcda07 100644 --- a/nixos/modules/razer.nix +++ b/nixos/modules/razer.nix @@ -15,14 +15,14 @@ # NIXPKGS-PR: 384992 packages = let oldVersion = pkgs.python3Packages.openrazer-daemon.version; - version = "3.10.1"; + version = "3.10.3"; in lib.mapAttrs (_: package: package.overrideAttrs (oldAttrs: { version = lib.replaceStrings [ oldVersion ] [ version ] oldAttrs.version; src = pkgs.fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; tag = "v${version}"; - hash = "sha256-igrGx7Y6ENtZatJCTAW43/0q6ZjljJ9/kU3QFli4yIU="; + hash = "sha256-M5g3Rn9WuyudhWQfDooopjexEgGVB0rzfJsPg+dqwn4="; }; })) { kernel = config.boot.kernelPackages.openrazer; From d5569e43210893e2bff6ee00558e27cf6067dde1 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 30 May 2025 19:04:13 +0200 Subject: [PATCH 06/19] nixos/nvidia: update --- nixos/modules/nvidia.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/nixos/modules/nvidia.nix b/nixos/modules/nvidia.nix index afd3d33..d3c3442 100644 --- a/nixos/modules/nvidia.nix +++ b/nixos/modules/nvidia.nix @@ -24,12 +24,18 @@ nvidiaSettings = true; package = let mkDriverArgs = { - version = "575.51.02"; - sha256_64bit = "sha256-XZ0N8ISmoAC8p28DrGHk/YN1rJsInJ2dZNL8O+Tuaa0="; - sha256_aarch64 = "sha256-NNeQU9sPfH1sq3d5RUq1MWT6+7mTo1SpVfzabYSVMVI="; - openSha256 = "sha256-NQg+QDm9Gt+5bapbUO96UFsPnz1hG1dtEwT/g/vKHkw="; - settingsSha256 = "sha256-6n9mVkEL39wJj5FB1HBml7TTJhNAhS/j5hqpNGFQE4w="; - persistencedSha256 = "sha256-dgmco+clEIY8bedxHC4wp+fH5JavTzyI1BI8BxoeJJI="; + version = "575.57.08"; + sha256_64bit = "sha256-KqcB2sGAp7IKbleMzNkB3tjUTlfWBYDwj50o3R//xvI="; + sha256_aarch64 = "sha256-VJ5z5PdAL2YnXuZltuOirl179XKWt0O4JNcT8gUgO98="; + openSha256 = "sha256-DOJw73sjhQoy+5R0GHGnUddE6xaXb/z/Ihq3BKBf+lg="; + settingsSha256 = "sha256-AIeeDXFEo9VEKCgXnY3QvrW5iWZeIVg4LBCeRtMs5Io="; + persistencedSha256 = "sha256-Len7Va4HYp5r3wMpAhL4VsPu5S0JOshPFywbO7vYnGo="; + patches = [ + (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/rpmfusion/nvidia-kmod/020f5fabfb067150f8dd0d6e470a7a694f59eb59/Workaround-nv_vm_flags_-calling-GPL-only-code.patch"; + hash = "sha256-2WQs8WDVzNivwUSWn7t2hoduUVvmem5e+JpGt04380c="; + }) + ]; }; in ( config.boot.kernelPackages.nvidiaPackages.mkDriver mkDriverArgs ).overrideAttrs (super: { passthru = super.passthru or {} // { From a3735e02a904fba49ef2dc9ecf0b5ee1221d5bb2 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sat, 31 May 2025 08:06:18 +0200 Subject: [PATCH 07/19] lock: update --- lock.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lock.nix b/lock.nix index 916cb9b..821100a 100644 --- a/lock.nix +++ b/lock.nix @@ -4,19 +4,19 @@ sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY="; }; nixpkgs = { - revision = "7c43f080a7f28b2774f3b3f43234ca11661bf334"; - sha256 = "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8="; + revision = "7282cb574e0607e65224d33be8241eae7cfe0979"; + sha256 = "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04="; }; nixpkgs-unstable = { - revision = "62b852f6c6742134ade1abdd2a21685fd617a291"; - sha256 = "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE="; + revision = "96ec055edbe5ee227f28cdbc3f1ddf1df5965102"; + sha256 = "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg="; }; nix-bitcoin = { revision = "a06d1d8118865af14a9187e7d1a7a141dd89af74"; sha256 = "sha256-F4zdOfeg0xjEnvFjlHvoMmdmh/FxK1qIsZyscnGDgA0="; }; cosmic-modules = { - revision = "0a1296763984091aaf89edb20f58c8a9a7f6c35f"; - sha256 = "sha256-YqrBiFjWatkfZqMqdZQyF9JOdw4ujcVTlcnWS5EASv0="; + revision = "89fbcfbd276eb2e3dca2e1efbcb893b3f7ec2501"; + sha256 = "sha256-UIrxKECO6iWOYmTgJ9c3noO00oDvOJKyAp13Or/wnRU="; }; } From 955083407ec7cefecb263c1e6b2d1915a42cb7d1 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 1 Jun 2025 18:48:45 +0200 Subject: [PATCH 08/19] pkgs/overlays/unstable-from-source: allow to provide callPackage that means that you can build package from unstable, while using dependencies for a given unstable package from stable needs more testing with nested packages and package sets, but I don't see why it wouldn't work --- pkgs/overlays/unstable-from-source.nix | 35 +++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/pkgs/overlays/unstable-from-source.nix b/pkgs/overlays/unstable-from-source.nix index dbd0728..7ff3cae 100644 --- a/pkgs/overlays/unstable-from-source.nix +++ b/pkgs/overlays/unstable-from-source.nix @@ -1,10 +1,21 @@ { unstableSource, attributeName ? "unstable", + # callPackage :: function | boolean + callPackage ? false, }: self: super: +assert self.lib.assertMsg ( + self.lib.isFunction callPackage + || self.lib.isBool callPackage +) '' + callPackage argument should be a function or a boolean. + If you want to use the callPackage from self, set it to true. + If you want to use a custom callPackage, set it to a function (pkgs.callPackage). +''; + let useUnstable = self.config.useUnstable or true; sanitizePlatform = platformConfig: self.lib.removeAttrs platformConfig [ @@ -34,7 +45,29 @@ let # when crossSystem is passed. crossSystem = sanitizePlatform self.stdenv.hostPlatform; }; + + callPackage' = if builtins.isFunction callPackage then callPackage + else if builtins.isBool callPackage && callPackage then self.callPackage + else if builtins.isBool callPackage && !callPackage then throw "this should never be evaluated" + else throw "callPackage should be a function (callPackage) or a boolean"; + + callPackagesUnstablePkgs = self.lib.mapAttrsRecursiveCond ( + attrset: !(self.lib.hasAttr "override" attrset) && attrset.recurseForDerivations or false + ) ( + _: unstablePackage: callPackage' { + # For some reason, override functor of the package has its argument set as required, + # which is totally false! the override functor can take all of those arguemnts optionally. + __functionArgs = self.lib.mapAttrs (_: _: true) (self.lib.functionArgs unstablePackage.override); + __functor = + if builtins.isFunction unstablePackage.override then unstablePackage.override + else unstablePackage.override.__functor; + } {} + ) unstablePkgs; + in { - "${attributeName}" = if useUnstable then unstablePkgs else self; + "${attributeName}" = if !useUnstable then self + # if callPackage is not false + else if builtins.isBool callPackage && !callPackage then callPackagesUnstablePkgs + else unstablePkgs; } From 2d88df163ae660e2ac339d8abc8a97fb1954b5a3 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 1 Jun 2025 19:45:20 +0200 Subject: [PATCH 09/19] pkgs/overlays/unstable-from-source: fix infinite recursion in assert also fix checking of callPackage argument, it was opposite --- pkgs/overlays/unstable-from-source.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/overlays/unstable-from-source.nix b/pkgs/overlays/unstable-from-source.nix index 7ff3cae..cd2ac95 100644 --- a/pkgs/overlays/unstable-from-source.nix +++ b/pkgs/overlays/unstable-from-source.nix @@ -7,15 +7,6 @@ self: super: -assert self.lib.assertMsg ( - self.lib.isFunction callPackage - || self.lib.isBool callPackage -) '' - callPackage argument should be a function or a boolean. - If you want to use the callPackage from self, set it to true. - If you want to use a custom callPackage, set it to a function (pkgs.callPackage). -''; - let useUnstable = self.config.useUnstable or true; sanitizePlatform = platformConfig: self.lib.removeAttrs platformConfig [ @@ -49,7 +40,11 @@ let callPackage' = if builtins.isFunction callPackage then callPackage else if builtins.isBool callPackage && callPackage then self.callPackage else if builtins.isBool callPackage && !callPackage then throw "this should never be evaluated" - else throw "callPackage should be a function (callPackage) or a boolean"; + else throw '' + callPackage argument should be a function or a boolean. + If you want to use the callPackage from self, set it to true. + If you want to use a custom callPackage, set it to a function (pkgs.callPackage). + ''; callPackagesUnstablePkgs = self.lib.mapAttrsRecursiveCond ( attrset: !(self.lib.hasAttr "override" attrset) && attrset.recurseForDerivations or false @@ -68,6 +63,6 @@ in { "${attributeName}" = if !useUnstable then self # if callPackage is not false - else if builtins.isBool callPackage && !callPackage then callPackagesUnstablePkgs + else if !(builtins.isBool callPackage && !callPackage) then callPackagesUnstablePkgs else unstablePkgs; } From 6e95f125cef14c271cfb999d7ef65f036127e463 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 1 Jun 2025 20:00:17 +0200 Subject: [PATCH 10/19] pkgs/overlays/unstable-from-source: fix handling of overlays crossOverlays are just overlays applied only in the final layer --- pkgs/overlays/unstable-from-source.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/overlays/unstable-from-source.nix b/pkgs/overlays/unstable-from-source.nix index cd2ac95..4b40bcb 100644 --- a/pkgs/overlays/unstable-from-source.nix +++ b/pkgs/overlays/unstable-from-source.nix @@ -17,6 +17,13 @@ let "parsed" ]; + # if overlay is found in previous layer, then it was provided in "overlays" argument + # otherwise, it is provided in "crossOverlays" argument. + overlays = self.lib.groupBy (overlay: + if self.lib.elem overlay self.buildPackages.overlays then "allLayers" + else "finalLayer" + ) self.overlays; + unstablePkgs = import unstableSource { # localSystem -> pkgs.stdenv.buildPlatform localSystem = sanitizePlatform self.stdenv.buildPlatform; @@ -24,11 +31,10 @@ let # passing below # config -> pkgs.config config = self.config; - # overlays -> partial of pkgs.overlays - overlays = self.overlays; - # crossOverlays -> partial of pkgs.overlays - # crossOverlays are merged to overlays, not sure what issues that might raise. - # ignoring. + # overlays -> pkgs.buildPackages.overlays + overlays = overlays.allLayers; + # crossOverlays -> pkgs.overlays without pkgs.buildPackages.overlays + crossOverlays = overlays.finalLayer; } // self.lib.optionalAttrs ( self.lib.systems.equals self.stdenv.buildPlatform self.stdenv.hostPlatform ) { From a8c92f2a6acb36b2f2e3229f88fde5323090a1a4 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Thu, 5 Jun 2025 19:05:19 +0200 Subject: [PATCH 11/19] pkgs/ranger-git: update --- pkgs/by-name/ra/ranger-git/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/ranger-git/package.nix b/pkgs/by-name/ra/ranger-git/package.nix index d60114a..7efb7ce 100644 --- a/pkgs/by-name/ra/ranger-git/package.nix +++ b/pkgs/by-name/ra/ranger-git/package.nix @@ -16,8 +16,8 @@ ranger.overrideAttrs (selfAttrs: superAttrs: { src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; - rev = "b00f923911090204139c9e19ba42e9d80aa0889f"; - hash = "sha256-uMvo+5I5WCJGT5+XRS/NFClDGH4F59ogQJb+RYuraX4="; + rev = "7e38143eaa91c82bed8f309aa167b1e6f2607576"; + hash = "sha256-O0DjecncpN+Bv8Ng+keuvU9iVtWAV4a50p959pMvkww="; }; patches = superAttrs.patches or [] ++ [ From 384bc2e88bd055eeb6d77dd0a6fb7ee8001584db Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Thu, 5 Jun 2025 19:12:45 +0200 Subject: [PATCH 12/19] pkgs/overlays/unstable-from-source: fix when there is no elements found in a given overlay grouping --- pkgs/overlays/unstable-from-source.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/overlays/unstable-from-source.nix b/pkgs/overlays/unstable-from-source.nix index 4b40bcb..416b778 100644 --- a/pkgs/overlays/unstable-from-source.nix +++ b/pkgs/overlays/unstable-from-source.nix @@ -32,9 +32,9 @@ let # config -> pkgs.config config = self.config; # overlays -> pkgs.buildPackages.overlays - overlays = overlays.allLayers; + overlays = overlays.allLayers or []; # crossOverlays -> pkgs.overlays without pkgs.buildPackages.overlays - crossOverlays = overlays.finalLayer; + crossOverlays = overlays.finalLayer or []; } // self.lib.optionalAttrs ( self.lib.systems.equals self.stdenv.buildPlatform self.stdenv.hostPlatform ) { From 7dce41a81820cf30bcfe8b2f4ad623811f49e52d Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Thu, 5 Jun 2025 22:05:38 +0200 Subject: [PATCH 13/19] lock: update --- lock.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lock.nix b/lock.nix index 821100a..a0a1268 100644 --- a/lock.nix +++ b/lock.nix @@ -4,12 +4,12 @@ sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY="; }; nixpkgs = { - revision = "7282cb574e0607e65224d33be8241eae7cfe0979"; - sha256 = "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04="; + revision = "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef"; + sha256 = "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA="; }; nixpkgs-unstable = { - revision = "96ec055edbe5ee227f28cdbc3f1ddf1df5965102"; - sha256 = "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg="; + revision = "c2a03962b8e24e669fb37b7df10e7c79531ff1a4"; + sha256 = "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q="; }; nix-bitcoin = { revision = "a06d1d8118865af14a9187e7d1a7a141dd89af74"; From 07ca427669e179bf5c12b908bd6cec94899dab0a Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 6 Jun 2025 21:29:24 +0200 Subject: [PATCH 14/19] lock: update --- lock.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lock.nix b/lock.nix index a0a1268..87c272a 100644 --- a/lock.nix +++ b/lock.nix @@ -4,8 +4,8 @@ sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY="; }; nixpkgs = { - revision = "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef"; - sha256 = "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA="; + revision = "4792576cb003c994bd7cc1edada3129def20b27d"; + sha256 = "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU="; }; nixpkgs-unstable = { revision = "c2a03962b8e24e669fb37b7df10e7c79531ff1a4"; @@ -16,7 +16,7 @@ sha256 = "sha256-F4zdOfeg0xjEnvFjlHvoMmdmh/FxK1qIsZyscnGDgA0="; }; cosmic-modules = { - revision = "89fbcfbd276eb2e3dca2e1efbcb893b3f7ec2501"; - sha256 = "sha256-UIrxKECO6iWOYmTgJ9c3noO00oDvOJKyAp13Or/wnRU="; + revision = "11d848287e7e19e5ca01a7e61b176a3e7a6b65b0"; + sha256 = "sha256-28ymEHbuGcO6n8FK+n1oJTTZwt+zM90qydEoyXvKI8M="; }; } From 9a81551bfee25d3fc03e01ff41fecfe01baa9ae1 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Thu, 12 Jun 2025 20:35:51 +0200 Subject: [PATCH 15/19] lock: update --- lock.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lock.nix b/lock.nix index 87c272a..5f27e68 100644 --- a/lock.nix +++ b/lock.nix @@ -4,19 +4,19 @@ sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY="; }; nixpkgs = { - revision = "4792576cb003c994bd7cc1edada3129def20b27d"; - sha256 = "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU="; + revision = "fd487183437963a59ba763c0cc4f27e3447dd6dd"; + sha256 = "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw="; }; nixpkgs-unstable = { - revision = "c2a03962b8e24e669fb37b7df10e7c79531ff1a4"; - sha256 = "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q="; + revision = "3e3afe5174c561dee0df6f2c2b2236990146329f"; + sha256 = "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU="; }; nix-bitcoin = { - revision = "a06d1d8118865af14a9187e7d1a7a141dd89af74"; - sha256 = "sha256-F4zdOfeg0xjEnvFjlHvoMmdmh/FxK1qIsZyscnGDgA0="; + revision = "ac1344fb6d91e2af219803eaaa67d1d974666156"; + sha256 = "sha256-qLwBEXlGY2pLNPhPNpeOE0DNC1luovTYE3ZDPMyMPXc="; }; cosmic-modules = { - revision = "11d848287e7e19e5ca01a7e61b176a3e7a6b65b0"; - sha256 = "sha256-28ymEHbuGcO6n8FK+n1oJTTZwt+zM90qydEoyXvKI8M="; + revision = "1324951d47265ff810be0647260feb53fa7ec86e"; + sha256 = "sha256-xuaX5yoo8l5kbbb2Az0wHHbsDys2f6vw18/8de7BiIc="; }; } From 80c06ca3d70704a2f6d92fa4f885914f7cc67958 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Thu, 12 Jun 2025 20:58:14 +0200 Subject: [PATCH 16/19] Revert "nixos/core-desktop: disable cuda for qimgv" This reverts commit b1e0daf1e369f002325c4e65a5421b068761b4c3. --- nixos/modules/core-desktop.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/core-desktop.nix b/nixos/modules/core-desktop.nix index 72a1f33..d81ceec 100644 --- a/nixos/modules/core-desktop.nix +++ b/nixos/modules/core-desktop.nix @@ -27,12 +27,7 @@ kdePackages.kdeconnect-kde pcmanfm pwvucontrol - (qimgv.override { - opencv4 = opencv4.override { - # https://github.com/NixOS/nixpkgs/issues/383175 - enableCuda = false; - }; - }) + qimgv ]; programs.mpv = let From 2715e3140dda6a397a28a5e8f5e7695eb93c24a7 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 15 Jun 2025 14:47:47 +0200 Subject: [PATCH 17/19] lock: update --- lock.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lock.nix b/lock.nix index 5f27e68..fd7c121 100644 --- a/lock.nix +++ b/lock.nix @@ -4,19 +4,19 @@ sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY="; }; nixpkgs = { - revision = "fd487183437963a59ba763c0cc4f27e3447dd6dd"; - sha256 = "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw="; + revision = "5f4f306bea96741f1588ea4f450b2a2e29f42b98"; + sha256 = "sha256-tG5xUn3hFaPpAHYIvr2F88b+ovcIO5k1HqajFy7ZFPM="; }; nixpkgs-unstable = { - revision = "3e3afe5174c561dee0df6f2c2b2236990146329f"; - sha256 = "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU="; + revision = "ee930f9755f58096ac6e8ca94a1887e0534e2d81"; + sha256 = "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc="; }; nix-bitcoin = { revision = "ac1344fb6d91e2af219803eaaa67d1d974666156"; sha256 = "sha256-qLwBEXlGY2pLNPhPNpeOE0DNC1luovTYE3ZDPMyMPXc="; }; cosmic-modules = { - revision = "1324951d47265ff810be0647260feb53fa7ec86e"; - sha256 = "sha256-xuaX5yoo8l5kbbb2Az0wHHbsDys2f6vw18/8de7BiIc="; + revision = "227315d1e0f80d68984b105eaabdce3e886702c1"; + sha256 = "sha256-LPjW/Bsga8kJtOAxUAKemAfZEi6n7FVTvptj3dCGWgg="; }; } From 62738d411c908e7f95f9e983f1718724af8e6fb3 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Thu, 19 Jun 2025 10:48:58 +0200 Subject: [PATCH 18/19] nixos/nvidia: update --- nixos/modules/nvidia.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/nvidia.nix b/nixos/modules/nvidia.nix index d3c3442..ad6f2db 100644 --- a/nixos/modules/nvidia.nix +++ b/nixos/modules/nvidia.nix @@ -24,12 +24,12 @@ nvidiaSettings = true; package = let mkDriverArgs = { - version = "575.57.08"; - sha256_64bit = "sha256-KqcB2sGAp7IKbleMzNkB3tjUTlfWBYDwj50o3R//xvI="; - sha256_aarch64 = "sha256-VJ5z5PdAL2YnXuZltuOirl179XKWt0O4JNcT8gUgO98="; - openSha256 = "sha256-DOJw73sjhQoy+5R0GHGnUddE6xaXb/z/Ihq3BKBf+lg="; - settingsSha256 = "sha256-AIeeDXFEo9VEKCgXnY3QvrW5iWZeIVg4LBCeRtMs5Io="; - persistencedSha256 = "sha256-Len7Va4HYp5r3wMpAhL4VsPu5S0JOshPFywbO7vYnGo="; + version = "575.64"; + sha256_64bit = "sha256-6wG8/nOwbH0ktgg8J+ZBT2l5VC8G5lYBQhtkzMCtaLE="; + sha256_aarch64 = "sha256-uHj8fB1sSJfX0NWZEE1eZN1LQQkf7J0jPV3EeQCSG10="; + openSha256 = "sha256-y93FdR5TZuurDlxc/p5D5+a7OH93qU4hwQqMXorcs/g="; + settingsSha256 = "sha256-3BvryH7p0ioweNN4S8oLDCTSS47fQPWVYwNq4AuWQgQ="; + persistencedSha256 = "sha256-QkDNQKwCsakZOLcSie1NBiFCM5e5NFGiIKtPSFeWdXs="; patches = [ (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/rpmfusion/nvidia-kmod/020f5fabfb067150f8dd0d6e470a7a694f59eb59/Workaround-nv_vm_flags_-calling-GPL-only-code.patch"; From 0773738ccae33853fde6bb4d630c0c727290f156 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Thu, 19 Jun 2025 10:49:08 +0200 Subject: [PATCH 19/19] lock: update --- lock.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lock.nix b/lock.nix index fd7c121..ec4adc3 100644 --- a/lock.nix +++ b/lock.nix @@ -4,19 +4,19 @@ sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY="; }; nixpkgs = { - revision = "5f4f306bea96741f1588ea4f450b2a2e29f42b98"; - sha256 = "sha256-tG5xUn3hFaPpAHYIvr2F88b+ovcIO5k1HqajFy7ZFPM="; + revision = "36ab78dab7da2e4e27911007033713bab534187b"; + sha256 = "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw="; }; nixpkgs-unstable = { - revision = "ee930f9755f58096ac6e8ca94a1887e0534e2d81"; - sha256 = "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc="; + revision = "9e83b64f727c88a7711a2c463a7b16eedb69a84c"; + sha256 = "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI="; }; nix-bitcoin = { revision = "ac1344fb6d91e2af219803eaaa67d1d974666156"; sha256 = "sha256-qLwBEXlGY2pLNPhPNpeOE0DNC1luovTYE3ZDPMyMPXc="; }; cosmic-modules = { - revision = "227315d1e0f80d68984b105eaabdce3e886702c1"; - sha256 = "sha256-LPjW/Bsga8kJtOAxUAKemAfZEi6n7FVTvptj3dCGWgg="; + revision = "ef3b52e04d4294aa98fdac6c065b2d818022efd1"; + sha256 = "sha256-zuONfwNObFx8A2zunwwkW2jUgO6rvd6dO2okiiCxPO8="; }; }