feat: website drv

Signed-off-by: jolheiser <john.olheiser@gmail.com>
teamcity
jolheiser 2023-09-24 01:24:10 -05:00
parent 3330862ce4
commit 68424be5cd
Signed by: jolheiser
GPG Key ID: B853ADA5DA7BBF7A
3 changed files with 40 additions and 3 deletions

View File

@ -206,7 +206,8 @@
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-py36": "nixpkgs-py36", "nixpkgs-py36": "nixpkgs-py36",
"nur": "nur", "nur": "nur",
"tclip": "tclip" "tclip": "tclip",
"website": "website"
} }
}, },
"systems": { "systems": {
@ -247,6 +248,29 @@
"repo": "tclip", "repo": "tclip",
"type": "github" "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", "root": "root",

View File

@ -28,6 +28,13 @@
url = "git+https://git.jojodev.com/jolheiser/helix.drv"; url = "git+https://git.jojodev.com/jolheiser/helix.drv";
inputs.nixpkgs.follows = "nixpkgs"; 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 # Other flakes
golink = { golink = {
@ -53,6 +60,7 @@
agenix, agenix,
jolheiser-nur, jolheiser-nur,
helix, helix,
website,
nixpkgs-py36, nixpkgs-py36,
golink, golink,
tclip, tclip,
@ -67,6 +75,7 @@
jolheiser = inputs.jolheiser-nur.packages.${prev.system}; jolheiser = inputs.jolheiser-nur.packages.${prev.system};
tclip = inputs.tclip.packages.${prev.system}.tclip; tclip = inputs.tclip.packages.${prev.system}.tclip;
jolheiser-helix = inputs.helix.packages.${prev.system}.default; jolheiser-helix = inputs.helix.packages.${prev.system}.default;
jolheiser-website = inputs.website.packages.${prev.system}.default;
}) })
golink.overlay golink.overlay
]; ];

View File

@ -1,4 +1,8 @@
{lib, ...}: let {
pkgs,
lib,
...
}: let
packages = ["tmpl" "git-age" "ffmd"]; packages = ["tmpl" "git-age" "ffmd"];
in { in {
services.caddy = { services.caddy = {
@ -23,7 +27,7 @@ in {
file_server file_server
} }
handle { handle {
root * /srv/jolheiser.com/dist root * ${pkgs.jolheiser-website}
file_server file_server
} }
''; '';