From e7984efc49085acd859efc4600aae56e5f5c3be4 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Thu, 11 Jul 2024 22:24:41 -0500 Subject: [PATCH] feat: blog Signed-off-by: jolheiser --- flake.lock | 24 ++++++++++++++++++++++++ flake.nix | 8 ++++++++ machines/dragonwell/caddy.nix | 6 ++++++ 3 files changed, 38 insertions(+) diff --git a/flake.lock b/flake.lock index 6a32e3c..33e608a 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,29 @@ "type": "github" } }, + "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": [ @@ -457,6 +480,7 @@ "root": { "inputs": { "agenix": "agenix", + "blog": "blog", "cfg": "cfg", "dagger": "dagger", "flake-utils": "flake-utils", diff --git a/flake.nix b/flake.nix index 9841309..e9d3782 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,13 @@ flake-utils.follows = "flake-utils"; }; }; + blog = { + url = "git+https://git.jolheiser.com/blog.git"; + inputs = { + nixpkgs.follows = "nixpkgs"; + templ.follows = "templ"; + }; + }; git-age = { url = "git+https://git.jolheiser.com/git-age.git"; inputs = { @@ -125,6 +132,7 @@ 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; }; tclip = inputs.tclip.packages.${prev.system}.tclip; templ = inputs.templ.packages.${prev.system}.templ; diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index 768c75d..a91d0d6 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -34,6 +34,12 @@ in { ''; serverAliases = ["www.jolheiser.com"]; }; + "blog.jolheiser.com" = { + extraConfig = '' + root * ${pkgs.jolheiser.blog} + file_server + ''; + }; "go.jolheiser.com" = { extraConfig = '' header Content-Type text/html