diff --git a/hosts/pinwheel/configuration.nix b/hosts/pinwheel/configuration.nix
index b459eba..d4e164b 100644
--- a/hosts/pinwheel/configuration.nix
+++ b/hosts/pinwheel/configuration.nix
@@ -3,40 +3,8 @@
   imports =
     [
       ../../config-manager/default.nix
-
       ./hardware-configuration.nix
-      ./modules/light
-      ./modules/sound
-      ./modules/keyboard
-      ./modules/age
-      ./modules/ssh
-      ./modules/git
-      ./modules/zsh
-      ./modules/tmux
-      ./modules/vim
-      ./modules/emacs
-      ./modules/foot
-      ./modules/hyprland
-      ./modules/waybar
-      ./modules/swaylock
-      ./modules/dunst
-      ./modules/bemenu
-      ./modules/screenshot
-      ./modules/fzf
-      ./modules/syncthing
-      ./modules/firefox
-      ./modules/mullvad
-      ./modules/openvpn
-      ./modules/calibre
-      ./modules/go
-      ./modules/nix
-      ./modules/javascript
-      ./modules/spotify
-      ./modules/docker
-      ./modules/podman
-      ./modules/k8s
-
-      ./modules/work
+      ./modules
     ];
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
diff --git a/hosts/pinwheel/modules/default.nix b/hosts/pinwheel/modules/default.nix
new file mode 100644
index 0000000..0646c7e
--- /dev/null
+++ b/hosts/pinwheel/modules/default.nix
@@ -0,0 +1,36 @@
+{
+  imports = [
+    ./light
+    ./sound
+    ./keyboard
+    ./age
+    ./ssh
+    ./git
+    ./zsh
+    ./tmux
+    ./vim
+    ./emacs
+    ./foot
+    ./hyprland
+    ./waybar
+    ./swaylock
+    ./dunst
+    ./bemenu
+    ./screenshot
+    ./fzf
+    ./syncthing
+    ./firefox
+    ./mullvad
+    ./openvpn
+    ./calibre
+    ./go
+    ./nix
+    ./javascript
+    ./spotify
+    ./docker
+    ./podman
+    ./k8s
+
+    ./work
+  ];
+}