diff --git a/nixos/hardware/nvidia/default.nix b/nixos/hardware/nvidia/default.nix
index fba405a..00b5a76 100644
--- a/nixos/hardware/nvidia/default.nix
+++ b/nixos/hardware/nvidia/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
   hardware = {
 	graphics = {
@@ -42,7 +42,7 @@
 	logitech.wireless.enable = true;
   };
   services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.mkDriver { #fixes https://github.com/NixOS/nixpkgs/issues/375730 temporary
+  hardware.nvidia.package = lib.mkIf config.boot.kernelPackages == pkgs.linuxPackages_latest config.boot.kernelPackages.nvidiaPackages.mkDriver { #fixes https://github.com/NixOS/nixpkgs/issues/375730 temporary
       version = "570.86.16"; # use new 570 drivers
       sha256_64bit = "sha256-RWPqS7ZUJH9JEAWlfHLGdqrNlavhaR1xMyzs8lJhy9U=";
       openSha256 = "sha256-DuVNA63+pJ8IB7Tw2gM4HbwlOh1bcDg2AN2mbEU9VPE=";
diff --git a/nixos/hosts/andrej-pc/configuration.nix b/nixos/hosts/andrej-pc/configuration.nix
index b00b32b..a7f266a 100644
--- a/nixos/hosts/andrej-pc/configuration.nix
+++ b/nixos/hosts/andrej-pc/configuration.nix
@@ -38,7 +38,7 @@
   };
 
   boot = {
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+    #kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
@@ -161,17 +161,7 @@
     graphics = {
       enable = true;
     };
-    bluetooth = {
-      enable = true;
-      powerOnBoot = true;
-      settings = {
-        General = {
-          Experimental = true;
-        };
-      };
-    };
   };
-  services.blueman.enable = true;
 
   security.polkit.enable = true;
 
diff --git a/nixos/hosts/andrej-pc/default.nix b/nixos/hosts/andrej-pc/default.nix
index 48cdba9..4f27933 100644
--- a/nixos/hosts/andrej-pc/default.nix
+++ b/nixos/hosts/andrej-pc/default.nix
@@ -15,6 +15,7 @@
     ../../users/andrej
   ];
 
+  hardware.nvidia.open = lib.mkForce false;
   #sops.secrets."ssh_keys/${hwconfig.hostname}" = {};
   systemd.network.wait-online.enable = lib.mkForce false;
 }