common/fragments/graphical/darwin.nix

@@ -4,7 +4,6 @@
     ./default.nix
     ./iosevka.nix
     ../../home_manager/common.nix
-    ../../home_manager/ghostty.nix
     ../../remote-builds.nix
   ];
 

common/home_manager/ghostty.nix

@@ -1,69 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.home-manager.users.agatha;
-in
-{
-  home-manager.users.agatha = {
-    programs.ghostty = {
-      enable = true;
-      package = pkgs.ghostty-bin;
-      settings = {
-        command = "direct:${lib.getExe cfg.programs.fish.package}";
-
-        theme = "Paramount-ish";
-        font-family = "Monaco";
-        adjust-cursor-thickness = 1;
-        background-opacity = "0.8";
-        background-blur = "macos-glass-regular";
-
-        window-padding-x = 5;
-        window-padding-y = 5;
-        window-padding-balance = true;
-        window-padding-color = "extend";
-
-        notify-on-command-finish = "unfocused";
-        notify-on-command-finish-action = "no-bell,notify";
-        notify-on-command-finish-after = "1m";
-
-        macos-option-as-alt = true;
-        macos-titlebar-style = "tabs";
-
-        quit-after-last-window-closed = true;
-      };
-      themes."Paramount-ish" = {
-        background = "020305";
-        foreground = "feffff";
-
-        selection-background = "423450";
-        selection-foreground = "feffff";
-
-        bold-color = "bright";
-        minimum-contrast = 1.1;
-
-        palette = [
-          "0=020305"
-          "1=2f2c43"
-          "2=4e436a"
-          "3=62417c"
-          "4=8754a6"
-          "5=b36be1"
-          "6=e174e4"
-          "7=fbfafe"
-          "8=1f2f4e"
-          "9=4a466d"
-          "10=715295"
-          "11=966fb4"
-          "12=b696ca"
-          "13=dfc0f2"
-          "14=f3c9f5"
-          "15=ffffff"
-        ];
-      };
-    };
-  };
-}

common/pkgs/technogothic-net.nix

@@ -1,15 +0,0 @@
-{ pkgs }:
-pkgs.stdenv.mkDerivation rec {
-  pname = "technogothic.net";
-  version = "4cceb58ea04ba81bac01f6678b998e91cc69b902";
-  src = pkgs.fetchgit {
-    url = "https://git.lain.faith/sorceress/technogothic.net";
-    rev = version;
-    hash = "sha256-93U6W6ITbp0Mf1IGSYJeKE6a6qkY9wnHoMzFqd10/UI=";
-  };
-
-  installPhase = ''
-    mkdir $out
-    cp -r src/. $out
-  '';
-}

flake.lock

