diff options
| -rw-r--r-- | nixos/utils.nix | 27 | ||||
| -rw-r--r-- | public/template.nix | 3 |
2 files changed, 16 insertions, 14 deletions
diff --git a/nixos/utils.nix b/nixos/utils.nix index e1a339a..704dd56 100644 --- a/nixos/utils.nix +++ b/nixos/utils.nix @@ -58,22 +58,23 @@ in rec { exit 1 ''; }); - orgMkDocs = title: baseTask.overrideAttrs (baseAttrs: { - name = "${baseAttrs.name}-docs"; - buildInputs = [pkgs.pandoc pkgs.mkdocs]; - buildPhase = '' - # Convert from org-mode to markdown with pandoc - find docs/ -type f -name '*.org' -print0 | xargs -0 -I{} pandoc -o {}.md {}.org + orgMkDocs = title: + baseTask.overrideAttrs (baseAttrs: { + name = "${baseAttrs.name}-docs"; + buildInputs = [ pkgs.pandoc pkgs.mkdocs ]; + buildPhase = '' + # Convert from org-mode to markdown with pandoc + find docs/ -type f -name '*.org' -print0 | xargs -0 -I{} pandoc -o {}.md {}.org - # Give the generated markdown files to MkDocs - mkdocs build + # Give the generated markdown files to MkDocs + mkdocs build - # Build remaining one-off files - pandoc README.org -o site/index.html --css docs/README.css --to=html5 --self-contained --metadata title="${title}" + # Build remaining one-off files + pandoc README.org -o site/index.html --css docs/README.css --to=html5 --self-contained --metadata title="${title}" - mv site/ $out/ - ''; - }); + mv site/ $out/ + ''; + }); test = testDerivations: baseTask.overrideAttrs (baseAttrs: { name = "${baseAttrs.name}-test"; diff --git a/public/template.nix b/public/template.nix index 263a69d..b0da84f 100644 --- a/public/template.nix +++ b/public/template.nix @@ -1,5 +1,6 @@ { hostName = "$host_name"; luksDevice = "$device"; - passwordFile = "/home/andreh/dev/libre/dotfiles/encrypted/$host_name/password-hash.txt"; + passwordFile = + "/home/andreh/dev/libre/dotfiles/encrypted/$host_name/password-hash.txt"; } |