Reorganization

flake.nix

@@ -18,22 +18,40 @@
       specialArgs = { inherit inputs; };
 
       modules = [
+        # Common configuration options
+        ./config/common.nix
+
+        # External modules
         agenix.nixosModules.default
-        ./system.nix
+
+        # Core system modules
+        ./modules/core/boot.nix
+        ./modules/core/server-power.nix
+        ./modules/core/packages.nix
+        
+        # Hardware
+        ./modules/hardware/hardware-configuration.nix
+        
+        # Users
+        ./modules/users/lucas.nix
+        
+        # Networking
+        ./modules/networking/host.nix
+        ./modules/networking/ssh.nix
+        ./modules/networking/adblock.nix
+        ./modules/networking/vpn-host.nix
+        
+        # Services
+        ./modules/services/jellyfin.nix
+        ./modules/services/site.nix
+        ./modules/services/forgejo.nix
+        ./modules/services/calibre-web.nix
+
+        # Legacy configuration and secrets
         ./configuration.nix
-        ./hardware-configuration.nix
-        ./networking/host.nix
-        ./packages.nix
-        ./users.nix
-        ./networking/ssh.nix
-        ./networking/adblock.nix
-        ./networking/vpn-host.nix
-        ./services/jellyfin.nix
-        ./services/site.nix
-        ./services/forgejo.nix
         {
           environment.systemPackages = [ agenix.packages.x86_64-linux.default ];
-          age.secrets.tailscale.file = ./tailscale.age;
+          age.secrets.tailscale.file = ./secrets/tailscale.age;
           age.secrets.aws.file = ./secrets/aws.age;
           nixpkgs.config.allowUnfree = true;
         }