modules/sv1.nix

@@ -161,7 +161,6 @@
   security.acme = {
     acceptTerms = true;
     defaults.email = "acme.evict519@simplelogin.com";
-    certs."dylanblades.com".extraDomainNames = ["gitea.dylanblades.com"];
   };
 
   time.timeZone = "Europe/London";
@@ -196,7 +195,6 @@
     };
     gitea = {
       enable = true;
-      appName = "Gitea";
       settings = {
         server.DOMAIN = "gitea.dylanblades.com";
         ui.DEFAULT_THEME = "gitea-dark";
@@ -204,27 +202,20 @@
     };
     nginx = {
       enable = true;
-      virtualHosts = {
+      virtualHosts."gitea.dylanblades.com" = {
-        "dylanblades.com" = {
+        forceSSL = true;
-          forceSSL = true;
+        enableACME = true;
-          enableACME = true;
+        locations."/" = {
-          root = pkgs.my-site;
+          proxyPass = "http://localhost:3000";
-        };
+          extraConfig = ''
-        "gitea.dylanblades.com" = {
+            client_max_body_size 512M;
-          forceSSL = true;
+            proxy_set_header Connection $http_connection;
-          useACMEHost = "dylanblades.com";
+            proxy_set_header Upgrade $http_upgrade;
-          locations."/" = {
+            proxy_set_header Host $host;
-            proxyPass = "http://localhost:3000";
+            proxy_set_header X-Real-IP $remote_addr;
-            extraConfig = ''
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-              client_max_body_size 512M;
+            proxy_set_header X-Forwarded-Proto $scheme;
-              proxy_set_header Connection $http_connection;
+          '';
-              proxy_set_header Upgrade $http_upgrade;
-              proxy_set_header Host $host;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-              proxy_set_header X-Forwarded-Proto $scheme;
-            '';
-          };
         };
       };
     };
@@ -234,10 +225,7 @@
   environment = {
     persistence."/persist" = {
       hideMounts = true;
-      directories = [
+      directories = ["/var/lib/nixos"];
-        "/var/lib/nixos"
-        "/var/lib/gitea"
-      ];
     };
     systemPackages = with pkgs; [
       git

packages/default.nix

@@ -1,4 +1,3 @@
 {pkgs}: {
   my-vim = pkgs.callPackage ./my-vim {};
-  my-site = pkgs.callPackage ./my-site {};
 }

packages/my-site/default.nix

@@ -1,2 +0,0 @@
-{writeTextDir}:
-writeTextDir "index.html" "my-site"