1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

diff --git a/flake.lock b/flake.lock
index caed64fb06ded0aefadf768fe4944ef4d91d5b74..2defcc6683bc4cbfa3115f156950cb219437607e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -206,7 +206,8 @@         "jolheiser-nur": "jolheiser-nur",
         "nixpkgs": "nixpkgs",
         "nixpkgs-py36": "nixpkgs-py36",
         "nur": "nur",
-        "tclip": "tclip"
+        "tclip": "tclip",
+        "website": "website"
       }
     },
     "systems": {
@@ -246,6 +247,29 @@       "original": {
         "owner": "tailscale-dev",
         "repo": "tclip",
         "type": "github"
+      }
+    },
+    "website": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1695536112,
+        "narHash": "sha256-JjK9NnrTtSXtN5FkLoEe/M5pzShwpwYOHkUQ2horf2U=",
+        "ref": "refs/heads/main",
+        "rev": "789d6e79164d617ebdcab3de53fc79457025edcc",
+        "revCount": 6,
+        "type": "git",
+        "url": "https://git.jojodev.com/jolheiser/jolheiser.com"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.jojodev.com/jolheiser/jolheiser.com"
       }
     }
   },

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

diff --git a/flake.nix b/flake.nix
index 914093eec477016ed2618df3ecc219e864272784..08ab5eeae5ada198a20b0313cafc06e31bd36782 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,6 +28,13 @@     helix = {
       url = "git+https://git.jojodev.com/jolheiser/helix.drv";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    website = {
+      url = "git+https://git.jojodev.com/jolheiser/jolheiser.com";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
+    };
 
     # Other flakes
     golink = {
@@ -53,6 +60,7 @@     home-manager,
     agenix,
     jolheiser-nur,
     helix,
+    website,
     nixpkgs-py36,
     golink,
     tclip,
@@ -67,6 +75,7 @@         };
         jolheiser = inputs.jolheiser-nur.packages.${prev.system};
         tclip = inputs.tclip.packages.${prev.system}.tclip;
         jolheiser-helix = inputs.helix.packages.${prev.system}.default;
+        jolheiser-website = inputs.website.packages.${prev.system}.default;
       })
       golink.overlay
     ];

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23

diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix
index 1cb602eb562d9adbb8de0025115efb518c1c86a5..8a73b15ee8474d949a1da28f68e7b6cd6cf13061 100644
--- a/machines/dragonwell/caddy.nix
+++ b/machines/dragonwell/caddy.nix
@@ -1,4 +1,8 @@
-{lib, ...}: let
+{
+  pkgs,
+  lib,
+  ...
+}: let
   packages = ["tmpl" "git-age" "ffmd"];
 in {
   services.caddy = {
@@ -23,7 +27,7 @@             root * /srv/bennet/src
             file_server
           }
           handle {
-            root * /srv/jolheiser.com/dist
+            root * ${pkgs.jolheiser-website}
             file_server
           }
         '';