Revert "Clean up packages and refactor nginx config"

This reverts commit 375758a958.

configuration.nix

@@ -19,6 +19,7 @@
   environment.systemPackages = with pkgs; [
     raspberrypi-tools
     git
+    tmux
     htop
     vim
   ];
@@ -42,7 +43,7 @@
   users.users.coolneng = {
     isNormalUser = true;
     home = "/home/coolneng";
-    extraGroups = [ "wheel" "lp" "scanner" "docker" ];
+    extraGroups = [ "wheel" "lp" "scanner" ];
     openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDG7JtfAqcbZV28wkNTfSWSqTOo5buH+dyT0w6SlTqq+KFh5DxREB0yGuM1UfjLpyLQ0XI7UbhCwNG28Li4yv/hwPGq63TF1kl+w4sjQKFn4bOUv1NvsfSN3oTamjfYoVsrapCiXqOvZkzEKMF47MSwOfPkqZ6ihU5V3INA0IZbl1Ri+r9MsIzvY76ZHBiF6rVqQJjdXVDbcLMViOrM56FpyK+ICo+uTkErsEbYFwevVTv9memOh778RRPesBobpZjggWOI4HXXxqk35myInYjHve9K4ox6YZMjwnwnEftONr2HyoBBcBNT+wWd1jtYxCoCWQ3vVkn4LGBDOQ3+HKb4rT3JxI66VfFyQWGJPdgJL5/ZNRlBqA7CpAtE7JaR6l7d3mCCoGW2B0atWiEXecwb8dz4CzzYm1r9Wz27L74OtPzUqcV7mQjCVDcnRsY/MtfhzyWzhB3tujVqnRtF3VrFSrm0YXS1ZWG4dltX1cfgud8s8XwwBKcFw5NdCrVxq3nRMNlGcSqbXC+RnrkK/i6ciAriZdXgFrmnBl+6qEmqIO15u2IPvDhnQs18DzRkHnPQegphhHhHix5aaqNbLfSRZNCTQaqE774X+0kuU/RWylI4muIyf4k9x+et4txeU2OC6l0W0LMpbsELzXIRr/ZBFrGHbE7/KLi8HNiAJ0KmAQ== coolneng@monolith" ];
     shell = "/run/current-system/sw/bin/fish";
   };

modules/datasync.nix

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

modules/devops.nix

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

modules/networking.nix

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

modules/printing.nix

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