diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2023-12-07 17:32:31 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2023-12-11 12:09:39 -0500 |
| commit | 844e0b64b2a00f1026075979c2cbd548dcb5f80b (patch) | |
| tree | 1d8dbd6cd8e9728cfb7e51716dcbaf94b4f0895e /org/config_env.org | |
| parent | poem substitution (diff) | |
nix flake related modifications
Diffstat (limited to 'org/config_env.org')
| -rw-r--r-- | org/config_env.org | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/org/config_env.org b/org/config_env.org index cb24dae..5d06d74 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -20,9 +20,9 @@ - [[./config_make.org][config_make.org]] * envrc -** envrc :envrc: +** nixDevEnv envrc :envrc: -#+HEADER: :tangle ../.envrc +#+HEADER: :tangle ../nixDevEnv.sh #+BEGIN_SRC sh if [ -f .envrc-git-init ]; then source_env_if_exists .envrc-git-init || source .envrc-git-init @@ -35,6 +35,18 @@ if [ -f .envrc-nix ]; then fi #+END_SRC +** envrc :envrc: + +#+HEADER: :tangle ../.envrc +#+BEGIN_SRC sh +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 +fi +#+END_SRC + ** .envrc-nix - https://github.com/nix-community/nix-direnv @@ -55,12 +67,12 @@ watch_file flake.lock watch_file flake.nix watch_file shell.nix watch_file makefile -watch_file .envrc +watch_file nixDevEnv.sh watch_file .envrc-local watch_file .envrc-nix nix_direnv_watch_file flake.nix nix_direnv_watch_file shell.nix -nix_direnv_watch_file .envrc +nix_direnv_watch_file nixDevEnv.sh nix_direnv_watch_file .envrc-local nix_direnv_watch_file .envrc-nix nix flake update |