diff --git a/dragonwell/caddy.nix b/dragonwell/caddy.nix
index 4e642faa11708a43f455482339524f2b72b64323..3f36e5dcbbe5daf33f90a423cc2c3f5862fc07ca 100644
--- a/dragonwell/caddy.nix
+++ b/dragonwell/caddy.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 let
   modules = import ./go.nix;
 in
@@ -23,16 +23,16 @@               }
             }
           }
           handle_path /bennet* {
-            root * ${inputs.bennet.packages.${pkgs.stdenv.hostPlatform.system}.default}
+            root * ${pkgs.jolheiser.bennet}
             file_server
           }
           handle /resume* {
-            root * ${inputs.resume.packages.${pkgs.stdenv.hostPlatform.system}.default}
+            root * ${pkgs.jolheiser.resume}
             rewrite /resume /resume.pdf
             file_server
           }
           handle {
-            root * ${inputs.website.packages.${pkgs.stdenv.hostPlatform.system}.default}
+            root * ${pkgs.jolheiser.website}
             file_server
           }
         '';
@@ -40,7 +40,7 @@         serverAliases = [ "www.jolheiser.com" ];
       };
       "blog.jolheiser.com" = {
         extraConfig = ''
-          root * ${inputs.blog.packages.${pkgs.stdenv.hostPlatform.system}.default}
+          root * ${pkgs.jolheiser.blog}
           file_server
         '';
       };
