diff options
| -rw-r--r--[-rwxr-xr-x] | .envrc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | .envrc-git-init | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | .envrc-local_ | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | .envrc-nix | 12 | ||||
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | devenv.nix | 1 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | flake.nix | 28 | ||||
| -rw-r--r-- | org/config_env.org | 16 | ||||
| -rw-r--r-- | org/config_git.org | 6 | ||||
| -rw-r--r-- | org/config_nix.org | 22 | ||||
| -rwxr-xr-x | shell.nix | 1 |
12 files changed, 75 insertions, 23 deletions
diff --git a/.envrc-git-init b/.envrc-git-init index d78e46b..d78e46b 100755..100644 --- a/.envrc-git-init +++ b/.envrc-git-init diff --git a/.envrc-local_ b/.envrc-local_ index 85c5b09..85c5b09 100755..100644 --- a/.envrc-local_ +++ b/.envrc-local_ diff --git a/.envrc-nix b/.envrc-nix index b66dd3c..9ae9caa 100755..100644 --- a/.envrc-nix +++ b/.envrc-nix @@ -1,11 +1,11 @@ # -*- mode: nix -*- NIX_ENFORCE_PURITY=1 -# - https://github.com/nix-community/nix-direnv -NixDirEnvVersion="3.1.0" -NixDirEnvSHA="sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM=" -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="3.1.0" +#NixDirEnvSHA="sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM=" +#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 @@ -25,15 +25,15 @@ !configuration.txt !*.json !*.sdl -!*.md !meson.build !tangle !*.org !org !org/*.org +!*.md +!*.txt !*.d !*.rb -!*.txt !doc !doc/** !man @@ -89,7 +89,9 @@ tmp/** *_.org *_.nix *_.d +*_.md *_.txt +*_.json *_ !.envrc-local_ *.swp @@ -10,6 +10,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 @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1772674223, - "narHash": "sha256-/suKbHSaSmuC9UY7G0VRQ3aO+QKqxAQPQ19wG7QNkF8=", + "lastModified": 1773628058, + "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66d9241e3dc2296726dc522e62dbfe89c7b449f3", + "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", "type": "github" }, "original": { @@ -21,7 +21,7 @@ runHook postCheck ''; localOverlay = (final: prev: { - ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.41.0 + ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.42.0 dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok 2.111.0 dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.40.0 dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.110.0 @@ -158,7 +158,7 @@ spine-overlay-ldc = stdenv.mkDerivation { inherit pname; inherit version; - #name = "spine-0.18.0 ldc-1.41.0 dub-1.40.0"; + #name = "spine-0.18.0 ldc-1.42.0 dub-1.40.0"; meta.mainProgram = "spine-ldc"; executable = true; src = self; @@ -227,10 +227,12 @@ in with pkgs-nix; { dsh-overlay = mkShell { - name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.40.0 - dtools-2.110.0"; + name = "spine-0.18.0 base dev shell, ldc-1.42.0, dub-1.40.0 - dtools-2.110.0"; inherit shell; inherit devEnv; packages = with pkgs-ovl; [ + direnv + nix-direnv ldc #dmd dub @@ -247,6 +249,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv dmd dub dtools @@ -262,6 +266,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc dub dtools @@ -277,6 +283,8 @@ inherit shell; inherit devEnv; packages = with pkgs-ovl; [ + direnv + nix-direnv dmd dub dtools @@ -288,10 +296,12 @@ inherit shellHook; }; dsh-overlay-ldc = mkShell { - name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.40.0 - dtools-2.110.0"; + name = "spine-0.18.0 base dev shell, ldc-1.42.0, dub-1.40.0 - dtools-2.110.0"; inherit shell; inherit devEnv; packages = with pkgs-ovl; [ + direnv + nix-direnv ldc dub dtools @@ -305,6 +315,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -336,6 +348,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -359,6 +373,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -378,6 +394,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub @@ -394,6 +412,8 @@ inherit shell; inherit devEnv; packages = [ + direnv + nix-direnv ldc #dmd dub 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 @@ -7,6 +7,7 @@ with pkgs-nix; # ❯❯❯ nix_related #nix direnv + nix-direnv nixVersions.latest #nixVersions.latest #nixVersions.git nix-prefetch-git validatePkgConfig |