From 1e6dc261f166058824d6fa526cbf17cc23eb915d Mon Sep 17 00:00:00 2001
From: Caroline Larimore <caroline@larimo.re>
Date: Mon, 14 Apr 2025 16:55:07 -0700
Subject: migration: personal site webserver

---
 hosts/copenhagen/configuration.nix                 |  5 --
 roles/web/default.nix                              |  7 ---
 roles/web/personal/default.nix                     | 60 ---------------------
 .../nixos/services/web/personal/default.nix        | 63 ++++++++++++++++++++++
 4 files changed, 63 insertions(+), 72 deletions(-)
 delete mode 100644 roles/web/default.nix
 delete mode 100644 roles/web/personal/default.nix
 create mode 100644 snowfall/modules/nixos/services/web/personal/default.nix

diff --git a/hosts/copenhagen/configuration.nix b/hosts/copenhagen/configuration.nix
index 89dbbf4..f3f58bf 100644
--- a/hosts/copenhagen/configuration.nix
+++ b/hosts/copenhagen/configuration.nix
@@ -37,11 +37,6 @@
         port = 25569;
       };
     };
-    web = {
-      images.enable = true;
-      stargazers.enable = true;
-      personal.enable = true;
-    };
   };
 
   programs = {
diff --git a/roles/web/default.nix b/roles/web/default.nix
deleted file mode 100644
index b1eb586..0000000
--- a/roles/web/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./personal
-  ];
-}
diff --git a/roles/web/personal/default.nix b/roles/web/personal/default.nix
deleted file mode 100644
index 8424b1d..0000000
--- a/roles/web/personal/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-
-let 
-  cfg = config.roles.web.personal;
-  package = (pkgs.buildGoModule rec {
-    pname = "site";
-    version = "6612d84c63a7bbc2a5b70607f2ec32ea070c4659";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "CartConnoisseur";
-      repo = "site";
-      rev = "${version}";
-      hash = "sha256-n54+LdtMyjoLfaFqd7tcDQqBiYCdUW/Rs67Vc4QwEJ0=";
-    };
-
-    # kinda a hack, but whatever
-    postBuild = ''
-      mkdir -p $out/share/site
-      cp -r $src/* $out/share/site/
-    '';
-
-    vendorHash = "sha256-2/4Wv7nsaT0wnUzkRgHKpSswigDj9nOvlmYXK29rvLU=";
-  });
-in {
-  options.roles.web.personal = {
-    enable = mkEnableOption "personal site";
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = [ 80 443 ];
-    
-    services.nginx = {
-      enable = true;
-      virtualHosts = {
-        "caroline.larimo.re" = {
-          serverAliases = [ "cxl.sh" ];
-
-          addSSL = true;
-          enableACME = true;
-
-          locations."/" = {
-            recommendedProxySettings = true;
-            proxyPass = "http://127.0.0.1:8080/";
-          };
-        };
-      };
-    };
-
-    systemd.services."web.personal" = {
-      enable = true;
-      wantedBy = [ "multi-user.target" ];
-
-      serviceConfig = {
-        WorkingDirectory = "${package}/share/site";
-        ExecStart = "${package}/bin/site";
-      };
-    };
-  };
-}
diff --git a/snowfall/modules/nixos/services/web/personal/default.nix b/snowfall/modules/nixos/services/web/personal/default.nix
new file mode 100644
index 0000000..6865830
--- /dev/null
+++ b/snowfall/modules/nixos/services/web/personal/default.nix
@@ -0,0 +1,63 @@
+{ options, config, lib, pkgs, namespace, ... }:
+
+with lib; with lib.${namespace}; let
+  cfg = config.${namespace}.services.web.personal;
+  impermanence = config.${namespace}.system.impermanence;
+
+  package = (pkgs.buildGoModule rec {
+    pname = "site";
+    version = "6612d84c63a7bbc2a5b70607f2ec32ea070c4659";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "CartConnoisseur";
+      repo = "site";
+      rev = "${version}";
+      hash = "sha256-n54+LdtMyjoLfaFqd7tcDQqBiYCdUW/Rs67Vc4QwEJ0=";
+    };
+
+    # kinda a hack, but whatever
+    postBuild = ''
+      mkdir -p $out/share/site
+      cp -r $src/* $out/share/site/
+    '';
+
+    vendorHash = "sha256-2/4Wv7nsaT0wnUzkRgHKpSswigDj9nOvlmYXK29rvLU=";
+  });
+in {
+  options.${namespace}.services.personal.images = with types; {
+    enable = mkEnableOption "personal site webserver";
+  };
+
+  config = mkIf cfg.enable {
+    cxl.services.web.enable = true;
+
+    networking.firewall.allowedTCPPorts = [ 80 443 ];
+    
+    services.nginx = {
+      enable = true;
+      virtualHosts = {
+        "caroline.larimo.re" = {
+          serverAliases = [ "cxl.sh" ];
+
+          addSSL = true;
+          enableACME = true;
+
+          locations."/" = {
+            recommendedProxySettings = true;
+            proxyPass = "http://127.0.0.1:8080/";
+          };
+        };
+      };
+    };
+
+    systemd.services."cxl.web.personal" = {
+      enable = true;
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        WorkingDirectory = "${package}/share/site";
+        ExecStart = "${package}/bin/site";
+      };
+    };
+  };
+}
-- 
cgit v1.2.3