@@ -108,7 +108,7 @@         	}
       '';
       "budget.jolheiser.com".extraConfig = ''
         handle_path /static/* {
-          root * ${inputs.mint.packages.${pkgs.stdenv.hostPlatform.system}.default}/lib/mint/static/
+          root * ${pkgs.jolheiser.mint}/lib/mint/static/
           file_server
         }
         reverse_proxy localhost:6468
diff --git a/dragonwell/foundry.nix b/dragonwell/foundry.nix
index 859ac0b78a11efad9b28f45c8cc30766327baaf0..69ee0066cc623bc969fd8860895a1317c1b64f3a 100644
--- a/dragonwell/foundry.nix
+++ b/dragonwell/foundry.nix
@@ -7,6 +7,6 @@     minifyStaticFiles = true;
     proxyPort = 443;
     proxySSL = true;
     upnp = false;
-    package = inputs.foundry.packages.${pkgs.stdenv.hostPlatform.system}.foundryvtt_14;
+    package = inputs.foundry.packages.${pkgs.system}.foundryvtt_14;
   };
 }
diff --git a/dragonwell/mealie.nix b/dragonwell/mealie.nix
index a5a6b94468cc818d6ecd04fc4afcfe86a8abbb45..850ac600d5e7328d4822da988cdf2adf58f94966 100644
--- a/dragonwell/mealie.nix
+++ b/dragonwell/mealie.nix
@@ -1,14 +1,8 @@
-{ pkgs, config, ... }:
+{ config, ... }:
 {
   age.secrets.mealie.file = ../secrets/mealie.age;
   services.mealie = {
     enable = true;
-    # TODO remove this hack once mealie tests work again
-    package = pkgs.mealie.override {
-      doCheck = false;
-      checkPhase = ''echo "Skipping tests for mealie"'';
-      installCheckPhase = ''echo "Skipping install tests for mealie"'';
-    };
     listenAddress = "localhost";
     port = 3663;
     settings = {
diff --git a/dragonwell/woodpecker.nix b/dragonwell/woodpecker.nix
index 88acd1ca4b738761aff970838cd22d2f87dcca26..dd813702ffaece54c35c9bd03dc8f1185bd01456 100644
--- a/dragonwell/woodpecker.nix
+++ b/dragonwell/woodpecker.nix
@@ -1,9 +1,4 @@
-{
-  inputs,
-  pkgs,
-  config,
-  ...
-}:
+{ pkgs, config, ... }:
 {
   age.secrets.woodpecker.file = ../secrets/woodpecker.age;
   services = {
@@ -12,9 +7,7 @@       enable = true;
       environment = {
         WOODPECKER_HOST = "https://cicd";
         WOODPECKER_OPEN = "true";
-        WOODPECKER_ADDON_FORGE = "${pkgs.lib.getExe
-          inputs.gitpecker.packages.${pkgs.stdenv.hostPlatform.system}.default
-        }";
+        WOODPECKER_ADDON_FORGE = "${pkgs.lib.getExe pkgs.jolheiser.gitpecker}";
         WOODPECKER_ADMIN = "jolheiser";
         WOODPECKER_SERVER_ADDR = ":2423";
 
diff --git a/flake.lock b/flake.lock
index 24274bf1faa35ad4b2ee7bb28e3c7bb129507c4d..6cb1b4f274b4961d81c5ce72ebbde51dd78b16dd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -95,6 +95,24 @@         "repo": "flake-parts",
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "forge-lines": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -133,6 +151,25 @@         "repo": "nix-foundryvtt",
         "type": "github"
       }
     },
+    "git-age": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_6"
+      },
+      "locked": {
+        "lastModified": 1699932777,
+        "narHash": "sha256-2OF5y1geNjHd+As+FwFEYlHxQoQ+LHxizlhSx9u/4dA=",
+        "ref": "refs/heads/main",
+        "rev": "72352f984f8c4b2291bcb2c08b7b6dc718619a38",
+        "revCount": 9,
+        "type": "git",
+        "url": "https://git.jolheiser.com/git-age.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.jolheiser.com/git-age.git"
+      }
+    },
     "git-hooks": {
       "inputs": {
         "flake-compat": [
@@ -160,7 +197,7 @@       }
     },
     "git-pr": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
         "lastModified": 1748659014,
@@ -200,7 +237,7 @@       }
     },
     "gitpecker": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1778680061,
@@ -218,8 +255,8 @@       }
     },
     "golink": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8",
-        "systems": "systems_2"
+        "nixpkgs": "nixpkgs_9",
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1777992933,
@@ -237,7 +274,7 @@       }
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_10"
       },
       "locked": {
         "lastModified": 1778594112,
@@ -254,7 +291,7 @@       }
     },
     "horcrux": {
       "inputs": {
-        "nixpkgs": "nixpkgs_10"
+        "nixpkgs": "nixpkgs_11"
       },
       "locked": {
         "lastModified": 1757854957,
@@ -272,7 +309,7 @@       }
     },
     "mazanoke": {
       "inputs": {
-        "nixpkgs": "nixpkgs_11"
+        "nixpkgs": "nixpkgs_12"
       },
       "locked": {
         "lastModified": 1778508921,
@@ -290,7 +327,7 @@       }
     },
     "mint": {
       "inputs": {
-        "nixpkgs": "nixpkgs_12"
+        "nixpkgs": "nixpkgs_13"
       },
       "locked": {
         "lastModified": 1769637288,
@@ -353,6 +390,22 @@       }
     },
     "nixpkgs_10": {
       "locked": {
+        "lastModified": 1777268161,
+        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_11": {
+      "locked": {
         "lastModified": 1756819007,
         "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
         "owner": "nixos",
@@ -367,7 +420,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_11": {
+    "nixpkgs_12": {
       "locked": {
         "lastModified": 1746397377,
         "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=",
@@ -383,7 +436,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_12": {
+    "nixpkgs_13": {
       "locked": {
         "lastModified": 1758446476,
         "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=",
@@ -399,7 +452,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_13": {
+    "nixpkgs_14": {
       "locked": {
         "lastModified": 1777954456,
         "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
@@ -415,7 +468,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_14": {
+    "nixpkgs_15": {
       "locked": {
         "lastModified": 1752012998,
         "narHash": "sha256-Q82Ms+FQmgOBkdoSVm+FBpuFoeUAffNerR5yVV7SgT8=",
@@ -431,7 +484,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_15": {
+    "nixpkgs_16": {
       "locked": {
         "lastModified": 1697383814,
         "narHash": "sha256-NoGJsi8R4GyQX6GHJS9lIXyrbrybqyqA8v6HVixHs5E=",
@@ -446,7 +499,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_16": {
+    "nixpkgs_17": {
       "locked": {
         "lastModified": 1748856973,
         "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=",
@@ -462,7 +515,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_17": {
+    "nixpkgs_18": {
       "locked": {
         "lastModified": 1769018530,
         "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
@@ -477,7 +530,7 @@         "ref": "nixos-unstable",
         "type": "indirect"
       }
     },
-    "nixpkgs_18": {
+    "nixpkgs_19": {
       "locked": {
         "lastModified": 1776949667,
         "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=",
@@ -493,13 +546,13 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_19": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1747060738,
-        "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=",
+        "lastModified": 1763312402,
+        "narHash": "sha256-3YJkOBrFpmcusnh7i8GXXEyh7qZG/8F5z5+717550Hk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1",
+        "rev": "85a6c4a07faa12aaccd81b36ba9bfc2bec974fa1",
         "type": "github"
       },
       "original": {
@@ -509,13 +562,13 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_20": {
       "locked": {
-        "lastModified": 1763312402,
-        "narHash": "sha256-3YJkOBrFpmcusnh7i8GXXEyh7qZG/8F5z5+717550Hk=",
+        "lastModified": 1747060738,
+        "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "85a6c4a07faa12aaccd81b36ba9bfc2bec974fa1",
+        "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1",
         "type": "github"
       },
       "original": {
@@ -525,7 +578,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_20": {
+    "nixpkgs_21": {
       "locked": {
         "lastModified": 1753399495,
         "narHash": "sha256-7XG/QBqhrYOyA2houjRTL2NMa7IKZZ/somBqr+Q/6Wo=",
@@ -541,7 +594,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_21": {
+    "nixpkgs_22": {
       "locked": {
         "lastModified": 1699343069,
         "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
@@ -607,6 +660,21 @@       }
     },
     "nixpkgs_6": {
       "locked": {
+        "lastModified": 1699923567,
+        "narHash": "sha256-oVMICs/4eZdIkbZvKs/JZe0SwrON/2d5veuwhBOrnmE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5d6c73222280b7f69109dfa5c9572f4b74c3453c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
         "lastModified": 1742800061,
         "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=",
         "owner": "NixOS",
@@ -621,7 +689,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1766410818,
         "narHash": "sha256-ruVneSx6wFy5PMw1ow3BE+znl653TJ6+eeNUj4B/9y8=",
@@ -637,7 +705,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
         "lastModified": 1773231277,
         "narHash": "sha256-Xy3WEpUAbpsz8ydgvVAQAGGB/WB+8cNA5cshiL0McTI=",
@@ -652,25 +720,9 @@         "ref": "nixpkgs-unstable",
         "type": "indirect"
       }
     },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1777268161,
-        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "oidc": {
       "inputs": {
-        "nixpkgs": "nixpkgs_14"
+        "nixpkgs": "nixpkgs_15"
       },
       "locked": {
         "lastModified": 1752529116,
@@ -688,7 +740,7 @@       }
     },
     "resume": {
       "inputs": {
-        "nixpkgs": "nixpkgs_15"
+        "nixpkgs": "nixpkgs_16"
       },
       "locked": {
         "lastModified": 1753062776,
@@ -712,6 +764,7 @@         "blog": "blog",
         "cfg-playground": "cfg-playground",
         "forge-lines": "forge-lines",
         "foundry": "foundry",
+        "git-age": "git-age",
         "git-pr": "git-pr",
         "gitpecker": "gitpecker",
         "golink": "golink",
@@ -720,7 +773,7 @@         "horcrux": "horcrux",
         "mazanoke": "mazanoke",
         "mint": "mint",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_13",
+        "nixpkgs": "nixpkgs_14",
         "oidc": "oidc",
         "resume": "resume",
         "tailproxy": "tailproxy",
@@ -774,9 +827,24 @@         "repo": "default",
         "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"
+      }
+    },
     "tailproxy": {
       "inputs": {
-        "nixpkgs": "nixpkgs_16"
+        "nixpkgs": "nixpkgs_17"
       },
       "locked": {
         "lastModified": 1755099374,
@@ -836,7 +904,7 @@       }
     },
     "tailwind-ctp-lsp_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_21"
+        "nixpkgs": "nixpkgs_22"
       },
       "locked": {
         "lastModified": 1699401590,
@@ -854,7 +922,7 @@       }
     },
     "tailwind-ctp_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_20"
+        "nixpkgs": "nixpkgs_21"
       },
       "locked": {
         "lastModified": 1753803577,
@@ -872,7 +940,7 @@       }
     },
     "tclip": {
       "inputs": {
-        "nixpkgs": "nixpkgs_17",
+        "nixpkgs": "nixpkgs_18",
         "utils": "utils"
       },
       "locked": {
@@ -891,7 +959,7 @@       }
     },
     "ugit": {
       "inputs": {
-        "nixpkgs": "nixpkgs_18",
+        "nixpkgs": "nixpkgs_19",
         "tailwind-ctp": "tailwind-ctp",
         "tailwind-ctp-lsp": "tailwind-ctp-lsp"
       },
@@ -911,7 +979,7 @@       }
     },
     "utils": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -929,7 +997,7 @@       }
     },
     "website": {
       "inputs": {
-        "nixpkgs": "nixpkgs_19",
+        "nixpkgs": "nixpkgs_20",
         "tailwind-ctp": "tailwind-ctp_2",
         "tailwind-ctp-lsp": "tailwind-ctp-lsp_2"
       },
diff --git a/flake.nix b/flake.nix
index 52460a77f4888500dc58584974acfafb0e873af3..421cbf84ea65e9b0e6368a0c64c792933db27d5d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,7 @@     website.url = "git+https://git.jolheiser.com/jolheiser.com.git";
     resume.url = "git+https://git.jolheiser.com/resume.git";
     blog.url = "git+https://git.jolheiser.com/blog.git";
     bennet.url = "git+https://git.jolheiser.com/bennet.git";
+    git-age.url = "git+https://git.jolheiser.com/git-age.git";
     cfg-playground.url = "git+https://git.jolheiser.com/cfg-playground.git";
     ugit.url = "git+https://git.jolheiser.com/ugit.git";
     git-pr.url = "git+https://git.jolheiser.com/git-pr-nix.git";
@@ -40,13 +41,37 @@       agenix,
       ...
     }@inputs:
     let
+      overlays = [
+        (_: prev: {
+          jolheiser = {
+            website = inputs.website.packages.${prev.system}.default;
+            resume = inputs.resume.packages.${prev.system}.default;
+            git-age = inputs.git-age.packages.${prev.system}.default;
+            blog = inputs.blog.packages.${prev.system}.default;
+            bennet = inputs.bennet.packages.${prev.system}.default;
+            mint = inputs.mint.packages.${prev.system}.default;
+            gitpecker = inputs.gitpecker.packages.${prev.system}.default;
+          };
+          tclip = inputs.tclip.packages.${prev.system}.tclip;
+          templ = inputs.templ.packages.${prev.system}.templ;
+        })
+        inputs.golink.overlays.default
+        # TODO remove this hack once mealie tests work again
+        (_: prev: {
+          mealie = prev.mealie.overrideAttrs (_: {
+            doCheck = false;
+            checkPhase = ''echo "Skipping tests for mealie"'';
+            installCheckPhase = ''echo "Skipping install tests for mealie"'';
+          });
+        })
+      ];
       system = "x86_64-linux";
       pkgs = import inputs.nixpkgs { inherit system; };
     in
     {
       colmena = {
         meta = {
-          nixpkgs = import nixpkgs { inherit system; };
+          nixpkgs = import nixpkgs { inherit overlays system; };
           specialArgs = {
             inherit inputs;
           };
@@ -86,7 +111,7 @@               inputs.oidc.nixosModules.default
               ./modules/tclip
               ./shincha
             ];
-            services.tclip.package = inputs.tclip.packages.${pkgs.stdenv.hostPlatform.system}.tclipd;
+            services.tclip.package = inputs.tclip.packages.${pkgs.system}.tclipd;
           };
         peach.imports = [
           inputs.agenix.nixosModules.default