From 7ee2de0299fa0f16a21ed411a122edd8ddba828f Mon Sep 17 00:00:00 2001
From: RAPSNX <github@rapsn.me>
Date: Wed, 26 Aug 2026 21:22:49 +0200
Subject: [PATCH] refactor(modules): flatten directory structure to 2-level
 category layout

---
 AGENTS.md                                       |   2 +-
 docs/reference/structure.md                     |   2 +-
 flake.nix                                       |   4 ++--
 hosts/kubex/hardware-configuration.nix          |   9 +++++----
 .../{chromium/default.nix => chromium.nix}      |   0
 .../{firefox/default.nix => firefox.nix}        |   0
 .../alacritty/default.nix => alacritty.nix}     |   0
 .../home/cli/{atuin/default.nix => atuin.nix}   |   0
 modules/home/cli/{core/default.nix => core.nix} |   0
 modules/home/cli/custom/default.nix             |   1 -
 .../home/cli/{direnv/default.nix => direnv.nix} |   0
 modules/home/cli/{git/default.nix => git.nix}   |   0
 modules/home/cli/{langs => }/go.nix             |   0
 modules/home/cli/{k8s/default.nix => k8s.nix}   |   6 ------
 modules/home/cli/{k8s => }/k9s.nix              |   0
 modules/home/cli/{k8s => }/krewfile.nix         |   0
 modules/home/cli/{k8s => }/kubecolor.nix        |   0
 modules/home/cli/langs/default.nix              |   6 ------
 .../cli/{lazygit/default.nix => lazygit.nix}    |   0
 modules/home/cli/{pet/default.nix => pet.nix}   |   0
 modules/home/cli/{langs => }/rust.nix           |   0
 modules/home/cli/{custom => }/shell-scripts.nix |   0
 .../cli/{starship/default.nix => starship.nix}  |   0
 .../home/cli/{tflow/default.nix => tflow.nix}   |   0
 .../{terminals/tmux/default.nix => tmux.nix}    |   0
 modules/home/cli/{zsh/default.nix => zsh.nix}   |   0
 modules/home/common/default.nix                 |   2 --
 .../{addons/fuzzel/default.nix => fuzzel.nix}   |   0
 .../{addons/gtk/default.nix => gtk.nix}         |   0
 .../desktops/{hyprland/addons => }/hypridle.nix |   0
 .../{hyprland/default.nix => hyprland.nix}      |  16 +++++-----------
 .../desktops/{hyprland/addons => }/hyprlock.nix |   0
 .../{addons/kanshi/default.nix => kanshi.nix}   |   0
 .../home/desktops/{hyprland => }/keybinds.nix   |   0
 .../desktops/{addons/qt/default.nix => qt.nix}  |   0
 .../desktops/{addons => }/swaync/default.nix    |   0
 .../desktops/{addons => }/swaync/swaync.css     |   0
 .../desktops/{addons => }/swaync/swaync.json    |   0
 .../desktops/{addons => }/waybar/default.nix    |   0
 .../desktops/{addons => }/waybar/waybar.css     |   0
 .../desktops/{addons => }/waybar/waybar.json    |   0
 .../desktops/{addons => }/wlogout/default.nix   |   0
 .../{addons => }/wlogout/icons/hibernate.png    | Bin
 .../{addons => }/wlogout/icons/lock.png         | Bin
 .../{addons => }/wlogout/icons/logout.png       | Bin
 .../{addons => }/wlogout/icons/reboot.png       | Bin
 .../{addons => }/wlogout/icons/shutdown.png     | Bin
 .../{addons => }/wlogout/icons/suspend.png      | Bin
 .../desktops/{addons => }/wlogout/style.css     |   0
 modules/home/services/default.nix               |   8 --------
 modules/nix.nix                                 |   5 +++--
 modules/nixos/roles/desktop/default.nix         |   7 -------
 .../roles/{gaming/default.nix => gaming.nix}    |   0
 modules/nixos/roles/k3s/default.nix             |   6 ------
 modules/nixos/services/default.nix              |  12 ------------
 modules/nixos/system/default.nix                |   9 ---------
 overlays/default.nix                            |   2 +-
 packages/default.nix                            |   6 +++---
 58 files changed, 21 insertions(+), 82 deletions(-)
 rename modules/home/browsers/{chromium/default.nix => chromium.nix} (100%)
 rename modules/home/browsers/{firefox/default.nix => firefox.nix} (100%)
 rename modules/home/cli/{terminals/alacritty/default.nix => alacritty.nix} (100%)
 rename modules/home/cli/{atuin/default.nix => atuin.nix} (100%)
 rename modules/home/cli/{core/default.nix => core.nix} (100%)
 delete mode 100644 modules/home/cli/custom/default.nix
 rename modules/home/cli/{direnv/default.nix => direnv.nix} (100%)
 rename modules/home/cli/{git/default.nix => git.nix} (100%)
 rename modules/home/cli/{langs => }/go.nix (100%)
 rename modules/home/cli/{k8s/default.nix => k8s.nix} (77%)
 rename modules/home/cli/{k8s => }/k9s.nix (100%)
 rename modules/home/cli/{k8s => }/krewfile.nix (100%)
 rename modules/home/cli/{k8s => }/kubecolor.nix (100%)
 delete mode 100644 modules/home/cli/langs/default.nix
 rename modules/home/cli/{lazygit/default.nix => lazygit.nix} (100%)
 rename modules/home/cli/{pet/default.nix => pet.nix} (100%)
 rename modules/home/cli/{langs => }/rust.nix (100%)
 rename modules/home/cli/{custom => }/shell-scripts.nix (100%)
 rename modules/home/cli/{starship/default.nix => starship.nix} (100%)
 rename modules/home/cli/{tflow/default.nix => tflow.nix} (100%)
 rename modules/home/cli/{terminals/tmux/default.nix => tmux.nix} (100%)
 rename modules/home/cli/{zsh/default.nix => zsh.nix} (100%)
 rename modules/home/desktops/{addons/fuzzel/default.nix => fuzzel.nix} (100%)
 rename modules/home/desktops/{addons/gtk/default.nix => gtk.nix} (100%)
 rename modules/home/desktops/{hyprland/addons => }/hypridle.nix (100%)
 rename modules/home/desktops/{hyprland/default.nix => hyprland.nix} (91%)
 rename modules/home/desktops/{hyprland/addons => }/hyprlock.nix (100%)
 rename modules/home/desktops/{addons/kanshi/default.nix => kanshi.nix} (100%)
 rename modules/home/desktops/{hyprland => }/keybinds.nix (100%)
 rename modules/home/desktops/{addons/qt/default.nix => qt.nix} (100%)
 rename modules/home/desktops/{addons => }/swaync/default.nix (100%)
 rename modules/home/desktops/{addons => }/swaync/swaync.css (100%)
 rename modules/home/desktops/{addons => }/swaync/swaync.json (100%)
 rename modules/home/desktops/{addons => }/waybar/default.nix (100%)
 rename modules/home/desktops/{addons => }/waybar/waybar.css (100%)
 rename modules/home/desktops/{addons => }/waybar/waybar.json (100%)
 rename modules/home/desktops/{addons => }/wlogout/default.nix (100%)
 rename modules/home/desktops/{addons => }/wlogout/icons/hibernate.png (100%)
 rename modules/home/desktops/{addons => }/wlogout/icons/lock.png (100%)
 rename modules/home/desktops/{addons => }/wlogout/icons/logout.png (100%)
 rename modules/home/desktops/{addons => }/wlogout/icons/reboot.png (100%)
 rename modules/home/desktops/{addons => }/wlogout/icons/shutdown.png (100%)
 rename modules/home/desktops/{addons => }/wlogout/icons/suspend.png (100%)
 rename modules/home/desktops/{addons => }/wlogout/style.css (100%)
 delete mode 100644 modules/home/services/default.nix
 rename modules/nixos/roles/{gaming/default.nix => gaming.nix} (100%)
 delete mode 100644 modules/nixos/services/default.nix