@@ -59,11 +59,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783740085,
+        "lastModified": 1780361225,
-        "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=",
+        "narHash": "sha256-wnV9ttf4fPWNonBIQmvlrSlNpQYgx5HgWWd007mwIFA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb",
+        "rev": "e28654b71096e08c019d4861ca26acb646f583d8",
         "type": "github"
       },
       "original": {
@@ -202,11 +202,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783744694,
+        "lastModified": 1779036909,
-        "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=",
+        "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74",
+        "rev": "56c666e108467d87d13508936aade6d567f2a501",
         "type": "github"
       },
       "original": {
@@ -232,11 +232,11 @@
     },
     "nixpkgs-darwin": {
       "locked": {
-        "lastModified": 1783868237,
+        "lastModified": 1780383649,
-        "narHash": "sha256-MDQLbs882ugMi408mpSwa2nw2yzN43hHtOxx0zbUcZA=",
+        "narHash": "sha256-FS3od1iIyWYz68tqZGGc92Po7Ji+G2NEm6+a4s4RI0w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "76fe02659c00bef75e12fbfdd45ca665115e9302",
+        "rev": "595ee2b1a31a50efcb8db3824999abb98ec1d0c9",
         "type": "github"
       },
       "original": {
@@ -264,11 +264,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1783816212,
+        "lastModified": 1780336545,
-        "narHash": "sha256-2aZisVTVGSFEk3MYcOiWQp3zvwyzbqpktB69Rcfp150=",
+        "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3b32825de172d0bc85664f495edb096b10862524",
+        "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
         "type": "github"
       },
       "original": {
@@ -296,11 +296,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1783703440,
+        "lastModified": 1780203844,
-        "narHash": "sha256-O3/YajjWo001VUIgD8BwaRdSNLUFe7nZ1qV5TwhRBcw=",
+        "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8f0500b9660505dc3cb647775fe9a978a74b5283",
+        "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4",
         "type": "github"
       },
       "original": {
@@ -310,6 +310,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1682092588,
+        "narHash": "sha256-NjKBPnScpbGiH/YOx74DIFOVkr5AKJOVZoy0l7J58gk=",
+        "owner": "AgathaSorceress",
+        "repo": "nixpkgs",
+        "rev": "bdd3dc5aa8435b66f14636550223a9b3a50e534d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AgathaSorceress",
+        "ref": "image-optim-pack-cleanup",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "ccase": "ccase",
@@ -321,7 +337,8 @@
         "nixpkgs-darwin": "nixpkgs-darwin",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix",
-        "url-eater": "url-eater"
+        "url-eater": "url-eater",
+        "vampysite": "vampysite"
       }
     },
     "sops-nix": {
@@ -331,11 +348,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783174389,
+        "lastModified": 1777944972,
-        "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
         "type": "github"
       },
       "original": {
@@ -389,6 +406,21 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "url-eater": {
       "inputs": {
         "naersk": "naersk_2",
@@ -464,6 +496,43 @@
         "repo": "flake-utils",
         "type": "github"
       }
+    },
+    "utils_4": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "vampysite": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4",
+        "utils": "utils_4"
+      },
+      "locked": {
+        "lastModified": 1717180338,
+        "narHash": "sha256-g2ZNMpqJ4IARjXY8FX4UUfF4p9Unc01w8RzFYEONXlE=",
+        "ref": "refs/heads/mistress",
+        "rev": "1adcc3630a6c626f61dac989fffd661dbb4946ef",
+        "revCount": 21,
+        "type": "git",
+        "url": "https://git.lain.faith/sorceress/vampysite"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lain.faith/sorceress/vampysite"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -4,6 +4,8 @@
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-26.05-darwin";
 
+    vampysite.url = "git+https://git.lain.faith/sorceress/vampysite";
+
     home-manager = {
       url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -49,6 +51,7 @@
       sops-nix,
       mms,
       matrix-ril100,
+      vampysite,
       ccase,
       ...
     }:
@@ -69,6 +72,7 @@
         );
       mkOverlays = system: config: [
         (final: prev: {
+          vampysite = vampysite.packages.${system}.default;
           matrix-ril100 = matrix-ril100.packages.${system}.default;
           ccase = ccase.packages.${system}.default;
 

hosts/bloodletting/configuration.nix

@@ -1,5 +1,6 @@
 {
   config,
+  pkgs,
   lib,
   ...
 }:
@@ -133,6 +134,41 @@
       };
     };
 
+    virtualHosts."technogothic.net" = {
+      useACMEHost = "technogothic.net";
+      forceSSL = true;
+      root = pkgs.vampysite;
+
+      serverAliases = [ "agatha.technogothic.net" ];
+
+      locations."=/cv.pdf" = {
+        alias = "/home/ftp/cv.pdf";
+      };
+
+      locations."=/.well-known/host-meta" = {
+        return = "301 https://fv.technogothic.net$request_uri";
+      };
+
+      locations."=/.well-known/webfinger" = {
+        return = "301 https://fv.technogothic.net$request_uri";
+        extraConfig = ''
+          add_header Access-Control-Allow-Origin '*';
+        '';
+      };
+
+      locations."=/5idbsp9q8d.txt".return = "200 uwu";
+
+      extraConfig = ''
+        error_page 404 /404.html;
+      '';
+    };
+
+    virtualHosts."www.technogothic.net" = {
+      useACMEHost = "technogothic.net";
+      forceSSL = true;
+      globalRedirect = "technogothic.net";
+    };
+
     virtualHosts."fv.technogothic.net" = {
       useACMEHost = "technogothic.net";
       forceSSL = true;

hosts/synchronicity/configuration.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   ...
 }:
@@ -80,22 +79,6 @@
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
 
-    virtualHosts."technogothic.net" = {
-      useACMEHost = "technogothic.net";
-      forceSSL = true;
-      root = pkgs.callPackage ../../common/pkgs/technogothic-net.nix { };
-
-      locations."=/cv.pdf" = {
-        alias = "/home/ftp/cv.pdf";
-      };
-    };
-
-    virtualHosts."www.technogothic.net" = {
-      useACMEHost = "technogothic.net";
-      forceSSL = true;
-      globalRedirect = "technogothic.net";
-    };
-
     virtualHosts._ = {
       default = true;
       useACMEHost = "technogothic.net";