From 9b9b12567492b4cb7145568743a4b87894c955a0 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Sun, 1 Aug 2021 10:31:25 -0400
Subject: track org config suggestions that require bespoke adjustment

---
 org/spine_build_scaffold.org | 56 +++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

(limited to 'org')

diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org
index 5089e15..36563a6 100644
--- a/org/spine_build_scaffold.org
+++ b/org/spine_build_scaffold.org
@@ -2147,9 +2147,9 @@ echo '-*- mode: org -*-
 ,* nixpkgs path?
 
   eval "$(nix print-dev-env)"
-' > SHELL_NIX_NOTE_
+' > nix_note_
 
-echo "  <nixpkgs> == `nix-instantiate --find-file nixpkgs`" >> SHELL_NIX_NOTE_
+echo "  <nixpkgs> == `nix-instantiate --find-file nixpkgs`" >> nix_note_
 
 echo '
 ,* nix build and show derivation
@@ -2170,10 +2170,10 @@ echo '
   nix search --json 2>/dev/null |jq
 
 ,* version and build info
-' >> SHELL_NIX_NOTE_
+' >> nix_note_
 
-echo "  spine version (git) == $SpineVER" >> SHELL_NIX_NOTE_
-echo "  nix-instantiate == `nix-instantiate`" >> SHELL_NIX_NOTE_
+echo "  spine version (git) == $SpineVER" >> nix_note_
+echo "  nix-instantiate == `nix-instantiate`" >> nix_note_
 
 echo "
 ,* initialised shell variables
@@ -2182,7 +2182,7 @@ echo "
   SpineDOC=$SpineDOC
   SpineOUT=$SpineOUT
   SpineOUTstatic=$SpineOUTstatic
-" >> SHELL_NIX_NOTE_
+" >> nix_note_
 
 echo '* spine run instruction examples
 ,** parallelized tasks
@@ -2257,9 +2257,9 @@ echo '* spine run instruction examples
   - make search form
     $SpineBIN/spine -v --cgi-search-form-codegen --config=$SpineDOC/markup/pod/.dr/config_local_site --output=$SpineOUTstatic
 
-' >> SHELL_NIX_NOTE_
-cat SHELL_NIX_NOTE_
-echo "cat SHELL_NIX_NOTE_"
+' >> nix_note_
+cat nix_note_
+echo "cat nix_note_"
 #+END_SRC
 
 ***** nixpkgs_path SETUP
@@ -2863,6 +2863,7 @@ tmp/**
 ,*~
 \#*
 ,*.\#*
+!.envrc-local_
 #!*/
 #\#*
 #*.\#*
@@ -3036,14 +3037,13 @@ fi
 
 #+HEADER: :tangle "../sundry/spine_search_cgi/.envrc-local_"
 #+BEGIN_SRC sh
-#export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
-export NIX_PATH=nixpkgs=/nixpkgs-ra/nixpkgs
+export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
+#export NIX_PATH=nixpkgs=/nixpkgs-ra/nixpkgs
 ## reload when these files change
 #use flake
 watch_file flake.nix
 # watch_file flake.lock
 ## load the flake devShell
-#lorri direnv
 eval "$(nix print-dev-env)"
 # echo $NIX_BUILD_TOP
 export SpineVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
@@ -3057,9 +3057,9 @@ echo '-*- mode: org -*-
 ,* nixpkgs path?
 
   eval "$(nix print-dev-env)"
-' > SHELL_NIX_NOTE_
+' > nix_note_
 
-echo "  <nixpkgs> == `nix-instantiate --find-file nixpkgs`" >> SHELL_NIX_NOTE_
+echo "  <nixpkgs> == `nix-instantiate --find-file nixpkgs`" >> nix_note_
 
 echo '
 ,* nix build and show derivation
@@ -3080,21 +3080,21 @@ echo '
   nix search --json 2>/dev/null |jq
 
 ,* version and build info
-' >> SHELL_NIX_NOTE_
+' >> nix_note_
 
-echo "  spine version (git) == $SpineVER" >> SHELL_NIX_NOTE_
-echo "  nix-instantiate == `nix-instantiate`" >> SHELL_NIX_NOTE_
+echo "  spine version (git) == $SpineVER" >> nix_note_
+echo "  nix-instantiate == `nix-instantiate`" >> nix_note_
 
-echo '
+echo "
 ,* initialised shell variables
 
-  SpineSRC=/grotto-ra/repo/git.repo/projects/project-spine/doc-reform
-  SpineDOC=/grotto-ra/repo/git.repo/projects/project-spine/doc-reform-markup/spine-markup-samples
-  SpineOUT=/tmp/spine/$SpineVER/www
-  SpineOUTstatic=/var/www
-
-,* spine run instruction examples
+  SpineSRC=$SpineSRC
+  SpineDOC=$SpineDOC
+  SpineOUT=$SpineOUT
+  SpineOUTstatic=$SpineOUTstatic
+" >> nix_note_
 
+echo '* spine run instruction examples
 ,** cgi operations (output to $SpineOUTstatic /var/www)
 
     $SpineSRC/result/bin/spine --very-verbose --sqlite-db-create --output="$SpineOUTstatic" $SpineDOC/markup/pod/*
@@ -3122,9 +3122,9 @@ echo '
     $SpineSRC/result/bin/spine -v --cgi-search-form-codegen --config=$SpineDOC/markup/pod/.dr/config_local_site
     #$SpineSRC/result/bin/spine -v --cgi-search-form-codegen --output=$SpineOUTstatic $SpineDOC/markup/pod/*
 
-' >> SHELL_NIX_NOTE_
-cat SHELL_NIX_NOTE_
-echo "see SHELL_NIX_NOTE"
+' >> nix_note_
+cat nix_note_
+echo "cat nix_note_"
 #+END_SRC
 
 *** dub.json
@@ -5097,6 +5097,8 @@ tmp/**
 ,*~
 \#*
 ,*.\#*
+!.envrc-local_
+!src/spine_search.d_
 #!*/
 #\#*
 #*.\#*
-- 
cgit v1.2.3