diff --git a/AGENTS.md b/AGENTS.md
index 44d5bf76..99a16266 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -8,7 +8,7 @@ Repository guidelines and operational instructions for AI agents working in this
 
 ## Overview & Architecture
 - **Nix Flake & Home-Manager:** Declarative configuration managing multi-system NixOS hosts and standalone Home-Manager targets.
-- **Module Discovery:** Modules in `modules/nixos/` and `modules/home/` are automatically discovered via `import-tree` matching `default.nix`.
+- **Module Discovery:** Modules in `modules/nixos/` and `modules/home/` are automatically discovered via `import-tree`.
 - **Directory Structure:**
   - `hosts/<host>/`: Host-specific entrypoints (`default.nix` for NixOS, `home.nix` for Home-Manager).
   - `modules/`: Reusable NixOS and Home-Manager modules.
diff --git a/docs/reference/structure.md b/docs/reference/structure.md
index 7176788e..c7c91eea 100644
--- a/docs/reference/structure.md
+++ b/docs/reference/structure.md
@@ -19,7 +19,7 @@
 **Module structure**
 
 - It defines a `option` and `config` for it.
-- Every module has a `default.nix` which imports all module related files.
+- Modules are organized into clean 2-level category files (e.g. `cli/atuin.nix`, `browsers/firefox.nix`) and discovered automatically.
 
 
 ### `extra/`
