refactor(modules): flatten directory structure to 2-level category layout

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.

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/`

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

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;

modules/home/cli/k8s/default.nix → 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)

modules/home/common/default.nix

@@ -1,7 +1,5 @@
 { lib, ... }:
 {
-  imports = [ ./roles.nix ];
-
   programs.home-manager.enable = true;
   xdg.enable = true;
 

modules/home/desktops/hyprland/default.nix → 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";
             }
           ];

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}" ];
     };
   };
 }

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;
 

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 {

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;

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; };
 }

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 { };
 }