chore: removed fuckery

modules/nixos/guests/projectSite/default.nix

@@ -23,7 +23,7 @@ in
 
       networking.firewall.allowedTCPPorts = [
         22
-        8080
+        80
       ];
 
       services.openssh = {
@@ -44,15 +44,17 @@ in
             gateway = [ serviceCfg.interface.gate ];
           };
         };
+      };
 
-        services.website = {
+      services.caddy = {
-          wantedBy = [ "multi-user.target" ];
+        enable = true;
-          after = [ "network.target" ];
+        virtualHosts.":80".extraConfig = ''
-          serviceConfig = {
+          root * /etc/website
-            ExecStart = "${pkgs.miniserve}/bin/miniserve /etc/website --index index.html -p 8080";
+
-            Restart = "always";
+          file_server
-          };
+
-        };
+          try_files {path} /index.html
+        '';
       };
 
       microvm = {
@@ -66,6 +68,7 @@ in
             mac = serviceCfg.interface.mac;
           }
         ];
+
         shares = [
           {
             source = "/nix/store";
@@ -81,7 +84,9 @@ in
   services.caddy = {
     enable = true;
     virtualHosts.${host}.extraConfig = ''
-      reverse_proxy ${serviceCfg.interface.ip}:8080
+      reverse_proxy ${serviceCfg.interface.ip}:80
+
+      tls /var/lib/acme/${host}/fullchain.pem /var/lib/acme/${host}/key.pem
     '';
   };
 

modules/nixos/guests/website/default.nix

@@ -16,43 +16,34 @@ in
     autostart = true;
     config = {
       system.stateVersion = "25.05";
-
       networking.firewall.allowedTCPPorts = [
         22
-        8080
+        80
       ];
-
       services.openssh = {
         enable = true;
         settings.PasswordAuthentication = false;
       };
-
       environment.etc."website".source = websitePkg;
-
       users.users.root.openssh.authorizedKeys.keys = flake.config.people.users.${user0}.sshKeys;
-
+      systemd.network = {
-      systemd = {
+        enable = true;
-        network = {
+        networks."10-enp" = {
-          enable = true;
+          matchConfig.Name = "enp0s3";
-          networks."10-enp" = {
+          addresses = [
-            matchConfig.Name = "enp0s3";
+            { Address = "${serviceCfg.interface.ip}/24"; }
-            addresses = [
+          ];
-              { Address = "${serviceCfg.interface.ip}/24"; }
+          gateway = [ serviceCfg.interface.gate ];
-            ];
-            gateway = [ serviceCfg.interface.gate ];
-          };
-        };
-
-        services.website = {
-          wantedBy = [ "multi-user.target" ];
-          after = [ "network.target" ];
-          serviceConfig = {
-            ExecStart = "${pkgs.miniserve}/bin/miniserve /etc/website --index index.html -p 8080";
-            Restart = "always";
-          };
         };
       };
-
+      services.caddy = {
+        enable = true;
+        virtualHosts.":80".extraConfig = ''
+          root * /etc/website
+          file_server
+          try_files {path} /index.html
+        '';
+      };
       microvm = {
         vcpu = 2;
         mem = 3072;
@@ -75,23 +66,17 @@ in
       };
     };
   };
-
   services.caddy = {
-    enable = true;
     virtualHosts.${host}.extraConfig = ''
-      reverse_proxy ${serviceCfg.interface.ip}:8080
+      reverse_proxy ${serviceCfg.interface.ip}:80
-
       tls ${serviceCfg.ssl.cert} ${serviceCfg.ssl.key}
     '';
   };
-
   security.acme.certs.${host} = {
     dnsProvider = instances.web.dns.provider0;
     environmentFile = config.sops.secrets."dns/${instances.web.dns.provider0}".path;
   };
-
   systemd.tmpfiles.rules = [
     "d ${serviceCfg.mntPaths.path0} 0755 microvm wheel - -"
   ];
-
 }

profiles/user0/files/misc/justfile.nix

@@ -63,8 +63,6 @@ in
     ${remoteRebuild}
     ${sshCommand}
     ${microVMSshCommand}
-    addr:
-        http get https://mine.defensio.io/api/statistics/addr1q87k2jlckh6ujqx4ymkdd4jrhy6gukdtum0p77pdh5gqcw8ctl65fvaw097l32ta6m8hth3xu9cjfz70y34gs2mdfzlsj465th | get local_with_donate | get dfo_allocation | $in / 1000000
     balance:
         #!/usr/bin/env nu
         let results = [${balanceHosts}] | each { |h| let val = (^ssh ...($h.ssh | split row " ") 'nu -c "open /var/lib/defenseio-data/MidnightMiner/balances.json | get snapshots | last | get balance"' | into float); print $"($h.name):"; print $val; $val }