diff --git a/flake.nix b/flake.nix
index a3975bf1..6533493a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,7 +68,7 @@
 
       nixosModules = [
         inputs.catppuccin.nixosModules.catppuccin
-        (inputs.import-tree.match ".*/default\\.nix" ./modules/nixos)
+        (inputs.import-tree ./modules/nixos)
         ./modules/nix.nix
       ];
 
@@ -77,7 +77,7 @@
         inputs.neonix.homeManagerModules.neonix
         inputs.krewfile.homeManagerModules.krewfile
         inputs.tflow.homeManagerModules.default
-        (inputs.import-tree.match ".*/default\\.nix" ./modules/home)
+        (inputs.import-tree ./modules/home)
         ./modules/nix.nix
       ];
     in
diff --git a/hosts/kubex/hardware-configuration.nix b/hosts/kubex/hardware-configuration.nix
index aa26d1a2..5a2cd80b 100644
--- a/hosts/kubex/hardware-configuration.nix
+++ b/hosts/kubex/hardware-configuration.nix
@@ -2,7 +2,8 @@
   lib,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
@@ -15,9 +16,9 @@
       "sd_mod"
       "sr_mod"
     ];
-    initrd.kernelModules = [];
-    kernelModules = [];
-    extraModulePackages = [];
+    initrd.kernelModules = [ ];
+    kernelModules = [ ];
+    extraModulePackages = [ ];
   };
 
   networking.useDHCP = lib.mkDefault true;
