lock: update

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=";
   };
 }

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 {} // {

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;

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

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;
 }