consolidate config file

nixos/configuration.nix

@@ -46,12 +46,6 @@ in
     };
   };
 
-  environment.variables = {
-    CP = config.sops.secrets."clusterPassword".path;
-    CAE = config.sops.secrets."cloudflare-api-email".path;
-    CAK = config.sops.secrets."cloudflare-api-key".path;
-  };
-
   systemd.user.services.mbsync.unitConfig.After = [ "sops-nix.service" ];
   fileSystems."/persist".neededForBoot = true;
 
@@ -68,24 +62,26 @@ in
     };
   };
 
-  services.nginx.enable = true;
+  services.nginx = {
+    enable = true;
     
-  services.nginx.virtualHosts."roypository.com" = {
+    virtualHosts."roypository.com" = {
-    forceSSL = true;
+      forceSSL = true;
-    enableACME = true; 
+      enableACME = true; 
-    acmeRoot = null;
+      acmeRoot = null;
-  };
+    };
 
-
+    virtualHosts."test.roypository.com" = {
-  services.nginx.virtualHosts."test.roypository.com" = {
+      forceSSL = true;
-    forceSSL = true;
+      enableACME = true;
-    enableACME = true;
+      acmeRoot = null;
-    acmeRoot = null;
+      root = "${testSiteIndex}";
-    root = "${testSiteIndex}";
+      locations."/" = {
-    locations."/" = {
+        extraConfig = 
-      extraConfig = ''
+        ''
-        index index.html;
+          index index.html;
-      '';
+        '';
+      };
     };
   };
 
@@ -105,23 +101,23 @@ in
     zfs rollback -r zroot/root@blank
   '';
   
-  networking.hostName = meta.hostname;
+  networking = {
-  networking.hostId = meta.hostId;
+    hostName = meta.hostname;
+    hostId = meta.hostId;
+    defaultGateway = "192.168.1.1";
+    nameservers = [ "1.1.1.1" "1.0.0.1" ];
 
-  networking.interfaces.eth0.ipv4.addresses = [
+    firewall = {
-    {
+      enable = true;
-      address = config.ipAddrs.${meta.hostname};
+      allowedTCPPorts = [ 22 80 443];
-      prefixLength = 24;
+    };
-    }
-  ];
 
-  networking.defaultGateway = "192.168.1.1";
+    interfaces.eth0.ipv4.addresses = [
-  networking.nameservers = [ "1.1.1.1" "1.0.0.1" ];
+      {
-
+        adress = config.ipAddrs.${meta.hostname};
-  # Open ports in the firewall.
+        prefixLength = 24;
-  networking.firewall = {
+      }
-    enable = true;
+    ];
-    allowedTCPPorts = [ 22 80 443 ];
   };
 
   # Set your time zone.