diff --git a/.envrc b/.envrc
index 0f94eed..2cefe8a 100644
--- a/.envrc
+++ b/.envrc
@@ -1,2 +1,2 @@
 # shellcheck shell=bash
-use flake
+use flake . --builders ""
diff --git a/machines/moritz-desktop/configuration.nix b/machines/moritz-desktop/configuration.nix
index d7cb2b0..51c2cbe 100644
--- a/machines/moritz-desktop/configuration.nix
+++ b/machines/moritz-desktop/configuration.nix
@@ -45,6 +45,24 @@
 
   networking.firewall.allowedTCPPorts = [9090];
 
+  # TODO: make this its own module!
+  home-manager.users.moritz.programs.jujutsu = {
+    enable = true;
+    settings = {
+      user = {
+        email = "mail@moritzboeh.me";
+        name = "Moritz Böhme";
+      };
+      ui.paginate = "never";
+      signing = {
+        behavior = "drop";
+        backend = "gpg";
+        key = "0x970C6E89EB0547A9";
+      };
+      git.sign-on-push = true;
+    };
+  };
+
   home-manager.users.moritz.services.kanshi.settings = [
     {
       profile.name = "default";
diff --git a/machines/moritz-server/website/root/config.toml b/machines/moritz-server/website/root/config.toml
index d7d05a2..cd3df49 100644
--- a/machines/moritz-server/website/root/config.toml
+++ b/machines/moritz-server/website/root/config.toml
@@ -9,11 +9,14 @@ description = "Stay a while :)"
 compile_sass = true
 
 # Whether to build a search index to be used later on by a JavaScript library
-build_search_index = true
+build_search_index = false # NOTE: enable this when adding a search script
 
 # The site theme to use.
 theme = "anemone"
 
+# When set to "true", a feed is automatically generated.
+generate_feeds = false
+
 [markdown]
 # Whether to do syntax highlighting
 # Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola
diff --git a/machines/moritz-server/website/root/content/_index.md b/machines/moritz-server/website/root/content/_index.md
index c95e864..86ffefa 100644
--- a/machines/moritz-server/website/root/content/_index.md
+++ b/machines/moritz-server/website/root/content/_index.md
@@ -1,3 +1,7 @@
 +++
 +++
-Hello World!
+
+# Links
+- {{ mastodon_root(text="mastodon") }}
+- [git](https://git.moritzboeh.me/)
+- [mail](mailto:contact@moritz.place)
diff --git a/machines/moritz-server/website/root/default.nix b/machines/moritz-server/website/root/default.nix
index ee987fb..e87e930 100644
--- a/machines/moritz-server/website/root/default.nix
+++ b/machines/moritz-server/website/root/default.nix
@@ -22,5 +22,16 @@
     installPhase = "cp -r public $out";
   };
 in {
-  services.nginx.virtualHosts."moritz.place".locations."/".root = "${package}";
+  services.nginx.virtualHosts."moritz.place".root = "${package}";
+  services.nginx.virtualHosts."moritz.place".locations."/" = {
+    index = "index.html";
+    tryFiles = ''"''${uri}.html" $uri $uri/ =404'';
+  };
+  services.nginx.virtualHosts."moritz.place".extraConfig = ''
+    error_page 404 /404.html;
+
+    location = /404.html {
+        internal;
+    }
+  '';
 }
diff --git a/machines/moritz-server/website/root/templates/robots.txt b/machines/moritz-server/website/root/templates/robots.txt
new file mode 100644
index 0000000..34d4b42
--- /dev/null
+++ b/machines/moritz-server/website/root/templates/robots.txt
@@ -0,0 +1,5 @@
+User-agent: *
+Allow: /$
+Allow: /{{ get_url(path="sitemap.xml") }}
+Disallow: /
+Sitemap: {{ get_url(path="sitemap.xml") }}
diff --git a/machines/moritz-server/website/root/templates/shortcodes/mastodon_footer.html b/machines/moritz-server/website/root/templates/shortcodes/mastodon_footer.html
new file mode 100644
index 0000000..81498cb
--- /dev/null
+++ b/machines/moritz-server/website/root/templates/shortcodes/mastodon_footer.html
@@ -0,0 +1 @@
+<meta name="fediverse:creator" content="@moritz@functional.cafe">
diff --git a/machines/moritz-server/website/root/templates/shortcodes/mastodon_root.html b/machines/moritz-server/website/root/templates/shortcodes/mastodon_root.html
new file mode 100644
index 0000000..e3d777b
--- /dev/null
+++ b/machines/moritz-server/website/root/templates/shortcodes/mastodon_root.html
@@ -0,0 +1 @@
+<a rel="me" href="https://functional.cafe/@moritz">{{ text | safe }}</a>
diff --git a/modules/moritz/programs/firefox.nix b/modules/moritz/programs/firefox.nix
index 48cddce..4944675 100644
--- a/modules/moritz/programs/firefox.nix
+++ b/modules/moritz/programs/firefox.nix
@@ -65,7 +65,6 @@ in {
         '';
         extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
           darkreader
-          firefox-color
           istilldontcareaboutcookies
           kagi-search
           keepassxc-browser
diff --git a/modules/moritz/programs/lazygit.nix b/modules/moritz/programs/lazygit.nix
index f06c97e..81fdaed 100644
--- a/modules/moritz/programs/lazygit.nix
+++ b/modules/moritz/programs/lazygit.nix
@@ -137,6 +137,9 @@ in {
             loadingText = "Creating conventional commit...";
           }
         ];
+        git = {
+          overrideGpg = true;
+        };
       };
     };
   };
diff --git a/modules/moritz/programs/nix.nix b/modules/moritz/programs/nix.nix
index 73a83bf..d00dfd1 100644
--- a/modules/moritz/programs/nix.nix
+++ b/modules/moritz/programs/nix.nix
@@ -30,7 +30,7 @@ in {
     nix = {
       nixPath = ["nixpkgs=${inputs.nixpkgs}"];
 
-      package = pkgs.lix;
+      package = pkgs.nix; # TODO: change this back
 
       extraOptions = ''
         experimental-features = nix-command flakes