4 files changed, 35 insertions, 84 deletions
diff --git a/org/config_env.org b/org/config_env.org
index 75732ca..8aa8fa7 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -33,12 +33,16 @@ fi
 
 #+NAME: envrc
 #+HEADER: :tangle ../.envrc
+#+HEADER: :tangle-mode (identity #o644)
+#+HEADER: :shebang "# -*- mode: sh -*-"
 #+BEGIN_SRC shell
 if [ -f .envrc-git-init ]; then
   source_env_if_exists .envrc-git-init || source .envrc-git-init
 fi
 if [ -f .envrc-local ]; then
   source_env_if_exists .envrc-local || source .envrc-local
+elif  [ -f .envrc-local_ ]; then
+  source_env_if_exists .envrc-local_ || source .envrc-local_
 fi
 if [ -f .envrc-nix ]; then
   source_env_if_exists .envrc-nix || source .envrc-nix
@@ -53,15 +57,16 @@ fi
     - ${NixDirEnvVersion}
 
 #+HEADER: :tangle ../.envrc-nix
+#+HEADER: :tangle-mode (identity #o644)
 #+HEADER: :shebang "# -*- mode: nix -*-"
 #+BEGIN_SRC shell
 NIX_ENFORCE_PURITY=1
-# - https://github.com/nix-community/nix-direnv
-NixDirEnvVersion="<<direnv_version>>"
-NixDirEnvSHA="<<direnv_hash>>"
-if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then
-  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}"
-fi
+## - https://github.com/nix-community/nix-direnv
+#NixDirEnvVersion="<<direnv_version>>"
+#NixDirEnvSHA="<<direnv_hash>>"
+#if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then
+#  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}"
+#fi
 watch_file flake.lock
 watch_file flake.nix
 watch_file shell.nix
@@ -119,6 +124,8 @@ echo '
 ** .envrc-git-init
 
 #+HEADER: :tangle ../.envrc-git-init
+#+HEADER: :tangle-mode (identity #o644)
+#+HEADER: :shebang "# -*- mode: sh -*-"
 #+HEADER: :noweb yes
 #+BEGIN_SRC shell
 if [[ ! -d ./.git ]]; then
@@ -131,7 +138,9 @@ fi
 
 - bespoke modify appropriately and generate if needed
 
-#+HEADER: :tangle ../.envrc-local
+#+HEADER: :tangle ../.envrc-local_
+#+HEADER: :tangle-mode (identity #o644)
+#+HEADER: :shebang "# -*- mode: sh -*-"
 #+HEADER: :noweb yes
 #+BEGIN_SRC shell
 export SpineVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
@@ -142,7 +151,7 @@ export SpineCGIform='spine_search'
 export SpineCGIbin=/var/www/cgi/cgi-bin
 #+END_SRC
 
-* versions GET
+* org includes - versions GET
 ** direnv
 
 #+NAME: direnv_version
@@ -157,14 +166,6 @@ export SpineCGIbin=/var/www/cgi/cgi-bin
 <<./nix-develop-dlang-shared.org:direnv-hash()>>
 #+END_SRC
 
-** spine project VERSION :version:set:project:
-
-#+NAME: spine_version
-#+HEADER: :noweb yes
-#+BEGIN_SRC emacs-lisp
-<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>>
-#+END_SRC
-
 ** dlang overlays
 *** ldc
 
@@ -198,4 +199,12 @@ export SpineCGIbin=/var/www/cgi/cgi-bin
 <<./nix-develop-dlang-shared.org:dtools-version()>>
 #+END_SRC
 
+** spine project VERSION :version:set:project:
+
+#+NAME: spine_version
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>>
+#+END_SRC
+
 * __END__
diff --git a/org/config_git.org b/org/config_git.org
index 014155e..f84a67b 100644
--- a/org/config_git.org
+++ b/org/config_git.org
@@ -15,7 +15,7 @@
 #+PROPERTY:    header-args+ :mkdirp yes
 #+OPTIONS:     H:3 num:nil toc:t \n:t ::t |:t ^:nil -:t f:t *:t
 
-* spine
+* git config spine search
 ** .gitignore :gitignore:
 
 #+HEADER: :tangle "../.gitignore"
@@ -33,11 +33,8 @@
 !flake.lock
 !nixDevEnv.sh
 !.envrc
-!.envrc-local
 !.envrc-nix
 !.envrc-git-init
-!.env
-!.env/**
 !nix-overlays
 !nix-overlays/**
 !README.md
@@ -54,6 +51,8 @@
 !*.org
 !org
 !org/*.org
+!*.md
+!*.txt
 !*.d
 !*.rb
 !*.txt
@@ -72,16 +71,17 @@ tmp/**
 ,*_.org
 ,*_.nix
 ,*_.d
+,*_.md
 ,*_.txt
 ,*_
-,*.swp
-,*~
-\#*
-,*.\#*
 !.envrc-local_
 !src/sisudoc/spine_search.d_
 !views/configuration.txt_remotehost_
 !views/configuration.txt_localhost_
+,*.swp
+,*~
+\#*
+,*.\#*
 #!*/
 #\#*
 #*.\#*
diff --git a/org/config_nix.org b/org/config_nix.org
index b371dab..142964e 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -327,6 +327,7 @@ with pkgs-nix;
       # ❯❯❯ nix_related
       #nix
       direnv
+      nix-direnv
       nixVersions.latest #nixVersions.latest #nixVersions.git
       nix-prefetch-git
       validatePkgConfig
@@ -397,6 +398,7 @@ with pkgs;
       # ❯❯❯ nix_related
       #nix # if not on NixOS, this is needed
       direnv
+      nix-direnv
       nixVersions.latest #nixVersions.latest #nixVersions.git
       nix-prefetch-git
       validatePkgConfig
diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org
index 005d7f7..d11b752 100644
--- a/org/nix-develop-dlang-shared.org
+++ b/org/nix-develop-dlang-shared.org
@@ -63,66 +63,6 @@ update flake.lock:
 sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM=
 #+END_SRC
 
-**** 3.0.7
-
-#+NAME: direnv_version_3_0_7
-#+BEGIN_SRC org
-3.0.7
-#+END_SRC
-
-#+NAME: direnv_hash_3_0_7
-#+BEGIN_SRC org
-sha256-bn8WANE5a91RusFmRI7kS751ApelG02nMcwRekC/qzc=
-#+END_SRC
-
-**** 3.0.6
-
-#+NAME: direnv_version_3_0_6
-#+BEGIN_SRC org
-3.0.6
-#+END_SRC
-
-#+NAME: direnv_hash_3_0_6
-#+BEGIN_SRC org
-sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=
-#+END_SRC
-
-**** 3.0.4
-
-#+NAME: direnv_version_3_0_4
-#+BEGIN_SRC org
-3.0.4
-#+END_SRC
-
-#+NAME: direnv_hash_3_0_4
-#+BEGIN_SRC org
-sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=
-#+END_SRC
-
-**** 3.0.0
-
-#+NAME: direnv_version_3_0_0
-#+BEGIN_SRC org
-3.0.0
-#+END_SRC
-
-#+NAME: direnv_hash_3_0_0
-#+BEGIN_SRC org
-sha256-21TMnI2xWX7HkSTjFFri2UaohXVj854mgvWapWrxRXg=
-#+END_SRC
-
-**** 2.4.0
-
-#+NAME: direnv_version_2_4_0
-#+BEGIN_SRC org
-2.4.0
-#+END_SRC
-
-#+NAME: direnv_hash_2_4_0
-#+BEGIN_SRC org
-sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=
-#+END_SRC
-
 * dlang
 ** ldc
 *** tags link