diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index d302e7c..821227b 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -5,9 +5,9 @@
     ./hardware-configuration.nix
 
     # GUI
-    ../../modules/system/gui/plasma.nix
     ../../modules/system/gui/steam.nix
-    ../../modules/system/gui/sunshine.nix
+    ../../modules/system/gui/hyprland.nix
+    ../../modules/system/gui/thunar.nix
 
     # CLI
     ../../modules/system/cli/common.nix
@@ -24,24 +24,17 @@
 
     substituters = [
       "https://nix-community.cachix.org"
-      "https://cache.nixos.org/"
-    ];
-    trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
   };
 
 
   # Bootloader.
   boot.loader.efi.canTouchEfiVariables = true;
-#  boot.loader.grub = {
-#    enable = true;
-#    efiSupport = true;
-#    device = "nodev";
-#  };
-  boot.loader.systemd-boot.enable = true;
-
-  networking.networkmanager.enable = true;
+  boot.loader.grub = {
+    enable = true;
+    efiSupport = true;
+    device = "nodev";
+  };
 
   networking.hostName = "xv-desktop"; # Define your hostname.
   networking.interfaces.enp7s0.wakeOnLan.enable = true;
@@ -52,13 +45,7 @@
     extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
   };
 
-  services.displayManager.autoLogin = {
-    enable = true;
-    user = "xeovalyte";
-  };
-
-  systemd.services."getty@tty1".enable = false;
-  systemd.services."autovt@tty1".enable = false;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   system.stateVersion = "24.05";
 
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 82f480b..43f3b71 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -44,6 +44,7 @@
       unstable.vesktop
       unstable.rnote
       unstable.blender
+      unstable.openscad-unstable
 
       # Office
       libreoffice
diff --git a/modules/system/hardware/nvidia.nix b/modules/system/hardware/nvidia.nix
index 936c870..31ac135 100644
--- a/modules/system/hardware/nvidia.nix
+++ b/modules/system/hardware/nvidia.nix
@@ -34,6 +34,6 @@
     open = false;
     nvidiaSettings = true;
 
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package = config.boot.kernelPackages.nvidiaPackages.beta;
   };
 }