Refactor imports and remove default.nix files

modules/nixos/cli/default.nix

@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./docker.nix
-    ./kanata.nix
-    ./podman.nix
-    ./password-store.nix
-  ];
-}

modules/nixos/core/default.nix

@@ -1,11 +0,0 @@
-{
-  imports = [
-    ./avahi.nix
-    ./bluetooth.nix
-    ./gnupg.nix
-    ./openssh.nix
-    ./pipewire.nix
-    ./xbanish.nix
-    ./zram.nix
-  ];
-}

modules/nixos/default.nix

@@ -1,9 +1,27 @@
 {
   imports = [
-    ./cli
-    ./core
-    ./desktop
-    ./homelab
+    ./cli/docker.nix
+    ./cli/kanata.nix
+    ./cli/podman.nix
+    ./cli/password-store.nix
+
+    ./core/avahi.nix
+    ./core/bluetooth.nix
+    ./core/gnupg.nix
+    ./core/openssh.nix
+    ./core/pipewire.nix
+    ./core/xbanish.nix
+    ./core/zram.nix
+
+    ./desktop/dconf.nix
+    ./desktop/dwm
+    ./desktop/fonts.nix
+    ./desktop/media
+    ./desktop/st.nix
+    ./desktop/thunar.nix
+
+    ./homelab/gitea-actions-runner.nix
+
     ./nixpad
   ];
 }

modules/nixos/desktop/default.nix

@@ -1,10 +0,0 @@
-{
-  imports = [
-    ./dconf.nix
-    ./dwm
-    ./fonts.nix
-    ./media
-    ./st.nix
-    ./thunar.nix
-  ];
-}

modules/nixos/homelab/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./gitea-actions-runner.nix
-  ];
-}