move site to other file, organise builder

flake.nix

@@ -11,49 +11,27 @@
     system = "x86_64-linux";
     pkgs = import nixpkgs {inherit system;};
     nixite = import ./nixite/. {inherit pkgs;};
+    my-site = import ./testing/my-site.nix {inherit nixite;};
   in
     nixite
     // {
       formatter.${system} = pkgs.alejandra;
       packages.${system} = {
-        raw = nixite.mkSite (let
+        raw = nixite.mkSite my-site;
-          readme = {
-            name = "readme";
-            content = nixite.md.mdToPage ./README.md;
-          };
-          markup = {
-            "index.html" = with nixite.elems; let
-              blue = nixite.style.component span "blue" {
-                style = {color = "blue";};
-              };
-              underblue = nixite.style.component blue "under" {
-                style = {text-decoration = "underline";};
-              };
-            in (
-              nixite.html.document {
-                head = [(title "Nixite")];
-                body = main [
-                  (a {href = nixite.site.link readme;} "Readme")
-                  (a "/blog" "blog")
-                  (List {} ["item 1" "item 2" "item 3"])
-                  (p [
-                    "check out my"
-                    (blue "blue span")
-                    "isn't it"
-                    (underblue {onclick = "alert(1)";} "great!")
-                  ])
-                ];
-              }
-            );
-            blog = nixite.md.readDir ./testing/blog;
-          };
-          site =
-            nixite.site.prepare {favicon = ./testing/src/favicon.png;}
-            markup;
-        in
-          site);
 
-        default = nixite.serve self.packages.${system}.raw;
+        default = nixite.serve my-site {};
+
+        dev = tix.watch {
+          setup = ''
+            nix build .#raw
+            ${pkgs.caddy}/bin/caddy file-server --root result &
+          '';
+          cmd = ''
+            nix build .#raw
+          '';
+        };
+
+        inherit (tix.packages.${system}) watch watchpipe results;
 
         test = tix.run [
           ./testing/md.test.nix
@@ -63,14 +41,6 @@
           ./testing/style.test.nix
         ];
 
-        watch = tix.packages.${system}.watch;
-        watchpipe = tix.packages.${system}.watchpipe;
-        results = tix.packages.${system}.results;
-
-        dev = tix.watch {
-          cmd = "nix run .# --show-trace";
-          stop = "pkill caddy";
-        };
       };
     };
 }

nixite/default.nix