diff --git a/modules/home/browsers/chromium/default.nix b/modules/home/browsers/chromium.nix
similarity index 100%
rename from modules/home/browsers/chromium/default.nix
rename to modules/home/browsers/chromium.nix
diff --git a/modules/home/browsers/firefox/default.nix b/modules/home/browsers/firefox.nix
similarity index 100%
rename from modules/home/browsers/firefox/default.nix
rename to modules/home/browsers/firefox.nix
diff --git a/modules/home/cli/terminals/alacritty/default.nix b/modules/home/cli/alacritty.nix
similarity index 100%
rename from modules/home/cli/terminals/alacritty/default.nix
rename to modules/home/cli/alacritty.nix
diff --git a/modules/home/cli/atuin/default.nix b/modules/home/cli/atuin.nix
similarity index 100%
rename from modules/home/cli/atuin/default.nix
rename to modules/home/cli/atuin.nix
diff --git a/modules/home/cli/core/default.nix b/modules/home/cli/core.nix
similarity index 100%
rename from modules/home/cli/core/default.nix
rename to modules/home/cli/core.nix
diff --git a/modules/home/cli/custom/default.nix b/modules/home/cli/custom/default.nix
deleted file mode 100644
index 58b56c44..00000000
--- a/modules/home/cli/custom/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ imports = [ ./shell-scripts.nix ]; }
diff --git a/modules/home/cli/direnv/default.nix b/modules/home/cli/direnv.nix
similarity index 100%
rename from modules/home/cli/direnv/default.nix
rename to modules/home/cli/direnv.nix
diff --git a/modules/home/cli/git/default.nix b/modules/home/cli/git.nix
similarity index 100%
rename from modules/home/cli/git/default.nix
rename to modules/home/cli/git.nix
diff --git a/modules/home/cli/langs/go.nix b/modules/home/cli/go.nix
similarity index 100%
rename from modules/home/cli/langs/go.nix
rename to modules/home/cli/go.nix
diff --git a/modules/home/cli/k8s/default.nix b/modules/home/cli/k8s.nix
similarity index 77%
rename from modules/home/cli/k8s/default.nix
rename to modules/home/cli/k8s.nix
index 04512519..935916bd 100644
--- a/modules/home/cli/k8s/default.nix
+++ b/modules/home/cli/k8s.nix
@@ -1,11 +1,5 @@
 { pkgs, ... }:
 {
-  imports = [
-    ./k9s.nix
-    ./krewfile.nix
-    ./kubecolor.nix
-  ];
-
   home.packages = builtins.attrValues {
     # OCI tooling
     inherit (pkgs)
diff --git a/modules/home/cli/k8s/k9s.nix b/modules/home/cli/k9s.nix
similarity index 100%
rename from modules/home/cli/k8s/k9s.nix
rename to modules/home/cli/k9s.nix
diff --git a/modules/home/cli/k8s/krewfile.nix b/modules/home/cli/krewfile.nix
similarity index 100%
rename from modules/home/cli/k8s/krewfile.nix
rename to modules/home/cli/krewfile.nix
diff --git a/modules/home/cli/k8s/kubecolor.nix b/modules/home/cli/kubecolor.nix
similarity index 100%
rename from modules/home/cli/k8s/kubecolor.nix
rename to modules/home/cli/kubecolor.nix
diff --git a/modules/home/cli/langs/default.nix b/modules/home/cli/langs/default.nix
deleted file mode 100644
index 966a2031..00000000
--- a/modules/home/cli/langs/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./go.nix
-    ./rust.nix
-  ];
-}
diff --git a/modules/home/cli/lazygit/default.nix b/modules/home/cli/lazygit.nix
similarity index 100%
rename from modules/home/cli/lazygit/default.nix
rename to modules/home/cli/lazygit.nix
diff --git a/modules/home/cli/pet/default.nix b/modules/home/cli/pet.nix
similarity index 100%
rename from modules/home/cli/pet/default.nix
rename to modules/home/cli/pet.nix
diff --git a/modules/home/cli/langs/rust.nix b/modules/home/cli/rust.nix
similarity index 100%
rename from modules/home/cli/langs/rust.nix
rename to modules/home/cli/rust.nix
diff --git a/modules/home/cli/custom/shell-scripts.nix b/modules/home/cli/shell-scripts.nix
similarity index 100%
rename from modules/home/cli/custom/shell-scripts.nix
rename to modules/home/cli/shell-scripts.nix
diff --git a/modules/home/cli/starship/default.nix b/modules/home/cli/starship.nix
similarity index 100%
rename from modules/home/cli/starship/default.nix
rename to modules/home/cli/starship.nix
diff --git a/modules/home/cli/tflow/default.nix b/modules/home/cli/tflow.nix
similarity index 100%
rename from modules/home/cli/tflow/default.nix
rename to modules/home/cli/tflow.nix
diff --git a/modules/home/cli/terminals/tmux/default.nix b/modules/home/cli/tmux.nix
similarity index 100%
rename from modules/home/cli/terminals/tmux/default.nix
rename to modules/home/cli/tmux.nix
diff --git a/modules/home/cli/zsh/default.nix b/modules/home/cli/zsh.nix
similarity index 100%
rename from modules/home/cli/zsh/default.nix
rename to modules/home/cli/zsh.nix
diff --git a/modules/home/common/default.nix b/modules/home/common/default.nix
index 3b4259d2..52c25c27 100644
--- a/modules/home/common/default.nix
+++ b/modules/home/common/default.nix
@@ -1,7 +1,5 @@
 { lib, ... }:
 {
-  imports = [ ./roles.nix ];
-
   programs.home-manager.enable = true;
   xdg.enable = true;
 
diff --git a/modules/home/desktops/addons/fuzzel/default.nix b/modules/home/desktops/fuzzel.nix
similarity index 100%
rename from modules/home/desktops/addons/fuzzel/default.nix
rename to modules/home/desktops/fuzzel.nix
diff --git a/modules/home/desktops/addons/gtk/default.nix b/modules/home/desktops/gtk.nix
similarity index 100%
rename from modules/home/desktops/addons/gtk/default.nix
rename to modules/home/desktops/gtk.nix
diff --git a/modules/home/desktops/hyprland/addons/hypridle.nix b/modules/home/desktops/hypridle.nix
similarity index 100%
rename from modules/home/desktops/hyprland/addons/hypridle.nix
rename to modules/home/desktops/hypridle.nix
diff --git a/modules/home/desktops/hyprland/default.nix b/modules/home/desktops/hyprland.nix
similarity index 91%
rename from modules/home/desktops/hyprland/default.nix
rename to modules/home/desktops/hyprland.nix
index 97efe4ad..355f2879 100644
--- a/modules/home/desktops/hyprland/default.nix
+++ b/modules/home/desktops/hyprland.nix
@@ -38,12 +38,6 @@ in
     };
   };
 
