From a392b45c42eec65b52fe747aba651b909a8a459e Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Mon, 17 May 2021 04:23:57 +0300 Subject: [PATCH] stuff --- .gitlab-ci.yml | 1 + flake.nix | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1dd3251..de176b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ pages: script: - nix build -L --show-trace - mkdir public && cp -Hr result/* public + - tree public artifacts: paths: - public diff --git a/flake.nix b/flake.nix index ea446ab..6d6e0d7 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; - inherit (pkgs.lib) mapAttrsRecursive hasSuffix last; + inherit (pkgs.lib) mapAttrsRecursive hasSuffix last pipe; lib = htmlNix.lib.${system}; ownTemplater = context: context // { @@ -34,7 +34,7 @@ }; }; header = with lib.tags; div { class = "botheader"; } - (a { class = "botheader"; href = "https://github.com/yusdacra/html.nix"; } "made with Nix in html.nix"); + (a { href = "https://github.com/yusdacra/html.nix"; } "made with Nix in html.nix"); in ( mapAttrsRecursive @@ -43,7 +43,7 @@ context.site ) // { "site.css" = "${context.site."site.css"}\n${headerStyle}"; }; }; - site = local: lib.pkgsLib.mkSiteFrom { inherit local; src = ./.; templater = context: ownTemplater (lib.templaters.basic context); }; + site = local: lib.pkgsLib.mkSiteFrom { inherit local; src = ./.; templater = context: pipe context [ lib.templaters.basic ownTemplater ]; }; in rec { apps = {