@@ -1,8 +1,6 @@
 {pkgs, ...}: {
   mkSite = import ./make-site.nix pkgs;
-  serve = site: (pkgs.writeShellScriptBin "serve" ''
+  serve = import ./serve.nix pkgs;
-    ${pkgs.caddy}/bin/caddy file-server --root ${site}
-  '');
   md = import ./md.nix;
   html = import ./html.nix;
   elems = import ./elems.nix;

nixite/make-site.nix

@@ -1,16 +1,39 @@
-{stdenv, ...}: raw: let
+pkgs: raw: let
-  site = import ./site.nix;
+  buildSiteTo = prefix: site:
+    builtins.toString (builtins.attrValues (builtins.mapAttrs (name: content:
+      if builtins.isString content
+      then ''
+        cp ${builtins.toFile name content} ${prefix}/${name}
+      ''
+      else if builtins.isPath content
+      then ''
+        cp -r ${content} ${prefix}/${name}
+      ''
+      else if builtins.isAttrs content && content ? "__toString"
+      then ''
+        cp ${builtins.toFile name (toString content)} ${prefix}/${name}
+      ''
+      else if builtins.isAttrs content
+      then ''
+        mkdir -p ${prefix}/${name}
+        ${buildSiteTo "${prefix}/${name}" content}
+      ''
+      else
+        throw "Site page must be string, path or attrset, but got ${
+          builtins.typeOf content
+        }: [${toString content}]")
+    site));
 in
-  stdenv.mkDerivation {
+  derivation {
-    name = "site";
+    builder = "/bin/sh";
-    src = ./.;
+    name = "my-nixite";
-    buildPhase = ''
+    system = "x86_64-linux";
-      mkdir dist
+    args = [
-
+      "-c"
-      ${site.copyTo "dist" raw}
+      ''
-
+        PATH=$PATH:${pkgs.coreutils}/bin
-    '';
+        mkdir $out
-    installPhase = ''
+        ${buildSiteTo "$out" raw}
-      cp -r dist $out
+      ''
-    '';
+    ];
   }

nixite/serve.nix

@@ -0,0 +1,28 @@
+pkgs: raw: {host ? "localhost"}: let
+  mkSite = import ./make-site.nix pkgs;
+  my-site = mkSite raw;
+  Caddyfile = ''
+    ${host}
+    root * ${my-site}
+    file_server
+  '';
+  run = ''
+    ${pkgs.caddy}/bin/caddy run --config $out/Caddyfile
+  '';
+in
+  derivation {
+    name = "nixite-server";
+    builder = "/bin/sh";
+    system = "x86_64-linux";
+    args = [
+      "-c"
+      ''
+        PATH=$PATH:${pkgs.coreutils}/bin
+        mkdir -p $out/bin
+        echo '${Caddyfile}' > $out/Caddyfile
+        echo "${run}" > $out/bin/nixite-server
+        chmod +x $out/bin/nixite-server
+      ''
+    ];
+    inherit my-site;
+  }

nixite/site.nix

@@ -142,29 +142,4 @@ in rec {
     content,
   } @ page:
     page // {type = "link";};
-
-  copyTo = prefix: site:
-    builtins.toString (builtins.attrValues (builtins.mapAttrs (name: content:
-      if builtins.isString content
-      then ''
-        cp ${builtins.toFile name content} ${prefix}/${name}
-      ''
-      else if builtins.isPath content
-      then ''
-        cp -r ${content} ${prefix}/${name}
-      ''
-      else if builtins.isAttrs content && content ? "__toString"
-      then ''
-        cp ${builtins.toFile name (toString content)} ${prefix}/${name}
-      ''
-      else if builtins.isAttrs content
-      then ''
-        mkdir -p ${prefix}/${name}
-        ${copyTo "${prefix}/${name}" content}
-      ''
-      else
-        throw "Site page must be string, path or attrset, but got ${
-          builtins.typeOf content
-        }: [${toString content}]")
-    site));
 }

testing/md.test.nix

@@ -75,16 +75,19 @@ in
           actual = processStr ''
             this text **may** *or may not* contain **bold** words *inside* it.
           '';
-          expected = [(elems.p [
+          expected = [
+            (elems.p [
               "this text "
-            (elems.strong "may") " "
+              (elems.strong "may")
+              " "
               (elems.em "or may not")
               " contain "
               (elems.strong "bold")
               " words "
               (elems.em "inside")
               " it."
-          ])];
+            ])
+          ];
           asString = true;
         })
 

testing/my-site.nix

@@ -0,0 +1,30 @@
+{nixite}: let
+  markup = {
+    "index.html" = nixite.md.mdToPage ../README.md;
+    "my-page" = with nixite.elems; let
+      blue = nixite.style.component span "blue" {
+        style = {color = "blue";};
+      };
+      underblue = nixite.style.component blue "under" {
+        style = {text-decoration = "underline";};
+      };
+    in (
+      nixite.html.document {
+        head = [(title "Nixite")];
+        body = main [
+          (a "/" "Readme")
+          (a "/blog" "blog")
+          (List {} ["item 1" "item 2" "item 3"])
+          (p [
+            "check out my"
+            (blue "blue span")
+            "isn't it"
+            (underblue {onclick = "alert(1)";} "great!")
+          ])
+        ];
+      }
+    );
+    blog = nixite.md.readDir ./blog;
+  };
+in
+  nixite.site.prepare {favicon = ./src/favicon.png;} markup