nix .envrc related

7 files changed, 59 insertions, 37 deletions

diff --git a/.envrc-local_ b/.env/echo-nixNote
index 9bc7338..6ddfe58 100644
--- a/.envrc-local_
+++ b/.env/echo-nixNote
@@ -1,20 +1,3 @@
-export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
-#export NIX_PATH=/nixpkgs-ra/nixpkgs
-# reload when these files change
-# watch_file flake.nix
-# watch_file flake.lock
-## load the flake devShell
-# 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')
-export SpineSRC=/grotto-ra/repo/git.repo/projects/project-spine/doc-reform
-export SpineBIN=/grotto-ra/repo/git.repo/projects/project-spine/doc-reform/result/bin
-export SpineDOC=/grotto-ra/repo/git.repo/projects/project-spine/doc-reform-markup/spine-markup-samples
-export SpinePOD=$SpineDOC/markup/pod
-export SpineOUTversioned=/srv/www/spine/$SpineVER
-export SpineOUT=/srv/www/spine
-export SpineDBpath=/var/www/sqlite
-
 echo '-*- mode: org -*-
 
 * nixpkgs path?
diff --git a/.env/local_ b/.env/local_
new file mode 100644
index 0000000..966c673
--- /dev/null
+++ b/.env/local_
@@ -0,0 +1,19 @@
+export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
+#export NIX_PATH=/nixpkgs-ra/nixpkgs
+# reload when these files change
+# watch_file flake.nix
+# watch_file flake.lock
+## load the flake devShell
+# 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')
+export SpineSRC=/grotto-ra/repo/git.repo/projects/project-spine/doc-reform
+export SpineBIN=/grotto-ra/repo/git.repo/projects/project-spine/doc-reform/result/bin
+export SpineDOC=/grotto-ra/repo/git.repo/projects/project-spine/doc-reform-markup/spine-markup-samples
+export SpinePOD=$SpineDOC/markup/pod
+export SpineOUTversioned=/srv/www/spine/$SpineVER
+export SpineOUT=/srv/www/spine
+export SpineDBpath=/var/www/sqlite
+if [ -e .env/echo-nixNote ]; then
+   source .env/echo-nixNote
+fi
diff --git a/.envrc b/.envrc
index 03af170..72eefc7 100644
--- a/.envrc
+++ b/.envrc
@@ -3,6 +3,6 @@ if ! has nix_direnv_version || ! nix_direnv_version 1.4.0; then
 # https://github.com/nix-community/nix-direnv
   source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/1.4.0/direnvrc" "sha256-4XfVDjv75eHMWN4G725VW7BoOV4Vl3vAabK4YXIfPyE="
 fi
-if [ -e .envrc-local ]; then # source an additional user-specific .envrc in ./.envrc-local
-  source .envrc-local
+if [ -e .env/local ]; then # source an additional user-specific .envrc in ./.env/local
+  source .env/local
 fi
diff --git a/.gitignore b/.gitignore
index 2b3f883..a0eb6c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,7 +71,9 @@ tmp/**
 *~
 \#*
 *.\#*
-!.envrc-local_
+!.env
+!.env/local_
+!.env/echo-nixNote
 #!*/
 #\#*
 #*.\#*
diff --git a/org/config_git.org b/org/config_git.org
index a67cacd..77fc36e 100644
--- a/org/config_git.org
+++ b/org/config_git.org
@@ -94,7 +94,9 @@ tmp/**
 ,*~
 \#*
 ,*.\#*
-!.envrc-local_
+!.env
+!.env/local_
+!.env/echo-nixNote
 #!*/
 #\#*
 #*.\#*
diff --git a/org/config_nix.org b/org/config_nix.org
index 2fd932c..c5bd8dd 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -78,8 +78,8 @@ if ! has nix_direnv_version || ! nix_direnv_version 1.4.0; then
 # https://github.com/nix-community/nix-direnv
   source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/1.4.0/direnvrc" "sha256-4XfVDjv75eHMWN4G725VW7BoOV4Vl3vAabK4YXIfPyE="
 fi
-if [ -e .envrc-local ]; then # source an additional user-specific .envrc in ./.envrc-local
-  source .envrc-local
+if [ -e .env/local ]; then # source an additional user-specific .envrc in ./.env/local
+  source .env/local
 fi
 #+END_SRC
 
@@ -94,8 +94,8 @@ else # fallback prevent bootstrapping problems by using direnv's builtin nix sup
   use nix
   NIX_ENFORCE_PURITY=0
 fi