-  imports = [
-    ./addons/hypridle.nix
-    ./addons/hyprlock.nix
-    ./keybinds.nix
-  ];
-
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
       {
@@ -55,27 +49,27 @@ in
           settings.wallpaper = [
             {
               monitor = "eDP-1";
-              path = toString ../../../../extra/wallpapers/anime-city.jpg;
+              path = toString ../../../extra/wallpapers/anime-city.jpg;
               fit_mode = "cover";
             }
             {
               monitor = "DP-1";
-              path = toString ../../../../extra/wallpapers/gohan-supersaiyan.png;
+              path = toString ../../../extra/wallpapers/gohan-supersaiyan.png;
               fit_mode = "cover";
             }
             {
               monitor = "desc:Dell Inc. AW2725Q G2QC174";
-              path = toString ../../../../extra/wallpapers/luffy-gear-5.jpg;
+              path = toString ../../../extra/wallpapers/luffy-gear-5.jpg;
               fit_mode = "cover";
             }
             {
               monitor = "desc:Samsung Electric Company LC27G7xT H4ZNC00167";
-              path = toString ../../../../extra/wallpapers/one-piece-logo.jpg;
+              path = toString ../../../extra/wallpapers/one-piece-logo.jpg;
               fit_mode = "cover";
             }
             {
               monitor = "";
-              path = toString ../../../../extra/wallpapers/minimal-space.jpg;
+              path = toString ../../../extra/wallpapers/minimal-space.jpg;
               fit_mode = "cover";
             }
           ];
diff --git a/modules/home/desktops/hyprland/addons/hyprlock.nix b/modules/home/desktops/hyprlock.nix
similarity index 100%
rename from modules/home/desktops/hyprland/addons/hyprlock.nix
rename to modules/home/desktops/hyprlock.nix
diff --git a/modules/home/desktops/addons/kanshi/default.nix b/modules/home/desktops/kanshi.nix
similarity index 100%
rename from modules/home/desktops/addons/kanshi/default.nix
rename to modules/home/desktops/kanshi.nix
diff --git a/modules/home/desktops/hyprland/keybinds.nix b/modules/home/desktops/keybinds.nix
similarity index 100%
rename from modules/home/desktops/hyprland/keybinds.nix
rename to modules/home/desktops/keybinds.nix
diff --git a/modules/home/desktops/addons/qt/default.nix b/modules/home/desktops/qt.nix
similarity index 100%
rename from modules/home/desktops/addons/qt/default.nix
rename to modules/home/desktops/qt.nix
diff --git a/modules/home/desktops/addons/swaync/default.nix b/modules/home/desktops/swaync/default.nix
similarity index 100%
rename from modules/home/desktops/addons/swaync/default.nix
rename to modules/home/desktops/swaync/default.nix
diff --git a/modules/home/desktops/addons/swaync/swaync.css b/modules/home/desktops/swaync/swaync.css
similarity index 100%
rename from modules/home/desktops/addons/swaync/swaync.css
rename to modules/home/desktops/swaync/swaync.css
diff --git a/modules/home/desktops/addons/swaync/swaync.json b/modules/home/desktops/swaync/swaync.json
similarity index 100%
rename from modules/home/desktops/addons/swaync/swaync.json
rename to modules/home/desktops/swaync/swaync.json
diff --git a/modules/home/desktops/addons/waybar/default.nix b/modules/home/desktops/waybar/default.nix
similarity index 100%
rename from modules/home/desktops/addons/waybar/default.nix
rename to modules/home/desktops/waybar/default.nix
diff --git a/modules/home/desktops/addons/waybar/waybar.css b/modules/home/desktops/waybar/waybar.css
similarity index 100%
rename from modules/home/desktops/addons/waybar/waybar.css
rename to modules/home/desktops/waybar/waybar.css
diff --git a/modules/home/desktops/addons/waybar/waybar.json b/modules/home/desktops/waybar/waybar.json
similarity index 100%
rename from modules/home/desktops/addons/waybar/waybar.json
rename to modules/home/desktops/waybar/waybar.json
diff --git a/modules/home/desktops/addons/wlogout/default.nix b/modules/home/desktops/wlogout/default.nix
similarity index 100%
rename from modules/home/desktops/addons/wlogout/default.nix
rename to modules/home/desktops/wlogout/default.nix
diff --git a/modules/home/desktops/addons/wlogout/icons/hibernate.png b/modules/home/desktops/wlogout/icons/hibernate.png
similarity index 100%
rename from modules/home/desktops/addons/wlogout/icons/hibernate.png
rename to modules/home/desktops/wlogout/icons/hibernate.png
diff --git a/modules/home/desktops/addons/wlogout/icons/lock.png b/modules/home/desktops/wlogout/icons/lock.png
similarity index 100%
rename from modules/home/desktops/addons/wlogout/icons/lock.png
rename to modules/home/desktops/wlogout/icons/lock.png
diff --git a/modules/home/desktops/addons/wlogout/icons/logout.png b/modules/home/desktops/wlogout/icons/logout.png
similarity index 100%
rename from modules/home/desktops/addons/wlogout/icons/logout.png
rename to modules/home/desktops/wlogout/icons/logout.png
diff --git a/modules/home/desktops/addons/wlogout/icons/reboot.png b/modules/home/desktops/wlogout/icons/reboot.png
similarity index 100%
rename from modules/home/desktops/addons/wlogout/icons/reboot.png
rename to modules/home/desktops/wlogout/icons/reboot.png
diff --git a/modules/home/desktops/addons/wlogout/icons/shutdown.png b/modules/home/desktops/wlogout/icons/shutdown.png
similarity index 100%
rename from modules/home/desktops/addons/wlogout/icons/shutdown.png
rename to modules/home/desktops/wlogout/icons/shutdown.png
diff --git a/modules/home/desktops/addons/wlogout/icons/suspend.png b/modules/home/desktops/wlogout/icons/suspend.png
similarity index 100%
rename from modules/home/desktops/addons/wlogout/icons/suspend.png
rename to modules/home/desktops/wlogout/icons/suspend.png
diff --git a/modules/home/desktops/addons/wlogout/style.css b/modules/home/desktops/wlogout/style.css
similarity index 100%
rename from modules/home/desktops/addons/wlogout/style.css
rename to modules/home/desktops/wlogout/style.css
diff --git a/modules/home/services/default.nix b/modules/home/services/default.nix
deleted file mode 100644
index a699bd63..00000000
--- a/modules/home/services/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./ssh.nix
-    ./tray.nix
-    ./keyring.nix
-    ./nextcloud.nix
-  ];
-}
diff --git a/modules/nix.nix b/modules/nix.nix
index bc4330d8..76bee5e8 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -3,7 +3,8 @@
   lib,
   pkgs,
   ...
