tidy imports
This commit is contained in:
parent
c36fece776
commit
b17560cd1c
|
@ -10,14 +10,7 @@
|
||||||
inherit system;
|
inherit system;
|
||||||
};
|
};
|
||||||
nixite = import ./nixite/. {inherit pkgs;};
|
nixite = import ./nixite/. {inherit pkgs;};
|
||||||
in {
|
in nixite // {
|
||||||
serve = nixite.serve;
|
|
||||||
mkSite = nixite.mkSite;
|
|
||||||
html = nixite.html;
|
|
||||||
elems = nixite.elems;
|
|
||||||
site = nixite.site;
|
|
||||||
md = nixite.md;
|
|
||||||
style = nixite.style;
|
|
||||||
|
|
||||||
packages.${system} = {
|
packages.${system} = {
|
||||||
default = nixite.mkSite (
|
default = nixite.mkSite (
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
mkSite = import ./make-site.nix {inherit pkgs;};
|
mkSite = import ./make-site.nix pkgs;
|
||||||
serve = site: (pkgs.writeShellScriptBin "serve" ''
|
serve = site: (pkgs.writeShellScriptBin "serve" ''
|
||||||
${pkgs.caddy}/bin/caddy file-server --root ${site}
|
${pkgs.caddy}/bin/caddy file-server --root ${site}
|
||||||
'');
|
'');
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{pkgs, ...}: raw: let
|
{stdenv, ...}: raw: let
|
||||||
site = import ./site.nix;
|
site = import ./site.nix;
|
||||||
in
|
in
|
||||||
pkgs.stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "site";
|
name = "site";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
|
Loading…
Reference in a new issue