Put home page into overlay

This commit is contained in:
Tim Schubert 2020-12-31 03:35:47 +01:00
parent 630e867607
commit 6da2a6bc69
No known key found for this signature in database
GPG key ID: 99658A3EB5CD7C13
4 changed files with 27 additions and 7 deletions

View file

@ -14,4 +14,5 @@ rec {
tubslatex = callPackage ./pkgs/tubslatex {}; tubslatex = callPackage ./pkgs/tubslatex {};
keys = callPackage ./pkgs/keys {}; keys = callPackage ./pkgs/keys {};
homePage = callPackage ./pkgs/homePage {};
} }

View file

@ -3,9 +3,14 @@ let
hostName = "surgat"; hostName = "surgat";
this = import ../.. {}; this = import ../.. {};
keys = ../../pkgs/keys/keys; keys = ../../pkgs/keys/keys;
homePage = self: super: { homePage = super.callPackage ../../pkgs/homePage {}; };
in { in {
imports = [ this.profiles.base ]; imports = [ this.profiles.base ];
nixpkgs.overlays = [
homePage
];
networking.hostName = hostName; networking.hostName = hostName;
dadada.admin = { dadada.admin = {

View file

@ -1,13 +1,8 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
with lib;
let let
cfg = config.dadada.homePage; cfg = config.dadada.homePage;
homePage = import (builtins.fetchTarball { in with lib; {
url = "https://github.com/dadada/dadada.li/archive/c77ffc04882f32c2feced7d0f2d8ce3622060230.tar.gz";
sha256 = "1b48m13yjmw7bpm1jikydv8janys07l6l37yhs1znnj4ygl4hz1d";
});
in {
options.dadada.homePage = { options.dadada.homePage = {
enable = mkEnableOption "Enable home page"; enable = mkEnableOption "Enable home page";
}; };
@ -17,7 +12,7 @@ in {
services.nginx.virtualHosts."dadada.li" = { services.nginx.virtualHosts."dadada.li" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
root = pkgs.callPackage homePage {}; root = pkgs.homePage;
}; };
}; };
} }

19
pkgs/homePage/default.nix Normal file
View file

@ -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";
}