From 6da2a6bc69a99aee496a650c6ca7168c9ccd3574 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Thu, 31 Dec 2020 03:35:47 +0100
Subject: [PATCH] Put home page into overlay

---
 default.nix               |  1 +
 hosts/surgat/default.nix  |  5 +++++
 modules/homepage.nix      |  9 ++-------
 pkgs/homePage/default.nix | 19 +++++++++++++++++++
 4 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/homePage/default.nix

diff --git a/default.nix b/default.nix
index d46a81a..f565f36 100644
--- a/default.nix
+++ b/default.nix
@@ -14,4 +14,5 @@ rec {
 
   tubslatex = callPackage ./pkgs/tubslatex {};
   keys = callPackage ./pkgs/keys {};
+  homePage = callPackage ./pkgs/homePage {};
 }
diff --git a/hosts/surgat/default.nix b/hosts/surgat/default.nix
index 2d49ec6..f9eb077 100644
--- a/hosts/surgat/default.nix
+++ b/hosts/surgat/default.nix
@@ -3,9 +3,14 @@ let
   hostName = "surgat";
   this = import ../.. {};
   keys = ../../pkgs/keys/keys;
+  homePage = self: super: { homePage = super.callPackage ../../pkgs/homePage {}; };
 in {
   imports = [ this.profiles.base ];
 
+  nixpkgs.overlays = [
+    homePage
+  ];
+
   networking.hostName = hostName;
 
   dadada.admin = {
diff --git a/modules/homepage.nix b/modules/homepage.nix
index aa8dfed..94468ba 100644
--- a/modules/homepage.nix
+++ b/modules/homepage.nix
@@ -1,13 +1,8 @@
 { config, pkgs, lib, ... }:
 
-with lib;
 let
   cfg = config.dadada.homePage;
-  homePage = import (builtins.fetchTarball {
-    url = "https://github.com/dadada/dadada.li/archive/c77ffc04882f32c2feced7d0f2d8ce3622060230.tar.gz";
-      sha256 = "1b48m13yjmw7bpm1jikydv8janys07l6l37yhs1znnj4ygl4hz1d";
-  });
-in {
+in with lib; {
   options.dadada.homePage = {
     enable = mkEnableOption "Enable home page";
   };
@@ -17,7 +12,7 @@ in {
     services.nginx.virtualHosts."dadada.li" = {
       enableACME = true;
       forceSSL = true;
-      root = pkgs.callPackage homePage {};
+      root = pkgs.homePage;
     };
   };
 }
diff --git a/pkgs/homePage/default.nix b/pkgs/homePage/default.nix
new file mode 100644
index 0000000..ec59b22
--- /dev/null
+++ b/pkgs/homePage/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, pandoc, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  src = fetchFromGitHub {
+    owner = "dadada";
+    repo = "dadada.li";
+    rev = "main";
+    sha256 = "0rwzv5kp03nbi1zi5kcpdd8yabkmrj1was33dsi7ip6cbnvwn07g";
+  };
+  nativeBuildInputs = [ pandoc ];
+  buildPhase = ''
+    ./build.sh
+  '';
+  installPhase = ''
+    mkdir -p $out
+    cp -r src/* $out/
+  '';
+  name = "dadada.li";
+  version = "0.1";
+}