diff --git a/hosts/desktop/nvidia.nix b/hosts/desktop/nvidia.nix
index cb74f7c..ec5d99e 100644
--- a/hosts/desktop/nvidia.nix
+++ b/hosts/desktop/nvidia.nix
@@ -3,18 +3,20 @@
   config,
   ...
 }: {
-  hardware.graphics = {
-    enable = true;
+  hardware = {
+    graphics = {
+      enable = true;
+    };
+    nvidia = {
+      open = true;
+      modesetting.enable = true;
+      powerManagement.enable = true;
+      nvidiaSettings = true;
+      package = config.boot.kernelPackages.nvidiaPackages.latest;
+    };
   };
   services.xserver.videoDrivers = ["nvidia"];
-  hardware.nvidia = {
-    open = true;
-    modesetting.enable = true;
-    powerManagement.enable = true;
-    nvidiaSettings = true;
-  };
 
   # To fix https://forums.developer.nvidia.com/t/ubuntu-24-04-unable-to-change-power-state-from-d3cold-to-d0-device-inaccessible/304459
   boot.kernelPackages = pkgs.linuxPackages_6_12;
-  hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest;
 }
diff --git a/modules/desktop/gtk/default.nix b/modules/desktop/gtk/default.nix
index df27f02..4bdf971 100644
--- a/modules/desktop/gtk/default.nix
+++ b/modules/desktop/gtk/default.nix
@@ -5,12 +5,14 @@
   ];
 
   services.gvfs.enable = true;
-  programs.dconf.enable = true;
+  programs = {
+    dconf.enable = true;
+    nautilus-open-any-terminal.enable = true;
+    seahorse.enable = true;
+    evince.enable = true;
+  };
 
   services.gnome.sushi.enable = true;
-  programs.nautilus-open-any-terminal.enable = true;
-  programs.seahorse.enable = true;
-  programs.evince.enable = true;
 
   fireproof.home-manager = {
     home.pointerCursor = {
diff --git a/modules/hardware/keyboard.nix b/modules/hardware/keyboard.nix
deleted file mode 100644
index e69de29..0000000