-}: {
+}:
+{
   config = {
     nixpkgs = {
       config = {
@@ -33,7 +34,7 @@
       };
 
       # Add nixpkgs input to NIX_PATH, to make nix2 commands consistent with the flake.
-      nixPath = ["nixpkgs=${inputs.nixpkgs.outPath}"];
+      nixPath = [ "nixpkgs=${inputs.nixpkgs.outPath}" ];
     };
   };
 }
diff --git a/modules/nixos/roles/desktop/default.nix b/modules/nixos/roles/desktop/default.nix
index ef9c9b52..7e642419 100644
--- a/modules/nixos/roles/desktop/default.nix
+++ b/modules/nixos/roles/desktop/default.nix
@@ -7,13 +7,6 @@ let
   cfg = config.hostConfig.roles.desktop;
 in
 {
-  imports = [
-    ./hyprland.nix
-    ./fonts.nix
-    ./power.nix
-    ./explorer.nix
-  ];
-
   config = lib.mkIf cfg {
     services.gnome.gnome-keyring.enable = true;
 
diff --git a/modules/nixos/roles/gaming/default.nix b/modules/nixos/roles/gaming.nix
similarity index 100%
rename from modules/nixos/roles/gaming/default.nix
rename to modules/nixos/roles/gaming.nix
diff --git a/modules/nixos/roles/k3s/default.nix b/modules/nixos/roles/k3s/default.nix
index 4f877fbb..17d11482 100644
--- a/modules/nixos/roles/k3s/default.nix
+++ b/modules/nixos/roles/k3s/default.nix
@@ -13,12 +13,6 @@ let
   '';
 in
 {
-  imports = [
-    ./service.nix
-    ./network.nix
-    ./zfs.nix
-  ];
-
   options.hostConfig.roles.k3s = lib.mkEnableOption "Enable k3s cluster configuration.";
 
   config = lib.mkIf cfg {
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
deleted file mode 100644
index 1783a191..00000000
--- a/modules/nixos/services/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  imports = [
-    ./nh.nix
-    ./sound.nix
-    ./opengl.nix
-    ./podman.nix
-    ./tailscale.nix
-    ./printer.nix
-    ./bluetooth.nix
-    ./ssh.nix
-  ];
-}
diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix
index 0dcb50fc..2175f92a 100644
--- a/modules/nixos/system/default.nix
+++ b/modules/nixos/system/default.nix
@@ -1,14 +1,5 @@
 { lib, ... }:
 {
-  imports = [
-    ./env.nix
-    ./boot.nix
-    ./user.nix
-    ./locale.nix
-    ./starship.nix
-    ./zsh.nix
-  ];
-
   catppuccin = {
     enable = lib.mkDefault true;
     autoEnable = lib.mkDefault false;
diff --git a/overlays/default.nix b/overlays/default.nix
index aceabe66..941db657 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -8,5 +8,5 @@ final: _: {
 
   # Add my own packages also to pkgs
   # Use final here, to provide the "final" dependencies to build my packages.
-  mypkgs = import ../packages {pkgs = final;};
+  mypkgs = import ../packages { pkgs = final; };
 }
diff --git a/packages/default.nix b/packages/default.nix
index f0a3d6d7..645d7e2f 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,4 +1,4 @@
-{pkgs}: {
-  gardenctl = pkgs.callPackage ./gardenctl {};
-  gardenlogin = pkgs.callPackage ./gardenlogin {};
+{ pkgs }: {
+  gardenctl = pkgs.callPackage ./gardenctl { };
+  gardenlogin = pkgs.callPackage ./gardenlogin { };
 }