diff --git a/lock.nix b/lock.nix
index a18318a..a1a5a65 100644
--- a/lock.nix
+++ b/lock.nix
@@ -4,15 +4,15 @@
     sha256 = "09j4kvsxw1d5dvnhbsgih0icbrxqv90nzf0b589rb5z6gnzwjnqf";
   };
   nixpkgs = {
-    revision = "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7";
-    sha256 = "0hdb0ajwfl7xn1hznik4kj35adiksc8k5apllz3jniwrszpkwrwm";
+    revision = "7105ae3957700a9646cc4b766f5815b23ed0c682";
+    sha256 = "0j3jd82iyyck4hpmz7pkak1v27l7pydl0c3vvyz6wfpi612x8xzi";
   };
   nixpkgs-unstable = {
-    revision = "5e5402ecbcb27af32284d4a62553c019a3a49ea6";
-    sha256 = "0a8xv91nz7qkyxs3nhszxj3vb9s5v1xgyhmm32y1fbb8njx7hrw1";
+    revision = "a84ebe20c6bc2ecbcfb000a50776219f48d134cc";
+    sha256 = "053xxy1bn35d9088h3rznhqkqq7lnnhn4ahrilwik8l4b6k8inlq";
   };
   cosmic-modules = {
-    revision = "c709db4b95e58f410978bb49c87cb74214d03e78";
-    sha256 = "1szkgpsvm3yrdsg1rm0rr9yagcy8ynakvymlcw43c0736980bcba";
+    revision = "216557e6cd229dbe7d73a497c227824a3c579cd7";
+    sha256 = "1m9hfmkrsgzf2jwjymlxvi8r01n1ng48z3wr9478ywn9bdp7r0w6";
   };
 }
diff --git a/nix-os/nix.nix b/nix-os/nix.nix
index 78d8586..d536156 100644
--- a/nix-os/nix.nix
+++ b/nix-os/nix.nix
@@ -56,7 +56,6 @@ in {
       (wrappedNixExecutables true)
       wrappedNixosExecutables
     ];
-    system.build.nixos-rebuild = lib.mkForce wrappedNixosExecutables;
     system.tools.nixos-rebuild.enable = false;
   };
 }
diff --git a/nix-os/nvidia.nix b/nix-os/nvidia.nix
index 2c10f15..835a87f 100644
--- a/nix-os/nvidia.nix
+++ b/nix-os/nvidia.nix
@@ -16,12 +16,12 @@
     open = false;
     nvidiaSettings = true;
     package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-      version = "570.133.07";
-      sha256_64bit = "sha256-LUPmTFgb5e9VTemIixqpADfvbUX1QoTT2dztwI3E3CY=";
-      sha256_aarch64 = "sha256-yTovUno/1TkakemRlNpNB91U+V04ACTMwPEhDok7jI0=";
-      openSha256 = "sha256-9l8N83Spj0MccA8+8R1uqiXBS0Ag4JrLPjrU3TaXHnM=";
-      settingsSha256 = "sha256-XMk+FvTlGpMquM8aE8kgYK2PIEszUZD2+Zmj2OpYrzU=";
-      persistencedSha256 = "sha256-G1V7JtHQbfnSRfVjz/LE2fYTlh9okpCbE4dfX9oYSg8=";
+      version = "570.86.16";
+      sha256_64bit = "sha256-RWPqS7ZUJH9JEAWlfHLGdqrNlavhaR1xMyzs8lJhy9U=";
+      sha256_aarch64 = "sha256-RiO2njJ+z0DYBo/1DKa9GmAjFgZFfQ1/1Ga+vXG87vA=";
+      openSha256 = "sha256-DuVNA63+pJ8IB7Tw2gM4HbwlOh1bcDg2AN2mbEU9VPE=";
+      settingsSha256 = "sha256-9rtqh64TyhDF5fFAYiWl3oDHzKJqyOW3abpcf2iNRT8=";
+      persistencedSha256 = "sha256-3mp9X/oV8o2TH9720NnoXROxQ4g98nNee+DucXpQy3w=";
     };
   };
   nixpkgs.config.nvidia.acceptLicense = true;
diff --git a/nix-os/razer.nix b/nix-os/razer.nix
index f1df5ff..cd9dcf1 100644
--- a/nix-os/razer.nix
+++ b/nix-os/razer.nix
@@ -1,46 +1,16 @@
+{ lib, config, pkgs, ... }:
 {
-  config,
-  lib,
-  modulesPath,
-  pkgs,
-  ...
-}:
-
-{
-  # NIXPKGS-PR: 394300
-  disabledModules = [
-    "${modulesPath}/hardware/openrazer.nix"
-  ];
-  imports = [
-    (builtins.fetchurl {
-      url = "https://raw.githubusercontent.com/NixOS/nixpkgs/4a11562c20fbe7af7d5ac139dbf0f8d50ce276f6/nixos/modules/hardware/openrazer.nix";
-      sha256 = "0n6kzrcwlmxgws4pmffyqagp2rxpfxmfjl11vgvlkjcbglg6fs7y";
-    })
-  ];
-
   hardware.openrazer = {
     enable = true;
     users = [
       "wroclaw"
     ];
-    # NIXPKGS-PR: 384992
-    packages = let
-      oldVersion = pkgs.python3Packages.openrazer-daemon.version;
-      version = "3.10.1";
-    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=";
-      };
-    })) {
-      kernel = config.boot.kernelPackages.openrazer;
-      daemon = pkgs.python3Packages.openrazer-daemon;
-    };
   };
+#  users.groups.openrazer.members = [
+#    "wroclaw"
+#  ];
   environment.systemPackages = with pkgs; [
+    openrazer-daemon
     polychromatic
   ];
 }