module docs: print examples

ci.nix

@@ -34,12 +34,13 @@ let
         ];
         src = ./doc;
         buildPhase = ''
-          cat ${(import ./doc/extract-options.nix).doc} | fennel --correlate parse-options.fnl > modules.rst
+          cat ${(import ./doc/extract-options.nix).doc} > options.json
+          cat options.json | fennel --correlate parse-options.fnl > modules.rst
           make html
         '';
         installPhase = ''
           mkdir -p $out/nix-support $out/share/doc/
-          # (cd _build && tar cf $out/share/doc/liminix_manual.tar html)
+          cp modules.rst options.json $out
           cp -a _build/html $out/share/doc/liminix
           echo "file source-dist \"$out/share/doc/liminix\"" \
               > $out/nix-support/hydra-build-products

doc/parse-options.fnl

@@ -20,38 +20,44 @@
             (.. lines (string.gsub l "^## *" "") "\n"))))))
 
 (fn strip-newlines [text]
-  (and text
+  (-> text
-       (-> text
+      (string.gsub "\n([^\n])" " %1")
-           (string.gsub "\n([^\n])" " %1")
+      (string.gsub "\n\n+" "\n")))
-           (string.gsub "\n\n+" "\n"))))
 
 (fn indent [n text]
   (let [margin (string.rep " " n)]
-    (.. margin (string.gsub text "\n +" (.. "\n" margin )))))
+    (.. margin (string.gsub (or text "") "\n +" (.. "\n" margin )))))
+
+(fn indent-literal [n text]
+  (let [margin (string.rep " " n)]
+    (.. margin (string.gsub (or text "") "\n" (.. "\n" margin )))))
 
 (fn extract-text [description]
-  (and description
+  (match description
-;       (do (print (view description)) true)
+    { :_type "literalExpression" : text } text
-       (-> (match description
+    (where s (= (type s) "string")) description
-             { :type "literalExpression" : text } text
+    _ nil))
-             {} nil
-             nil nil
-             t description)
-           strip-newlines)))
 
 (fn print-option [o offset]
   (let [i (or offset 0)]
     (print (indent i (.. " * option ``" o.name "``")))
-    (print (indent (+ 4 i)
+    (case (-?> o.description extract-text strip-newlines)
-                   (or (extract-text o.description) "(no description)")))
+          descr (print (indent (+ 4 i) descr)))
     (print)
     (print (indent (+ 4 i) (.. "**type** " o.type "\n")))
-    (print (indent (+ 4 i)
+    (when o.example
-                   (.. "**default** "
+      (print (indent (+ 4 i) "**example**")) (print)
-                       (or (extract-text (?. o :default)) "(none)")
+      (print (indent (+ 4 i) ".. code-block:: nix"))
-                       "\n"
+      (print)
-                       )))
+      (print (indent-literal (+ 8 i) (extract-text o.example)) "\n")
-    (print )))
+      (print))
+
+    (when (extract-text o.default)
+      (print (indent (+ 4 i) "**default**")) (print)
+      (print (indent (+ 4 i) ".. code-block:: nix"))
+      (print)
+      (print (indent-literal (+ 8 i) (extract-text o.default)) "\n")
+      (print))))
 
 (fn print-service [o]
   (print (.. " * service ``" o.name "``"))
@@ -83,13 +89,3 @@
           (if (= o.type "parametrisable s6-rc service definition")
               (print-service o)
               (print-option o)))))))
-
-;; for each element el, add to table modules keyed on
-;; el.declarations
-
-;; for each value in modules
-;;   print title
-;;   elements = (sort elements on el.name)
-;;   for each el in elements
-;;     is option or service? print whichever
-;;

modules/kernel.nix

@@ -1,6 +1,7 @@
 ## Kernel-related options
 ## ======================
-
+##
+##
 
 { lib, pkgs, config, ...}:
 let
@@ -32,6 +33,13 @@ in {
           but sometimes other strings are also used.
         '';
         type = types.attrsOf types.nonEmptyStr;
+        example = lib.literalExpression ''
+          {
+            BRIDGE = "y";
+            TMPFS = "y";
+            FW_LOADER_USER_HELPER = "n";
+          };
+        '';
       };
     };
   };