a

home-manager/home.nix

@@ -12,14 +12,18 @@
     # Base configuration shared across all platforms
     ./common.nix
     
-    # Feature modules
-    ./development.nix
-    ./shell.nix
-    ./terminal.nix
-    
     # Platform-specific configurations
-    ./linux.nix
-    ./darwin.nix
+    ./platform/darwin.nix
+    ./platform/linux.nix
+    
+    # Modular configurations by program/tool
+    ./modules/git.nix
+    ./modules/shells.nix
+    ./modules/cli-tools.nix
+    ./modules/terminal-emulators.nix
+    ./modules/editors.nix
+    ./modules/multiplexers.nix
+    ./modules/dev-tools.nix
     
     # If you want to use modules your own flake exports (from modules/home-manager):
     # inputs.self.homeManagerModules.example