From 68424be5cdf2b84c100d9849ab18b07d2a9df97f Mon Sep 17 00:00:00 2001 From: jolheiser Date: Sun, 24 Sep 2023 01:24:10 -0500 Subject: [PATCH] feat: website drv Signed-off-by: jolheiser --- flake.lock | 26 +++++++++++++++++++++++++- flake.nix | 9 +++++++++ machines/dragonwell/caddy.nix | 8 ++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index caed64f..2defcc6 100644 --- a/flake.lock +++ b/flake.lock @@ -206,7 +206,8 @@ "nixpkgs": "nixpkgs", "nixpkgs-py36": "nixpkgs-py36", "nur": "nur", - "tclip": "tclip" + "tclip": "tclip", + "website": "website" } }, "systems": { @@ -247,6 +248,29 @@ "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 914093e..08ab5ee 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,13 @@ 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 @@ 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 ]; diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index 1cb602e..8a73b15 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 @@ in { file_server } handle { - root * /srv/jolheiser.com/dist + root * ${pkgs.jolheiser-website} file_server } '';