nix flake and env updates, ldc using llvm-20

- .env/ removed as unused & unmaintained

12 files changed, 70 insertions, 341 deletions

diff --git a/.env/echo-nixNote b/.env/echo-nixNote
deleted file mode 100644
index 36dfa3a..0000000
--- a/.env/echo-nixNote
+++ /dev/null
@@ -1,238 +0,0 @@
-echo '-*- mode: org -*-
-
-* nixpkgs path?
-
-  # eval "$(nix print-dev-env)"
-' > nixNote_.org
-
-echo "  <nixpkgs> == `nix-instantiate --find-file nixpkgs`" >> nixNote_.org
-
-echo '
-* nix build and show derivation
-
-#+BEGIN_SRC shell
-nix-shell --pure
-
-nix-build
-nix build -f default.nix --print-build-logs
-nix shell -f default.nix --print-build-logs
-nix develop --build -f derivation.nix -I .envrc --print-build-logs
-
-nix-instantiate | nix-build
-
-nix-instantiate -I .envrc | nix-build -I .envrc
-nix build `nix-instantiate`
-nix build `nix-instantiate -I .envrc`
-
-nix develop
-
-nix-instantiate | nix show-derivation | jq
-nix-instantiate -I .envrc | nix show-derivation -f derivation.nix -I .envrc | jq
-
-nix-instantiate | nix show-derivation --recursive | jq
-nix-instantiate -I .envrc | nix show-derivation -f derivation.nix --recursive -I .envrc | jq
-
-nix search --json 2>/dev/null |jq
-#+END_SRC
-
-* version and build info
-
-#+BEGIN_SRC sh' >> nixNote_.org
-
-echo 'spine version (git) == $SpineVER' >> nixNote_.org
-echo "spine version (git) == $SpineVER" >> nixNote_.org
-echo 'nix-instantiate == `nix-instantiate`' >> nixNote_.org
-echo "nix-instantiate == `nix-instantiate`" >> nixNote_.org
-
-echo "#+END_SRC
-
-* initialised shell variables
-
-#+BEGIN_SRC shell
-SpineSRC=$SpineSRC
-SpineDOC=$SpineDOC
-SpinePOD=$SpinePOD
-SpineOUTversioned=$SpineOUTversioned
-SpineOUT=$SpineOUT
-#+END_SRC
-" >> nixNote_.org
-
-echo '* spine run instruction examples
-** parallelized tasks
-*** doc source
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --very-verbose --pod --source --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** html & epub output
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --very-verbose --html --epub --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** sqlite db for each document - populate each db
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --very-verbose --sqlite-discrete --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** doc source; html, epub; sqlite outputs
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --verbose --pod --html --epub --sqlite-discrete --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** curate (authors topics)
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --very-verbose --curate --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** html, curate
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --verbose --dark --html --html-link-curate --curate --output="$SpineOUTversioned" $SpinePOD/*
-$SpineBIN/spine --very-verbose --html --html-link-curate --curate --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** composite command: source pod, html, epub, curate, sqlite
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --verbose --dark --pod --epub --html --html-link-curate --curate --sqlite-discrete --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-** sequential tasks
-*** sqlite db (shared) - create db
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --very-verbose --sqlite-db-create --output="$SpineOUTversioned"
-#+END_SRC
-
-*** sqlite db (shared) - populate db
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --very-verbose --sqlite-update --output="$SpineOUTversioned" $SpineDOC/sisudoc-spine-markup-samples/markup/pod/*
-#+END_SRC
-
-*** sqlite db (shared) - drop db
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --very-verbose --sqlite-db-drop --output="$SpineOUTversioned"
-#+END_SRC
-
-*** sqlite db (shared) - create & populate db (single step)
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --very-verbose --sqlite-db-create --sqlite-update --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** composite command: source pod, html, epub, curate, sqlite
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --verbose --no-parallel --dark --pod --epub --html --html-link-curate --curate --sqlite-discrete --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-** config [./pod/].dr/config_local_site
-
-#+BEGIN_SRC shell
-cat $SpinePOD/.dr/config_local_site
-$SpineBIN/spine --show-config $SpinePOD
-$SpineBIN/spine --show-config --output="$SpineOUTversioned" $SpinePOD
-#+END_SRC
-
-** cgi operations (output to $SpineOUT /var/www)
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --very-verbose --sqlite-db-create --output="$SpineOUT" $SpinePOD/*
-
-$SpineBIN/spine -v --cgi-search-form-codegen --output=$SpineOUT $SpinePOD/*
-
-$SpineBIN/spine -v --show-config --config=$SpinePOD/.dr
-
-$SpineBIN/spine --html $SpinePOD/*
-
-$SpineBIN/spine -v --cgi-search-form-codegen --config=$SpinePOD/.dr/config_local_site
-#+END_SRC
-
-*** generate html linked to search form
-
-#+BEGIN_SRC shell
-$SpineBIN/spine -v --html --html-link-search --html-link-curate --curate  --output=$SpineOUT $SpinePOD/*
-#+END_SRC
-
-*** create or re-create sql db (--sqlite-db-create or --sqlite-db-recreate)
-
-#+BEGIN_SRC shell
-$SpineBIN/spine -v --sqlite-db-create --sqlite-db-filename="spine.search.db" --sqlite-db-path="$SpineDBpath"
-$SpineBIN/spine -v --sqlite-db-recreate --sqlite-db-filename="spine.search.db" --sqlite-db-path="$SpineDBpath"
-#+END_SRC
-
-*** populate sqlite db
-
-#+BEGIN_SRC shell
-$SpineBIN/spine -v --sqlite-update --sqlite-db-filename="spine.search.db" --output=$SpineOUT $SpinePOD/*
-#+END_SRC
-
-*** generate html (linked to search form), sql output, curate COMPOSITE
-
-#+BEGIN_SRC shell
-$SpineBIN/spine -v --html --html-link-search --html-link-curate --curate --sqlite-update --sqlite-db-filename="spine.search.db" --cgi-sqlite-search-filename="spine_search" --sqlite-db-path="$SpineDBpath" --output="$SpineOUT" $SpinePOD/*
-$SpineBIN/spine --epub --html --html-link-search --html-link-curate --curate --sqlite-update --sqlite-db-filename="spine.search.db" --cgi-sqlite-search-filename="spine_search" --cgi-url-action="https://sisudoc.org/spine_search" --ouput="$SpineOUT" $SpinePOD/*
-#+END_SRC
-
-*** generate html (linked to search form), sql output, curate COMPOSITE with resource configuration
-
-if names and paths are configured in resource configuration file, e.g. $SpinePOD/.rc/config_local_site
-
-#+BEGIN_SRC shell
-$SpineBIN/spine -v --html --html-link-search --html-link-curate --curate --sqlite-update $SpinePOD/*
-#+END_SRC
-
-#+BEGIN_SRC yaml
-# sample resource configuration file ( $SpinePOD/.rc/config_local_site )
-output:
-  path:                        "/srv/www/spine"
-default:
-  language:                    "en"
-  papersize:                   "a4"
-  text_wrap:                   "80"
-  digest:                      "sha256"
-webserv:
-  http:                        "http"
-  domain:                      "localhost"
-  data_http:                   "http"
-  data_domain:                 "localhost"
-  data_root_url:               "https://sisudoc.org"
-  data_root_path:              "/srv/www/spine"
-  images_root_part:            "image"
-  cgi_search_form_title:       "≅ SiSU Spine search ፨"
-  cgi_http:                    "https"
-  cgi_domain:                  "sisudoc.org"
-  cgi_bin_url:                 "http://sisudoc.org/cgi-bin"
-  cgi_bin_part:                "cgi-bin"
-  cgi_bin_path:                "/var/www/cgi/cgi-bin"
-  cgi_search_script:           "spine_search"
-  cgi_action:                  "https://sisudoc.org/spine_search"
-  db_sqlite_filename:          "spine.search.db"
-  db_sqlite_path:              "/var/www/sqlite"
-#+END_SRC
-
-*** make search form
-
-#+BEGIN_SRC shell
-$SpineBIN/spine -v --cgi-search-form-codegen --config=$SpinePOD/.dr/config_local_site
-#+END_SRC
-
-*** latex
-
-#+BEGIN_SRC shell
-$SpineBIN/spine --latex --serial --output="$SpineOUT" $SpinePOD/*
-ls $SpineOutstatic/latex/*.tex
-#+END_SRC
-' >> nixNote_.org
-
-#cat nixNote_.org
-
-#echo "emacs nixNote_.org"
-#echo "cat nixNote_.org"
diff --git a/.env/nix-commands b/.env/nix-commands
deleted file mode 100644
index de52220..0000000
--- a/.env/nix-commands
+++ /dev/null
@@ -1,19 +0,0 @@
-- nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell
-
-- nix build ".#default" --print-build-logs
-- nix build ".#spine-dmd" --print-build-logs
-- nix build ".#spine-ldc" --print-build-logs
-
-- nix develop
-  - nix develop ".#devShell" --print-build-logs
-  - nix develop ".#devShell-html" --print-build-logs
-  - nix develop ".#devShell-epub" --print-build-logs
-  - nix develop ".#devShell-latex-pdf" --print-build-logs
-  - nix develop ".#devShell-sqlite" --print-build-logs
-  - nix develop ".#devShell-i18n" --print-build-logs
-
-nix run .#default --print-build-logs
-
-nix develop --build ".#default" --print-build-logs
-
-nix-shell '<nixpkgs>' -A nix --pure
diff --git a/.envrc-nix b/.envrc-nix
index c70accf..2a3a0f0 100644
--- a/.envrc-nix
+++ b/.envrc-nix
@@ -24,11 +24,11 @@ echo '
   • nix develop
     ❯❯ nix develop ".#" --print-build-logs -c zsh
   • nix develop using nixpkgs
-    ❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
-    ❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh
   • nix develop using package overlays: (dmd-2.111.0, ldc-1.41.0, dub-1.39.0, dtools-2.110.0)
-    ❯❯ nix develop ".#dsh-overlay-dmd-dub" --print-build-logs -c zsh
-    ❯❯ nix develop ".#dsh-overlay-ldc-dub" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-overlay-dmd" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs -c zsh
   ❯❯ nix flake show
 
 • to build project:
@@ -46,10 +46,10 @@ echo '
 
 • to build using dub on nix (get dependencies by setting your development environment):
 
-  ❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
+  ❯❯ nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh
   ❯❯ dub --verbose --compiler=dmd --config=dmd
 
-  ❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
+  ❯❯ nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh
   ❯❯ dub --verbose --compiler=ldmd2 --config=ldmd2
 
 • for develop environment & build options
@@ -63,6 +63,9 @@ echo '
 
   ❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
   ❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
+
+  ❯❯ ${SpineBIN} -v --sqlite-db-create --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db
+  ❯❯ ${SpineBIN} -v --sqlite-update --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db ./markup/pod/*
 '
 echo "•
   ❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
diff --git a/.gitignore b/.gitignore
index e9d49e5..f9e14ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,6 @@
 !.envrc
 !.envrc-nix
 !.envrc-git-init
-!.env
-!.env/**
 !nix-overlays
 !nix-overlays/**
 !README.md
@@ -26,6 +24,7 @@
 !configuration.txt
 !*.json
 !*.sdl
+!*.md
 !meson.build
 !tangle
 !*.org
diff --git a/README b/README
index 74fdf80..fecda98 100644
--- a/README
+++ b/README
@@ -258,25 +258,18 @@ for a document collection you can point to the document collection:
 
   ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-search --html-link-pdf --html-link-curate --html-link-markup --cgi-sqlite-search-filename="${SpineCGIform}" --cgi-url-action="${SpineSearchActionRemote}" --curate --sqlite-update --sqlite-kb-filename="${SpineSQLdb}" --output=${SpineOUT} ${SpinePOD}/*
 
-*** generate a cgi search form in d
+*** generate a cgi search form
 
-spine -v --cgi-search-form-codegen \
-  --output=/var/www/html \
-  ~spineMarkupSamples/pod
-
-spine -v --cgi-search-form-codegen --config=~spineMarkupSamples/pod
+The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory.
 
-spine -v --cgi-search-form-codegen --config=~spineMarkupSamples/pod/.dr/config_local_site
+Steps:
+1. Clone the sisudoc-spine-search-cgi repository
+2. Configure views/configuration.txt with your web server settings
+3. Build the CGI binary using Nix or dub
+4. Deploy the CGI binary to your web server's cgi-bin directory
 
-spine --cgi-search-form-codegen --output=`echo ~webDocRoot` ~spineMarkupSamples/pod
-
-spine --cgi-search-form-codegen --cgi-sqlite-search-filename="spine_search" --output=`echo ~webDocRoot`
-
-spine -v --cgi-search-form-codegen \
-  --sqlite-db-filename="spine.search.db" \
-  --cgi-sqlite-search-filename="spine-search" \
-  --output=/var/www/html \
-  ~spineMarkupSamples/pod
+For detailed instructions, see:
+  sisudoc-spine-search-cgi/README.md
 
 **** compile the cgi search form
 
@@ -306,14 +299,15 @@ cgi-bin directory
   ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-search --html-link-pdf --html-link-curate --html-link-markup --cgi-sqlite-search-filename="${SpineCGIform}" --cgi-url-action="${SpineSearchActionLocal}" --curate --sqlite-update --sqlite-db-filename="${SpineSQLdb}" --output=${SpineOUT} ${SpinePOD}/*
 
 
-*** create db & search form
+*** create db
 
 spine -v \
   --sqlite-db-create --sqlite-db-filename="spine.search.db" \
-  --cgi-search-form-codegen --cgi-sqlite-search-filename="spine-search" \
   --output=/var/www/html \
   ~spineMarkupSamples/pod/*
 
+Note: The CGI search form is built separately in sisudoc-spine-search-cgi/
+
 *** html with links to search form
 
 ${SpineBIN} -v --epub --html --html-link-curate --curate --output=${SpineOUT} ${SpinePOD}/*
diff --git a/README.md b/README.md
index 56c409e..22abeff 100644
--- a/README.md
+++ b/README.md
@@ -243,23 +243,16 @@ for a document collection you can point to the document collection:
 
 ### generate a cgi search form in d
 
-spine -v --cgi-search-form-codegen \
-  --output=/var/www/html \
-  ~spineMarkupSamples/pod
-
-spine -v --cgi-search-form-codegen --config=~spineMarkupSamples/pod
+The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory.
 
-spine -v --cgi-search-form-codegen --config=~spineMarkupSamples/pod/.dr/config_local_site
+Steps:
+1. Clone the sisudoc-spine-search-cgi repository
+2. Configure views/configuration.txt with your web server settings
+3. Build the CGI binary using Nix or dub
+4. Deploy the CGI binary to your web server's cgi-bin directory
 
-spine --cgi-search-form-codegen --output=`echo ~webDocRoot` ~spineMarkupSamples/pod
-
-spine --cgi-search-form-codegen --cgi-sqlite-search-filename="spine_search" --output=`echo ~webDocRoot`
-
-spine -v --cgi-search-form-codegen \
-  --sqlite-db-filename="spine.search.db" \
-  --cgi-sqlite-search-filename="spine-search" \
-  --output=/var/www/html \
-  ~spineMarkupSamples/pod
+For detailed instructions, see:
+  sisudoc-spine-search-cgi/README.md
 
 #### compile the cgi search form
 
@@ -289,14 +282,15 @@ cgi-bin directory
   ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-search --html-link-pdf --html-link-curate --html-link-markup --cgi-sqlite-search-filename="${SpineCGIform}" --cgi-url-action="${SpineSearchActionLocal}" --curate --sqlite-update --sqlite-db-filename="${SpineSQLdb}" --output=${SpineOUT} ${SpinePOD}/*
 
 
-### create db & search form
+### create db
 
 spine -v \
   --sqlite-db-create --sqlite-db-filename="spine.search.db" \
-  --cgi-search-form-codegen --cgi-sqlite-search-filename="spine-search" \
   --output=/var/www/html \
   ~spineMarkupSamples/pod/*
 
+Note: The CGI search form is built separately in sisudoc-spine-search-cgi/
+
 ### html with links to search form
 
 ${SpineBIN} -v --epub --html --html-link-curate --curate --output=${SpineOUT} ${SpinePOD}/*
diff --git a/flake.nix b/flake.nix
index 1bf974c..4209504 100644
--- a/flake.nix
+++ b/flake.nix
@@ -228,7 +228,7 @@
           ];
           inherit shellHook;
         };
-        dsh-nixpkgs-dmd-dub = mkShell {
+        dsh-nixpkgs-dmd = mkShell {
           name = "spine-0.18.0 base dev shell";
           inherit shell;
           inherit devEnv;
@@ -241,7 +241,7 @@
           ];
           inherit shellHook;
         };
-        dsh-nixpkgs-ldc-dub = mkShell {
+        dsh-nixpkgs-ldc = mkShell {
           name = "spine-0.18.0 base dev shell";
           inherit shell;
           inherit devEnv;
@@ -254,7 +254,7 @@
           ];
           inherit shellHook;
         };
-        dsh-overlay-dmd-dub = mkShell {
+        dsh-overlay-dmd = mkShell {
           name = "spine-0.18.0 base dev shell, dmd-2.111.0, dub-1.39.0 - dtools-2.110.0";
           inherit shell;
           inherit devEnv;
@@ -267,7 +267,7 @@
           ];
           inherit shellHook;
         };
-        dsh-overlay-ldc-dub = mkShell {
+        dsh-overlay-ldc = mkShell {
           name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.39.0 - dtools-2.110.0";
           inherit shell;
           inherit devEnv;
diff --git a/org/config_env.org b/org/config_env.org
index 1eb1f6d..ec6a1d5 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -80,11 +80,11 @@ echo '
   • nix develop
     ❯❯ nix develop ".#" --print-build-logs -c zsh
   • nix develop using nixpkgs
-    ❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
-    ❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh
   • nix develop using package overlays: (dmd-<<dmd_version>>, ldc-<<ldc_version>>, dub-<<dub_version>>, dtools-<<dtools_version>>)
-    ❯❯ nix develop ".#dsh-overlay-dmd-dub" --print-build-logs -c zsh
-    ❯❯ nix develop ".#dsh-overlay-ldc-dub" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-overlay-dmd" --print-build-logs -c zsh
+    ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs -c zsh
   ❯❯ nix flake show
 
 • to build project:
@@ -102,10 +102,10 @@ echo '
 
 • to build using dub on nix (get dependencies by setting your development environment):
 
-  ❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
+  ❯❯ nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh
   ❯❯ dub --verbose --compiler=dmd --config=dmd
 
-  ❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
+  ❯❯ nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh
   ❯❯ dub --verbose --compiler=ldmd2 --config=ldmd2
 
 • for develop environment & build options
@@ -119,6 +119,9 @@ echo '
 
   ❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
   ❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
+
+  ❯❯ ${SpineBIN} -v --sqlite-db-create --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db
+  ❯❯ ${SpineBIN} -v --sqlite-update --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db ./markup/pod/*
 '
 echo "•
   ❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
diff --git a/org/config_git.org b/org/config_git.org
index b997923..66383ad 100644
--- a/org/config_git.org
+++ b/org/config_git.org
@@ -37,8 +37,6 @@
 !.envrc
 !.envrc-nix
 !.envrc-git-init
-!.env
-!.env/**
 !nix-overlays
 !nix-overlays/**
 !README.md
@@ -50,6 +48,7 @@
 !configuration.txt
 !*.json
 !*.sdl
+!*.md
 !meson.build
 !tangle
 !*.org
diff --git a/org/config_nix.org b/org/config_nix.org
index de1d3b0..3f101a0 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -251,7 +251,7 @@
           ];
           inherit shellHook;
         };
-        dsh-nixpkgs-dmd-dub = mkShell {
+        dsh-nixpkgs-dmd = mkShell {
           name = "spine-<<spine_version>> base dev shell";
           inherit shell;
           inherit devEnv;
@@ -264,7 +264,7 @@
           ];
           inherit shellHook;
         };
-        dsh-nixpkgs-ldc-dub = mkShell {
+        dsh-nixpkgs-ldc = mkShell {
           name = "spine-<<spine_version>> base dev shell";
           inherit shell;
           inherit devEnv;
@@ -277,7 +277,7 @@
           ];
           inherit shellHook;
         };
-        dsh-overlay-dmd-dub = mkShell {
+        dsh-overlay-dmd = mkShell {
           name = "spine-<<spine_version>> base dev shell, dmd-<<dmd_version>>, dub-<<dub_version>> - dtools-<<dtools_version>>";
           inherit shell;
           inherit devEnv;
@@ -290,7 +290,7 @@
           ];
           inherit shellHook;
         };
-        dsh-overlay-ldc-dub = mkShell {
+        dsh-overlay-ldc = mkShell {
           name = "spine-<<spine_version>> base dev shell, ldc-<<ldc_version>>, dub-<<dub_version>> - dtools-<<dtools_version>>";
           inherit shell;
           inherit devEnv;
@@ -717,7 +717,7 @@ github:nixos/nixpkgs
 ** .env/echo-nixNote CHECK MODIFY
 *** notes on nix commands
 
-#+HEADER: :tangle ../.env/nix-commands
+#+HEADER: :tangle-NO ../.env/nix-commands
 #+BEGIN_SRC text
 - nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell
 
@@ -742,7 +742,7 @@ nix-shell '<nixpkgs>' -A nix --pure
 
 *** echo-nixNote
 
-#+HEADER: :tangle ../.env/echo-nixNote
+#+HEADER: :tangle-NO ../.env/echo-nixNote
 #+BEGIN_SRC shell
 echo '-*- mode: org -*-
 
@@ -892,13 +892,13 @@ $SpineBIN/spine --show-config --output="$SpineOUTversioned" $SpinePOD
 ,#+BEGIN_SRC shell
 $SpineBIN/spine --very-verbose --sqlite-db-create --output="$SpineOUT" $SpinePOD/*
 
-$SpineBIN/spine -v --cgi-search-form-codegen --output=$SpineOUT $SpinePOD/*
+# CGI search form is built separately in sisudoc-spine-search-cgi/
 
 $SpineBIN/spine -v --show-config --config=$SpinePOD/.dr
 
 $SpineBIN/spine --html $SpinePOD/*
 
-$SpineBIN/spine -v --cgi-search-form-codegen --config=$SpinePOD/.dr/config_local_site
+# See sisudoc-spine-search-cgi/README.md for CGI search form build instructions
 ,#+END_SRC
 
 ,*** generate html linked to search form
@@ -967,7 +967,7 @@ webserv:
 ,*** make search form
 
 ,#+BEGIN_SRC shell
-$SpineBIN/spine -v --cgi-search-form-codegen --config=$SpinePOD/.dr/config_local_site
+# CGI search form is built separately - see sisudoc-spine-search-cgi/README.md
 ,#+END_SRC
 
 ,*** latex
diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org
index 451c53c..2a2f66d 100644
--- a/org/nix-develop-dlang-shared.org
+++ b/org/nix-develop-dlang-shared.org
@@ -187,7 +187,7 @@ sha256-6LcpY3LSFK4KgEiGrFp/LONu5Vr+/+vI04wEEpF3s+s=
 
 #+NAME: ldc_llvm_set_1_41_0
 #+BEGIN_SRC nix
-llvm_19
+llvm_20
 #+END_SRC
 
 **** 1.40 OK ✓
diff --git a/org/spine_info.org b/org/spine_info.org
index a2078fe..2d61c20 100644
--- a/org/spine_info.org
+++ b/org/spine_info.org
@@ -77,7 +77,7 @@
 
 <<sisudoc_spine_README_command_examples_populate_db_text>>
 
-,*** generate a cgi search form in d
+,*** generate a cgi search form
 
 <<sisudoc_spine_README_command_examples_search_db_cgi_text>>
 
@@ -85,7 +85,7 @@
 
 <<sisudoc_spine_README_command_examples_compile_search_db_cgi_text>>
 
-,*** create db & search form
+,*** create db
 
 <<sisudoc_spine_README_command_examples_create_db_and_search_form_text>>
 
@@ -196,7 +196,7 @@
 
 <<sisudoc_spine_README_command_examples_compile_search_db_cgi_text>>
 
-### create db & search form
+### create db
 
 <<sisudoc_spine_README_command_examples_create_db_and_search_form_text>>
 
@@ -624,23 +624,16 @@ for a document collection you can point to the document collection:
 
 #+NAME: sisudoc_spine_README_command_examples_search_db_cgi_text
 #+BEGIN_SRC text
-spine -v --cgi-search-form-codegen \
-  --output=/var/www/html \
-  ~spineMarkupSamples/pod
-
-spine -v --cgi-search-form-codegen --config=~spineMarkupSamples/pod
+The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory.
 
-spine -v --cgi-search-form-codegen --config=~spineMarkupSamples/pod/.dr/config_local_site
+Steps:
+1. Clone the sisudoc-spine-search-cgi repository
+2. Configure views/configuration.txt with your web server settings
+3. Build the CGI binary using Nix or dub
+4. Deploy the CGI binary to your web server's cgi-bin directory
 
-spine --cgi-search-form-codegen --output=`echo ~webDocRoot` ~spineMarkupSamples/pod
-
-spine --cgi-search-form-codegen --cgi-sqlite-search-filename="spine_search" --output=`echo ~webDocRoot`
-
-spine -v --cgi-search-form-codegen \
-  --sqlite-db-filename="spine.search.db" \
-  --cgi-sqlite-search-filename="spine-search" \
-  --output=/var/www/html \
-  ~spineMarkupSamples/pod
+For detailed instructions, see:
+  sisudoc-spine-search-cgi/README.md
 #+END_SRC
 
 #+NAME: sisudoc_spine_README_command_examples_compile_search_db_cgi_text
@@ -676,9 +669,10 @@ cgi-bin directory
 #+BEGIN_SRC text
 spine -v \
   --sqlite-db-create --sqlite-db-filename="spine.search.db" \
-  --cgi-search-form-codegen --cgi-sqlite-search-filename="spine-search" \
   --output=/var/www/html \
   ~spineMarkupSamples/pod/*
+
+Note: The CGI search form is built separately in sisudoc-spine-search-cgi/
 #+END_SRC
 
 #+NAME: sisudoc_spine_README_command_examples_html_with_links_to_search_form_text