diff --git a/.git-age.yaml b/.git-age.yaml
index 997548f4caea9807dcbfa36287098cdc6dd2bdab..9b0fe6bdd0fe13f422bf9b0f2972953795d1d4aa 100644
--- a/.git-age.yaml
+++ b/.git-age.yaml
@@ -4,3 +4,5 @@ machines/common/cifs.nix:
     - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7
 machines/dragonwell/dex.nix:
     - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7
+machines/dragonwell/vikunja.nix:
+    - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7

diff --git a/.gitattributes b/.gitattributes
index bbc97fa42c1f6d7afaf88e58bfdb63e79ac49ab2..7fa6de1b9f3b5f9a6108d6fe6649e43d5588b5f6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,3 +2,4 @@ # Age
 apps/gui/firefox/work.nix filter=git-age diff=git-age
 machines/common/cifs.nix filter=git-age diff=git-age
 machines/dragonwell/dex.nix filter=git-age diff=git-age
+machines/dragonwell/vikunja.nix filter=git-age diff=git-age

diff --git a/flake.lock b/flake.lock
index bddb210bc932bc7642dc1e8487cd54c11087030e..635e8f27475701628197e6a77ed9192425c940fd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -281,13 +281,13 @@       }
     },
     "nixpkgs": {
       "locked": {
+        "lastModified": 1696426674,
 {
-        ]
-        "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=",
+        "narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-      "locked": {
   "nodes": {
+        "repo": "flake-utils",
         "type": "github"
       },
       "original": {

diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix
index 5169210a8785e39d2131179a12145e1e83957ab3..51099aece410b9d49f480c7ce08205df6238ef0f 100644
--- a/machines/dragonwell/caddy.nix
+++ b/machines/dragonwell/caddy.nix
@@ -1,3 +1,8 @@
+{
+  pkgs,
+  config,
+  ...
+      "jolheiser.com" = {
 {pkgs, ...}: {
   services.caddy = {
     enable = true;
@@ -43,26 +48,24 @@             Redirecting to <a href="https://pkg.go.dev/go.jolheiser.com{uri}">https://pkg.go.dev/go.jolheiser.com{uri}</a>
             </body></html>`
         '';
       };
-      "git.jolheiser.com" = {
+      "git.jolheiser.com".extraConfig = ''
-        extraConfig = ''
+      "jolheiser.com" = {
     enable = true;
-            respond ${builtins.toJSON {
-        '';
+      '';
-      };
-      "social.jolheiser.com" = {
+      "social.jolheiser.com".extraConfig = ''
+      "jolheiser.com" = {
         extraConfig = ''
+      "jolheiser.com" = {
     virtualHosts = {
-{pkgs, ...}: {
-  services.caddy = {
+      "jolheiser.com" = {
           handle_path /.well-known/webfinger {
-      };
+        reverse_proxy localhost:2884
+      "jolheiser.com" = {
     virtualHosts = {
-  services.caddy = {
+      "todo.jolheiser.com".extraConfig = ''
         extraConfig = ''
+      "jolheiser.com" = {
     virtualHosts = {
-    enable = true;
-        '';
-      };
     };
   };
 }

diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index dc6edda73bf53169d7415c76a360d0fbcf5eb0d5..7c2af48a8e5bfe7a2f29d8f37e2880ba42c9cd44 100644
--- a/machines/dragonwell/default.nix
+++ b/machines/dragonwell/default.nix
@@ -2,7 +2,7 @@ let
   username = "jolheiser";
   key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser'';
 in {
-  imports = [./caddy.nix ./dex.nix ./golink.nix ./gotosocial.nix ./restic.nix ./ugit.nix ./hardware.nix];
+  imports = [./caddy.nix ./dex.nix ./golink.nix ./gotosocial.nix ./restic.nix ./ugit.nix ./vikunja.nix ./hardware.nix];
 
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;

diff --git a/machines/dragonwell/dex.nix b/machines/dragonwell/dex.nix
index ba6524a7fa1418551becac90d64c2a913f9a093f..b9c6209bc958c465b256731a0dd1d9a8de6b70e6 100644
Binary files a/machines/dragonwell/dex.nix and b/machines/dragonwell/dex.nix differ

diff --git a/machines/dragonwell/vikunja.nix b/machines/dragonwell/vikunja.nix
new file mode 100644
index 0000000000000000000000000000000000000000..045a5210fb7f4d097343c5398dd483fa21c984b5
Binary files /dev/null and b/machines/dragonwell/vikunja.nix differ

diff --git a/secrets/personal/dex-vikunja.age b/secrets/personal/dex-vikunja.age
new file mode 100644
index 0000000000000000000000000000000000000000..f75958233664861cecf08fcbd7dd78b7bc7f841b
Binary files /dev/null and b/secrets/personal/dex-vikunja.age differ

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 01c1bd64a8e5669c5b3c59f806ddf24a8d8e2ac3..de8302de02f7be589c7be107111c746761cd9564 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -26,4 +26,5 @@   "personal/restic-pass.age".publicKeys = [jolheiser dragonwell];
   "personal/restic-repo.age".publicKeys = [jolheiser dragonwell];
   "personal/dex.age".publicKeys = [jolheiser dragonwell];
   "personal/dex-tailscale.age".publicKeys = [jolheiser dragonwell];
+  "personal/dex-vikunja.age".publicKeys = [jolheiser dragonwell];
 }