diff --git a/modules/nixos/core/desktops/default.nix b/modules/nixos/core/desktops/default.nix
index 796fa09..9e5b49a 100644
--- a/modules/nixos/core/desktops/default.nix
+++ b/modules/nixos/core/desktops/default.nix
@@ -41,6 +41,7 @@ in
         boot.initrd.verbose = false;
         boot.kernelParams = [ "quiet" ];
 
+        services.libinput.enable = true;
         services.xserver = {
           enable = true;
 
@@ -48,8 +49,6 @@ in
             layout = "us";
             options = "caps:super";
           };
-
-          libinput.enable = true;
         };
 
         services.printing = {
diff --git a/systems/x86_64-linux/jellydonut/default.nix b/systems/x86_64-linux/jellydonut/default.nix
index 3c1440d..ff137b2 100644
--- a/systems/x86_64-linux/jellydonut/default.nix
+++ b/systems/x86_64-linux/jellydonut/default.nix
@@ -28,8 +28,8 @@
       };
     };
 
-    # enable opengl
-    hardware.opengl.enable = true;
+    # enable graphics
+    hardware.graphics.enable = true;
 
     programs.gamemode = {
       enable = true;
diff --git a/systems/x86_64-linux/mikenike/default.nix b/systems/x86_64-linux/mikenike/default.nix
index ba41cc7..19f22ea 100644
--- a/systems/x86_64-linux/mikenike/default.nix
+++ b/systems/x86_64-linux/mikenike/default.nix
@@ -31,8 +31,8 @@
       STOP_CHARGE_THRESH_BAT1 = 80;
     };
 
-    # enable opengl
-    hardware.opengl.enable = true;
+    # enable graphics
+    hardware.graphics.enable = true;
 
     hardware.nvidia = {
       # Prime is needed for optimus GPU
diff --git a/systems/x86_64-linux/wafer/default.nix b/systems/x86_64-linux/wafer/default.nix
index db011bd..753e93b 100644
--- a/systems/x86_64-linux/wafer/default.nix
+++ b/systems/x86_64-linux/wafer/default.nix
@@ -24,7 +24,7 @@
       };
     };
 
-    # enable opengl
-    hardware.opengl.enable = true;
+    # enable graphics
+    hardware.graphics.enable = true;
   };
 }