Clean up packages and refactor nginx config

modules/datasync.nix

@@ -1,13 +1,7 @@
 # Syncthing and Radicale configuration
 { config, pkgs, lib, ... }:
 {
-
-  environment.systemPackages = with pkgs; [
-    syncthing
-    radicale
-  ];
-
-  # Enable syncthing
+  # Enable Syncthing
   services.syncthing = {
     enable = true;
     openDefaultPorts = true;

modules/devops.nix

@@ -1,10 +1,6 @@
 # Software development configuration
 { config, pkgs, lib, ... }:
 {
-  environment.systemPackages = with pkgs; [
-    gitea
-  ];
-
   # Gitea setup with daily backup
   services.gitea = {
     enable = true;
@@ -20,8 +16,4 @@
     dump.enable = true;
     appName = "Gitea";
   };
-
-  # Restart nginx after startup
-  systemd.services.nginx.after = [ "gitea.service" ];
-
 }

modules/networking.nix

@@ -4,11 +4,6 @@
 
   in
 {
-
-  environment.systemPackages = with pkgs; [
-    ddclient
-  ];
-
   # Dynamic DNS configuration
   services.ddclient = {
     enable = true;

modules/printing.nix

@@ -1,12 +1,6 @@
 # CUPS and SANE configuration
 { config, pkgs, lib, ... }:
 {
-
-  environment.systemPackages = with pkgs; [
-    cups
-    sane-backends
-  ];
-
   # Enable CUPS with Zeroconf
   services.printing = {
     enable = true;

modules/webstack.nix

@@ -3,10 +3,8 @@
 {
 
   environment.systemPackages = with pkgs; [
-    nginx
     postgresql_11
     libressl
-    miniflux
   ];
 
   services.nginx = {
@@ -52,24 +50,26 @@
         forceSSL = true;
         sslCertificate = "/var/lib/acme/coolneng.duckdns.org/fullchain.pem";
         sslCertificateKey = "/var/lib/acme/coolneng.duckdns.org/key.pem";
-        locations."/radicale/" = {
-          proxyPass = "http://localhost:5232/";
-          extraConfig = ''
-            proxy_set_header     X-Script-Name /radicale;
-            proxy_pass_header Authorization;
-          '';
-        };
-        locations."/syncthing/" = {
-          proxyPass = "http://localhost:8384/";
-        };
-        locations."/gitea/" = {
-          proxyPass = "http://localhost:3000/";
-        };
-        locations."/miniflux/" = {
-          proxyPass = "http://localhost:8080/miniflux/";
-        };
-        locations."/wallabag/" = {
-          proxyPass = "http://localhost:8081/";
+        locations = {
+          "/radicale/" = {
+            proxyPass = "http://localhost:5232/";
+            extraConfig = ''
+              proxy_set_header     X-Script-Name /radicale;
+              proxy_pass_header Authorization;
+            '';
+          };
+          "/syncthing/" = {
+            proxyPass = "http://localhost:8384/";
+          };
+          "/gitea/" = {
+            proxyPass = "http://localhost:3000/";
+          };
+          "/miniflux/" = {
+            proxyPass = "http://localhost:8080/miniflux/";
+          };
+          "/wallabag/" = {
+            proxyPass = "http://localhost:8081/";
+          };
         };
       };
     };
@@ -133,4 +133,6 @@
     };
   };
 
+  # Restart nginx after
+  systemd.services.nginx.after = [ "gitea.service" "syncthing.service" "miniflux.service" ];
 }