diff --git a/config/hosts/daiyousei.nix b/config/hosts/daiyousei.nix
index 84fe0ef7..49312527 100644
--- a/config/hosts/daiyousei.nix
+++ b/config/hosts/daiyousei.nix
@@ -45,14 +45,5 @@
     address = "206:d807:a98:309f:3bc0:de7a:411d:9d95";
   };
 
-  services.nginx.virtualHosts =
-    let
-      splashy = pkgs.host-splash-site config.networking.hostName;
-    in
-    kw.virtualHostGen {
-      networkFilter = [ "public" ];
-      block.locations."/" = { root = splashy; };
-    };
-
   system.stateVersion = "21.11";
 }
diff --git a/config/services/synapse.nix b/config/services/synapse.nix
index 8e37baf3..1157e85e 100644
--- a/config/services/synapse.nix
+++ b/config/services/synapse.nix
@@ -225,7 +225,7 @@ CONFIG = {
     enable = true;
     settings = {
       homeserver = {
-        address = "http://localhost:8008";
+        address = "https://kittywit.ch";
         domain = config.network.dns.domain;
       };
       appservice = {
diff --git a/config/services/website.nix b/config/services/website.nix
index 9fd4b7b9..11769ebb 100644
--- a/config/services/website.nix
+++ b/config/services/website.nix
@@ -5,7 +5,7 @@
 
   services.nginx.virtualHosts = {
     "${config.network.dns.domain}" = {
-      root = pkgs.kittywitch-site;
+      root = pkgs.kat-hugosite;
       enableACME = true;
       forceSSL = true;
     };
diff --git a/config/users/kat/dev/packages.nix b/config/users/kat/dev/packages.nix
index 058d6801..08f316b7 100644
--- a/config/users/kat/dev/packages.nix
+++ b/config/users/kat/dev/packages.nix
@@ -8,5 +8,6 @@
     nixpkgs-fmt
     pandoc
     apache-directory-studio
+    hugo
   ];
 }
diff --git a/overlays/kat-hugosite/default.nix b/overlays/kat-hugosite/default.nix
new file mode 100644
index 00000000..df3dbada
--- /dev/null
+++ b/overlays/kat-hugosite/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchFromGitHub, hugo, lib }: stdenv.mkDerivation rec {
+  name = "kat-hugosite";
+  src = fetchFromGitHub {
+    owner = "kittywitch";
+    repo = "hugosite";
+    rev = "20d0b6cfa15956d8f411104291f5e47995b433d8";
+    sha256 = "sha256-su3ey8FwTYyR1XP/hqsnsfh21JmSYO16wLRNIJx3zKs=";
+  };
+  buildPhase = ''
+    ${hugo}/bin/hugo
+  '';
+  installPhase = ''
+    mkdir $out
+    cp -r public/* $out
+  '';
+}
diff --git a/overlays/local.nix b/overlays/local.nix
index 115eff67..f27796fd 100644
--- a/overlays/local.nix
+++ b/overlays/local.nix
@@ -1,3 +1,5 @@
 final: prev: {
   vips = prev.vips.override { libjxl = null; };
+
+  kat-hugosite = final.callPackage ./kat-hugosite {};
 }