diff --git a/src/user/modules/gui/default.nix b/src/user/modules/gui/default.nix
index 451b5e6..2b2f944 100644
--- a/src/user/modules/gui/default.nix
+++ b/src/user/modules/gui/default.nix
@@ -1,17 +1,6 @@
-{ config, ... }:
-
-let
-  gui = config.modules.user.gui.wm;
-
-  wm = {
-    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
-  };
-
-in
 {
   imports = [
     ./wm
-  ] ++ (if wm.enable then [
     ./modules
-  ] else []);
+  ];
 }
diff --git a/src/user/modules/gui/modules/default.nix b/src/user/modules/gui/modules/default.nix
index 86e7558..6a1f9e1 100644
--- a/src/user/modules/gui/modules/default.nix
+++ b/src/user/modules/gui/modules/default.nix
@@ -1,10 +1,18 @@
+{ config, lib, ... }:
+
+let
+  wm = {
+    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues config.modules.user.gui.wm);
+  };
+
+in
 {
-  imports = [
+  imports = if wm.enable then [
     ./alacritty
     ./browsers
     ./corn
     ./fun
     ./utils
     ./writing
-  ];
+  ] else [];
 }