diff --git a/nixos/packages/graphical/default.nix b/nixos/packages/graphical/default.nix
index d417557..a0dbfc7 100755
--- a/nixos/packages/graphical/default.nix
+++ b/nixos/packages/graphical/default.nix
@@ -1,9 +1,7 @@
 {...}: {
   imports = [
-    ./display-server
-
     ./gnome-keyring.nix
-    ./graphical.nix
+    ./display-server.nix
     ./polkit.nix
   ];
 }
diff --git a/nixos/packages/graphical/display-server/display-server.nix b/nixos/packages/graphical/display-server.nix
similarity index 100%
rename from nixos/packages/graphical/display-server/display-server.nix
rename to nixos/packages/graphical/display-server.nix
diff --git a/nixos/packages/graphical/display-server/default.nix b/nixos/packages/graphical/display-server/default.nix
deleted file mode 100644
index fc6ecb3..0000000
--- a/nixos/packages/graphical/display-server/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ./display-server.nix
-    ./input.nix
-  ];
-}
diff --git a/nixos/packages/graphical/display-server/input.nix b/nixos/packages/graphical/display-server/input.nix
deleted file mode 100755
index 38c0a83..0000000
--- a/nixos/packages/graphical/display-server/input.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{...}: {
-  services.xserver = {
-    libinput = {
-      enable = true;
-      touchpad = {
-        accelProfile = "flat";
-        naturalScrolling = true;
-        middleEmulation = false;
-      };
-      mouse = {
-        accelProfile = "flat";
-        naturalScrolling = true;
-        middleEmulation = false;
-      };
-    };
-  };
-
-  ### Removes debounce time
-  # https://www.reddit.com/r/linux_gaming/comments/ku6gth
-  environment.etc."libinput/local-overrides.quirks".text = ''
-    [Never Debounce]
-    MatchUdevType=mouse
-    ModelBouncingKeys=1
-  '';
-}
diff --git a/nixos/packages/graphical/graphical.nix b/nixos/packages/graphical/graphical.nix
deleted file mode 100644
index c21a1c4..0000000
--- a/nixos/packages/graphical/graphical.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{pkgs, ...}: {
-  services = {
-    # GNOME applications
-    gvfs.enable = true; # nautilus
-    gnome = {
-      sushi.enable = true; # nautilus preview
-      gnome-online-accounts.enable = true;
-    };
-  };
-
-  programs = {
-    gnome-disks.enable = true;
-    kdeconnect = {
-      enable = true;
-      #package = pkgs.gnomeExtensions.gsconnect;
-      package = pkgs.valent;
-    };
-  };
-}
diff --git a/nixos/packages/hardware.nix b/nixos/packages/hardware.nix
index 14a845c..9918e28 100644
--- a/nixos/packages/hardware.nix
+++ b/nixos/packages/hardware.nix
@@ -6,7 +6,6 @@
 
   services = {
     #printing.enable = true; # Printing
-    ratbagd.enable = true; # Required by piper
     thermald.enable = true; # Prevents overheating
     fwupd.enable = true; # Firmware update
   };
diff --git a/users/guanranwang/nixos/presets/desktop.nix b/users/guanranwang/nixos/presets/desktop.nix
index 3202b4d..84e827f 100644
--- a/users/guanranwang/nixos/presets/desktop.nix
+++ b/users/guanranwang/nixos/presets/desktop.nix
@@ -16,4 +16,39 @@
     wlr.enable = true;
     extraPortals = with pkgs; [xdg-desktop-portal-gtk];
   };
+  services = {
+    ratbagd.enable = true;
+    gvfs.enable = true;
+    gnome = {
+      sushi.enable = true;
+      gnome-online-accounts.enable = true;
+    };
+  };
+  programs = {
+    kdeconnect = {
+      enable = true;
+      #package = pkgs.gnomeExtensions.gsconnect;
+      package = pkgs.valent;
+    };
+  };
+  services.xserver.libinput = {
+    touchpad = {
+      accelProfile = "flat";
+      naturalScrolling = true;
+      middleEmulation = false;
+    };
+    mouse = {
+      accelProfile = "flat";
+      naturalScrolling = true;
+      middleEmulation = false;
+    };
+  };
+
+  ### Removes debounce time
+  # https://www.reddit.com/r/linux_gaming/comments/ku6gth
+  environment.etc."libinput/local-overrides.quirks".text = ''
+    [Never Debounce]
+    MatchUdevType=mouse
+    ModelBouncingKeys=1
+  '';
 }