From 571f196363919c6b5dcc0c7017c432cfdfa4dc31 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Mon, 25 Jan 2021 17:24:03 -0300
Subject: Use "make public" as the primary way of building the site

---
 default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 2655a59..76994ac 100644
--- a/default.nix
+++ b/default.nix
@@ -4,6 +4,7 @@ let
   src = pkgs.nix-gitignore.gitignoreSourcePure [
     "/result*"
     "/_site/"
+    "/public/"
     "/.jekyll-cache/"
   ] ./.;
   utils-i18n = pkgs.callPackage ./nix/utils-i18n.nix { };
@@ -36,6 +37,8 @@ let
     inkscape
     imagemagick
 
+    pandoc
+    gettext
     perl
     graphviz
     nixfmt
@@ -54,11 +57,10 @@ let
     };
 in rec {
   site = drv "site" ''
-    export JEKYLL_ENV=production
-    jekyll build -d $out --trace
+    make public
+    mv public $out
   '';
   test = drv "test" ''
-    export JEKYLL_ENV=production
     make check
     touch $out
   '';
@@ -86,7 +88,7 @@ in rec {
   };
   publishScript = pkgs.writeShellScriptBin "publish.sh" ''
     set -eux
-    SERVER_URL='root@euandre.org'
+    SERVER_URL='euandre.org'
     REMOTE_PATH='/home/user-data/www/default/'
     OUT_DOCS='${site}'
     ${pkgs.openssh}/bin/ssh "$SERVER_URL" rm -rf "$REMOTE_PATH/*"
-- 
cgit v1.2.3