diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2023-12-08 12:22:37 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2023-12-17 20:05:23 -0500 |
| commit | 7c0c0e6041fb202a62d764e8f2a617917424b0a3 (patch) | |
| tree | 4768d465f2def600b46592d58639495027fbbd2e /org | |
| parent | config_dub.org remove some unused parts (diff) | |
.envrc re-adjust & update direnv
- nixDirEnv (a copy of .envrc) used for flake.nix
(getting around an issue that arose when
building project; may revert to direct use of
.envrc)
Diffstat (limited to 'org')
| -rw-r--r-- | org/config_env.org | 52 | ||||
| -rw-r--r-- | org/config_nix.org | 1 | ||||
| -rw-r--r-- | org/nixpkgs_overlays_d_related.org | 5 |
3 files changed, 35 insertions, 23 deletions
diff --git a/org/config_env.org b/org/config_env.org index 5d06d74..71445ab 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -24,19 +24,14 @@ #+HEADER: :tangle ../nixDevEnv.sh #+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 -if [ -f .envrc-nix ]; then - source_env_if_exists .envrc-nix || source .envrc-nix +if [ -f .envrc ]; then + source_env_if_exists .envrc || source .envrc fi #+END_SRC ** envrc :envrc: +#+NAME: envrc #+HEADER: :tangle ../.envrc #+BEGIN_SRC sh if [ -f .envrc-git-init ]; then @@ -45,6 +40,9 @@ fi if [ -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 +fi #+END_SRC ** .envrc-nix @@ -70,27 +68,45 @@ watch_file makefile 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 nixDevEnv.sh -nix_direnv_watch_file .envrc-local -nix_direnv_watch_file .envrc-nix -nix flake update -nix flake check -nix flake show -echo "" PATH_add result/bin use flake . #use flake .#default +echo " +- consider running: + ❯❯ nix flake show + ❯❯ nix flake update && nix flake check && nix flake show + +- for a dev shell: + ❯❯ nix develop + ❯❯ nix develop ".#" --print-build-logs -c zsh + +- to build project: + ❯❯ nix build ".#spine-nixpkgs-ldc" --print-build-logs + ❯❯ nix build ".#spine-overlay-ldc" --print-build-logs + - (see nix other/additional build options): + ❯❯ nix flake show +" #+END_SRC +*** 3.0.0 + #+NAME: direnv-version #+BEGIN_SRC sh -2.4.0 +3.0.0 #+END_SRC #+NAME: direnv-sha #+BEGIN_SRC sh +sha256-21TMnI2xWX7HkSTjFFri2UaohXVj854mgvWapWrxRXg= +#+END_SRC + +*** 2.4.0 + +#+BEGIN_SRC sh +2.4.0 +#+END_SRC + +#+BEGIN_SRC sh sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U= #+END_SRC diff --git a/org/config_nix.org b/org/config_nix.org index 6ff0866..225a287 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -263,6 +263,7 @@ epr sigil calibre #(suite includes: ebook-viewer) + koreader foliate ]; inherit shellHook; diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org index fa2ad33..5f85891 100644 --- a/org/nixpkgs_overlays_d_related.org +++ b/org/nixpkgs_overlays_d_related.org @@ -276,11 +276,6 @@ watch_file makefile 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 nixDevEnv.sh -nix_direnv_watch_file .envrc-local -nix_direnv_watch_file .envrc-nix nix flake update nix flake check nix flake show |