-if [ -e .envrc-local ]; then # source an additional user-specific .envrc in ./.envrc-local
-  source .envrc-local
+if [ -e .env/local ]; then # source an additional user-specific .envrc in ./.env/local
+  source .env/local
 fi
 #+END_SRC
 
@@ -125,18 +125,18 @@ else
       use nix
       NIX_ENFORCE_PURITY=0
   fi
-  # source an additional user-specific .envrc in ./.envrc-local
-  if [ -e .envrc-local ]; then
-     source .envrc-local
+  # source an additional user-specific .envrc in ./.env/local
+  if [ -e .env/local ]; then
+     source .env/local
   fi
 fi
 #+END_SRC
 
-**** .envrc-local CHECK MODIFY
+**** .env/local CHECK MODIFY
 
 - bespoke modify appropriately and generate if needed
 
-#+HEADER: :tangle ../.envrc-local_
+#+HEADER: :tangle ../.env/local_
 #+BEGIN_SRC sh
 export NIX_PATH=<<nix_path_channel>>
 #export NIX_PATH=<<nixpkgs_path_local>>
@@ -154,7 +154,15 @@ export SpinePOD=$SpineDOC/markup/pod
 export SpineOUTversioned=<<project_path_local_out>>
 export SpineOUT=<<project_path_local_out_static>>
 export SpineDBpath=<<project_path_sqlite>>
+if [ -e .env/echo-nixNote ]; then
+   source .env/echo-nixNote
+fi
+#+END_SRC
 
+**** .env/echo-nixNote CHECK MODIFY
+
+#+HEADER: :tangle ../.env/echo-nixNote
+#+BEGIN_SRC sh
 echo '-*- mode: org -*-
 
 ,* nixpkgs path?
@@ -665,7 +673,7 @@ pkgs.mkShell {
 
 #+BEGIN_SRC sh
 nix-build -I nixpkgs=/nixpkgs-ra/nixpkgs
-nix-build -I .envrc-local
+nix-build -I .env/local
 nix-build -I .envrc
 default.nix -I .envrc
 default.nix
@@ -911,14 +919,14 @@ if ! has nix_direnv_version || ! nix_direnv_version 1.4.0; then
 # https://github.com/nix-community/nix-direnv
   source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/1.4.0/direnvrc" "sha256-4XfVDjv75eHMWN4G725VW7BoOV4Vl3vAabK4YXIfPyE="
 fi
-if [ -e .envrc-local ]; then # source an additional user-specific .envrc in ./.envrc-local
-  source .envrc-local
+if [ -e .env/local ]; then # source an additional user-specific .envrc in ./.env/local
+  source .env/local
 fi
 #+END_SRC
 
-**** .envrc-local
+**** .env/local
 
-#+HEADER: :tangle "../sundry/spine_search_cgi/.envrc-local_"
+#+HEADER: :tangle "../sundry/spine_search_cgi/.env/local_"
 #+BEGIN_SRC sh
 export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
 #export NIX_PATH=nixpkgs=/nixpkgs-ra/nixpkgs
@@ -937,7 +945,15 @@ export SpinePOD=$SpineDOC/markup/pod
 export SpineOUT=<<project_path_local_out_static>>
 export SpineDBpath=<<project_path_sqlite>>
 export SpineCgiBIN=<<project_path_cgi_bin>>
+if [ -e .env/echo-nixNote ]; then # source an additional user-specific .envrc in ./.env/local
+  source .env/echo-nixNote
+fi
+#+END_SRC
 
+**** .env/local
+
+#+HEADER: :tangle "../sundry/spine_search_cgi/.env/echo-nixNote"
+#+BEGIN_SRC sh
 echo '-*- mode: org -*-
 
 ,* nixpkgs path?
diff --git a/sundry/spine_search_cgi/.envrc b/sundry/spine_search_cgi/.envrc
index 03af170..72eefc7 100644
--- a/sundry/spine_search_cgi/.envrc
+++ b/sundry/spine_search_cgi/.envrc
@@ -3,6 +3,6 @@ if ! has nix_direnv_version || ! nix_direnv_version 1.4.0; then
 # https://github.com/nix-community/nix-direnv
   source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/1.4.0/direnvrc" "sha256-4XfVDjv75eHMWN4G725VW7BoOV4Vl3vAabK4YXIfPyE="
 fi
-if [ -e .envrc-local ]; then # source an additional user-specific .envrc in ./.envrc-local
-  source .envrc-local
+if [ -e .env/local ]; then # source an additional user-specific .envrc in ./.env/local
+  source .env/local
 fi