dotnix @main -
refs -
log -
-
https://git.jolheiser.com/dotnix.git
My nix dotfiles
feat: website drv
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmUP1goACgkQuFOtpdp7
v3oTxQ//aMHSx1q2VDQ3Xk5Owv+P2KyQTVJfgWj7N5jYy4aCmNruXNYSltXiOtyF
aw4ZGKzgwWXjXI1Kbgc0hbV8OuWIQRUVZXD+pVktRqSRCpICeja283L+BjHNulm7
Q7+MH7XmaFyo/8ixtHGKZlaOxODZe76YX7pQpxeaVLdonjHYZmf4J7yUVIP8v66j
IGpi2/IjT5kQiM/RHNvO0zBkFHMnyh6NxRFp6N79KYXRP1pg17hqaB7XrS2wR53V
4a4COgP3uki+FerAfWeX2RfU9j5nvWjoX0drbfxK02n3GmNd1SfpQZVZpJfOGtZL
dnweimaEeB0c1Ffa9bPGLO0tt5fzwisZcHzIp4GN+O+5XgYdQk5X8yvtLMJ6kj9L
WmYnnbOcm1bwoUa1KR0oB3DARi69lVw8wH/gL5kzdo/seR/ZT2n2hX4uacKri+qc
0aLB4Wv24EaU2amKXjWruv2QPhSthc2US8fsi1hqqcU5JFxJDjUtGHS3uYubVFc5
AowMAlh2ieTqA+obudluBjxIiXWqJcy5LROr2whxuoGarzDhMa57Ek7Y2LvIuATn
HrHbh9qPXMjJpdQbhtg7isI4jC03DCW1ZcMcKhlZPerW+bM8QNfRxpuY1k/b74lT
qVbZtzk8VuL4KLDl+IYoaoO82Jw8Cgpji/Oipw2mO1qr8o/XKq0=
=cqve
-----END PGP SIGNATURE-----
3 changed files, 40 additions(+), 3 deletions(-)
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",
+ "locked": {
"nodes": {
}
},
@@ -247,6 +248,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"
}
}
},
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
];
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,8 +27,8 @@ root * /srv/bennet/src
file_server
}
handle {
- packages = ["tmpl" "git-age" "ffmd"];
enable = true;
+{lib, ...}: let
file_server
}
'';