diff --git a/systems/BASED.nix b/systems/BASED.nix
index 7f9c5ac..889d2f8 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -64,7 +64,7 @@
   networking.firewall.enable = false;
 
   services.xserver.enable = lib.mkDefault true;
-  services.xserver.layout = "us";
+  services.xserver.xkb.layout = "us";
   systemd.services.display-manager.restartIfChanged = false;
   services.xserver.displayManager.sddm.enable = lib.mkDefault true;
   services.xserver.desktopManager.plasma5.enable = lib.mkDefault true;
diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix
index b1e9ce6..1f7cb3d 100644
--- a/systems/NOcomputer.nix
+++ b/systems/NOcomputer.nix
@@ -99,10 +99,8 @@
   hardware.nvidia = {
     modesetting.enable = true;
     powerManagement.enable = true;
-    # package = config.boot.kernelPackages.nvidiaPackages.latest;
-    # package = pkgs.linuxPackages_latest.nvidiaPackages.vulkan_beta;
-    # package = pkgs.linuxPackages_latest.nvidiaPackages.latest;
-    package = pkgs.linuxPackages_latest.nvidiaPackages.production;
+    # options: production, beta, vulkan_beta
+    package = pkgs.linuxPackages_latest.nvidiaPackages.latest;
   };
   # enable core and mem freq sliders for nvidia
   services.xserver.deviceSection = ''