flake.lock

@@ -23,49 +23,6 @@
         "type": "github"
       }
     },
-    "bennet": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1720757073,
-        "narHash": "sha256-URQMDzLPs5kckDybkMqrKZN2aqt0GvAt9V5NT4kpMW8=",
-        "ref": "refs/heads/main",
-        "rev": "bd7287aa0d13d5af400f659963655c004789715f",
-        "revCount": 4,
-        "type": "git",
-        "url": "https://git.jolheiser.com/bennet.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.jolheiser.com/bennet.git"
-      }
-    },
-    "blog": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "templ": [
-          "templ"
-        ]
-      },
-      "locked": {
-        "lastModified": 1720561582,
-        "narHash": "sha256-5Gb9GwPgOfXOOp48eKcn3kmqa8+jFZDVzzzzMT+J3/Y=",
-        "ref": "refs/heads/main",
-        "rev": "3803d94c98e58577f9794073bc44d126123fb303",
-        "revCount": 24,
-        "type": "git",
-        "url": "https://git.jolheiser.com/blog.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.jolheiser.com/blog.git"
-      }
-    },
     "cfg": {
       "inputs": {
         "nixpkgs": [
@@ -500,8 +457,6 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "bennet": "bennet",
-        "blog": "blog",
         "cfg": "cfg",
         "dagger": "dagger",
         "flake-utils": "flake-utils",

flake.nix

@@ -43,17 +43,6 @@
         flake-utils.follows = "flake-utils";
       };
     };
-    blog = {
-      url = "git+https://git.jolheiser.com/blog.git";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        templ.follows = "templ";
-      };
-    };
-    bennet = {
-      url = "git+https://git.jolheiser.com/bennet.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     git-age = {
       url = "git+https://git.jolheiser.com/git-age.git";
       inputs = {
@@ -136,8 +125,6 @@
           tmpl = inputs.tmpl.packages.${prev.system}.default;
           gomodinit = inputs.gomodinit.packages.${prev.system}.default;
           cfg = inputs.cfg.packages.${prev.system}.default;
-          blog = inputs.blog.packages.${prev.system}.default;
-          bennet = inputs.bennet.packages.${prev.system}.default;
         };
         tclip = inputs.tclip.packages.${prev.system}.tclip;
         templ = inputs.templ.packages.${prev.system}.templ;

machines/dragonwell/caddy.nix

@@ -19,7 +19,7 @@ in {
           }}
           }
           handle_path /bennet* {
-            root * ${pkgs.jolheiser.bennet}
+            root * /srv/bennet/src
             file_server
           }
           handle /resume* {
@@ -34,12 +34,6 @@ in {
         '';
         serverAliases = ["www.jolheiser.com"];
       };
-      "blog.jolheiser.com" = {
-        extraConfig = ''
-          root * ${pkgs.jolheiser.blog}
-          file_server
-        '';
-      };
       "go.jolheiser.com" = {
         extraConfig = ''
           header Content-Type text/html