diff options
Diffstat (limited to 'org')
| -rw-r--r-- | org/config_env.org | 16 | ||||
| -rw-r--r-- | org/config_git.org | 6 | ||||
| -rw-r--r-- | org/config_nix.org | 22 | ||||
| -rw-r--r-- | org/nix-develop-dlang-shared.org | 17 |
4 files changed, 51 insertions, 10 deletions
diff --git a/org/config_env.org b/org/config_env.org index 902d1b3..a39978d 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -33,6 +33,7 @@ fi #+NAME: envrc #+HEADER: :tangle ../.envrc +#+HEADER: :tangle-mode (identity #o644) #+HEADER: :shebang "# -*- mode: sh -*-" #+BEGIN_SRC shell if [ -f .envrc-git-init ]; then @@ -56,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 @@ -138,6 +140,7 @@ echo "• ** .envrc-git-init #+HEADER: :tangle ../.envrc-git-init +#+HEADER: :tangle-mode (identity #o644) #+HEADER: :shebang "# -*- mode: sh -*-" #+HEADER: :noweb yes #+BEGIN_SRC shell @@ -165,6 +168,7 @@ SpineProjVer=`rg "Version\((\d+), (\d+), (\d+)\)" views/version.txt | sed -E 's/ - bespoke modify appropriately and generate if needed #+HEADER: :tangle ../.envrc-local_ +#+HEADER: :tangle-mode (identity #o644) #+HEADER: :shebang "# -*- mode: sh -*-" #+HEADER: :noweb yes #+BEGIN_SRC shell diff --git a/org/config_git.org b/org/config_git.org index 4d85fd8..d0950e1 100644 --- a/org/config_git.org +++ b/org/config_git.org @@ -49,15 +49,15 @@ !configuration.txt !*.json !*.sdl -!*.md !meson.build !tangle !*.org !org !org/*.org +!*.md +!*.txt !*.d !*.rb -!*.txt !doc !doc/** !man @@ -113,7 +113,9 @@ tmp/** ,*_.org ,*_.nix ,*_.d +,*_.md ,*_.txt +,*_.json ,*_ !.envrc-local_ ,*.swp diff --git a/org/config_nix.org b/org/config_nix.org index 22e45b4..59a052b 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -254,6 +254,8 @@ inherit shell; inherit devEnv; packages = with pkgs-ovl; [ + direnv + nix-direnv ldc #dmd dub @@ -270,6 +272,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv dmd dub dtools @@ -285,6 +289,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc dub dtools @@ -300,6 +306,8 @@ inherit shell; inherit devEnv; packages = with pkgs-ovl; [ + direnv + nix-direnv dmd dub dtools @@ -315,6 +323,8 @@ inherit shell; inherit devEnv; packages = with pkgs-ovl; [ + direnv + nix-direnv ldc dub dtools @@ -328,6 +338,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -359,6 +371,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -382,6 +396,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -401,6 +417,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -417,6 +435,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -449,6 +469,7 @@ with pkgs-nix; # ❯❯❯ nix_related #nix direnv + nix-direnv nixVersions.latest #nixVersions.latest #nixVersions.git nix-prefetch-git validatePkgConfig @@ -529,6 +550,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 fec2815..005d7f7 100644 --- a/org/nix-develop-dlang-shared.org +++ b/org/nix-develop-dlang-shared.org @@ -27,6 +27,7 @@ check for latest version: update direnv version and sha hash: - emacs org/nix-develop-dlang-shared.org +- direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/3.1.0/direnvrc re-tangle file: @@ -40,16 +41,28 @@ update flake.lock: #+NAME: direnv-version #+BEGIN_SRC org -<<direnv_version_3_0_7>> +<<direnv_version_3_1_0>> #+END_SRC #+NAME: direnv-hash #+BEGIN_SRC org -<<direnv_hash_3_0_7>> +<<direnv_hash_3_1_0>> #+END_SRC *** versions +**** 3.1.0 + +#+NAME: direnv_version_3_1_0 +#+BEGIN_SRC org +3.1.0 +#+END_SRC + +#+NAME: direnv_hash_3_1_0 +#+BEGIN_SRC org +sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM= +#+END_SRC + **** 3.0.7 #+NAME: direnv_version_3_0_7 |