diff --git a/home/linux/server.nix b/home/linux/server.nix
index 082e3911..2fb0bd89 100644
--- a/home/linux/server.nix
+++ b/home/linux/server.nix
@@ -4,7 +4,7 @@
   imports = [
     ../base/server
 
-    ./server
+    ./base
   ];
 
   # Home Manager needs a bit of information about you and the
diff --git a/home/linux/wayland.nix b/home/linux/wayland.nix
index 84c209b0..47a3276c 100644
--- a/home/linux/wayland.nix
+++ b/home/linux/wayland.nix
@@ -4,10 +4,11 @@
   imports = [
     ../base/desktop
 
-    ./hyprland
-
+    ./base
     ./fcitx5
     ./desktop
+
+    ./hyprland
   ];
 
   # Home Manager needs a bit of information about you and the
diff --git a/home/linux/x11.nix b/home/linux/x11.nix
index cb4458d2..703a9fa3 100644
--- a/home/linux/x11.nix
+++ b/home/linux/x11.nix
@@ -4,11 +4,12 @@
   imports = [
     ../base/desktop
 
-    ./i3
-
+    ./base
     ./fcitx5
     ./desktop
-  ];
+
+    ./i3
+];
 
   # Home Manager needs a bit of information about you and the
   # paths it should manage.