unstable zola
This commit is contained in:
parent
b37fdc00d8
commit
140b1e0e5e
3 changed files with 27 additions and 4 deletions
17
flake.lock
generated
17
flake.lock
generated
|
|
@ -69,6 +69,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1777270315,
|
||||
"narHash": "sha256-yKB4G6cKsQsWN7M6rZGk6gkJPDNPIzT05y4qzRyCDlI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6368eda62c9775c38ef7f714b2555a741c20c72d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1777077449,
|
||||
|
|
@ -89,6 +105,7 @@
|
|||
"inputs": {
|
||||
"guestbook": "guestbook",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"sops-nix": "sops-nix"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -10,10 +11,10 @@
|
|||
guestbook.url = "git+https://git.ily.rs/lew/guestbook";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, sops-nix, guestbook, ... }: {
|
||||
outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, guestbook, ... }: {
|
||||
nixosConfigurations.lab = nixpkgs.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
specialArgs = { inherit guestbook; };
|
||||
specialArgs = { inherit guestbook nixpkgs-unstable; };
|
||||
modules = [
|
||||
sops-nix.nixosModules.sops
|
||||
guestbook.nixosModules.default
|
||||
|
|
|
|||
|
|
@ -30,7 +30,10 @@
|
|||
# Forgejo repo -> settings -> Webhooks -> Add webhook
|
||||
# - preview webhook: http://localhost:4323/hooks/${name}-preview-rebuild
|
||||
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, nixpkgs-unstable, ... }:
|
||||
let
|
||||
unstable = import nixpkgs-unstable { inherit (pkgs) system; };
|
||||
in
|
||||
{
|
||||
services.site.website = {
|
||||
enable = true;
|
||||
|
|
@ -42,7 +45,9 @@
|
|||
buildOutputDir = "public";
|
||||
installCommand = "";
|
||||
buildCommand = "zola build";
|
||||
extraBuildPackages = [ pkgs.zola ];
|
||||
# 25.11 ships zola 0.21.0; the new [markdown.highlighting] section
|
||||
# (light_theme/dark_theme/extra_themes) needs 0.22+. Pull from unstable.
|
||||
extraBuildPackages = [ unstable.zola ];
|
||||
caddyConfig = ''
|
||||
root * /srv/website/repo/public
|
||||
encode zstd gzip
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue