diff options
| -rw-r--r-- | .envrc | 3 | ||||
| -rw-r--r-- | .envrc-git-init | 1 | ||||
| -rw-r--r-- | .envrc-local_ | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | .envrc-nix | 12 | ||||
| -rw-r--r-- | .gitignore | 14 | ||||
| -rw-r--r-- | devenv.nix | 1 | ||||
| -rw-r--r-- | flake.lock | 14 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | org/config_env.org | 41 | ||||
| -rw-r--r-- | org/config_git.org | 16 | ||||
| -rw-r--r-- | org/config_nix.org | 2 | ||||
| -rw-r--r-- | org/nix-develop-dlang-shared.org | 60 | ||||
| -rwxr-xr-x | shell.nix | 1 |
13 files changed, 64 insertions, 106 deletions
@@ -1,8 +1,11 @@ +# -*- mode: 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 +elif [ -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 diff --git a/.envrc-git-init b/.envrc-git-init index ca74ec3..d78e46b 100644 --- a/.envrc-git-init +++ b/.envrc-git-init @@ -1,3 +1,4 @@ +# -*- mode: sh -*- if [[ ! -d ./.git ]]; then git init git add . diff --git a/.envrc-local_ b/.envrc-local_ index 392dd6e..23b2355 100644 --- a/.envrc-local_ +++ b/.envrc-local_ @@ -1,3 +1,4 @@ +# -*- mode: sh -*- export SpineVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g') export SpineSearchBIN=result/share/cgi-bin # ❯❯ cgi search form name: diff --git a/.envrc-nix b/.envrc-nix index e49eba4..016cc18 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 @@ -11,11 +11,8 @@ !flake.lock !nixDevEnv.sh !.envrc -!.envrc-local !.envrc-nix !.envrc-git-init -!.env -!.env/** !nix-overlays !nix-overlays/** !README.md @@ -32,6 +29,8 @@ !*.org !org !org/*.org +!*.md +!*.txt !*.d !*.rb !*.txt @@ -50,16 +49,17 @@ tmp/** *_.org *_.nix *_.d +*_.md *_.txt *_ -*.swp -*~ -\#* -*.\#* !.envrc-local_ !src/sisudoc/spine_search.d_ !views/configuration.txt_remotehost_ !views/configuration.txt_localhost_ +*.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": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1772401501, - "narHash": "sha256-7cKJSsl+lXSeqwDemc8KYPGOjpvvHArOktHPFE0UzhM=", + "lastModified": 1772748350, + "narHash": "sha256-UwH0m6iqKHqFSbSc63UqjPNis2OprQ7K4h8C+OVUNtI=", "ref": "refs/heads/main", - "rev": "28b68997e1e337d0d20de38e953107c48fb079be", - "revCount": 27, + "rev": "c08461dc2b99618171de1973dc2218d3d14e9fba", + "revCount": 28, "type": "git", "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake" }, @@ -211,7 +211,7 @@ with pkgs-nix; { dsh-d-overlay = spine-d-overlay.devShells.${system}.default; dsh-overlay = mkShell { - name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.40.0"; + name = "spine-0.18.0 base dev shell, ldc-1.42.0, dub-1.40.0"; inherit shell; inherit devEnv; packages = with pkgs-ovl; [ @@ -260,7 +260,7 @@ inherit shellHook; }; dsh-overlay-ldc-dub = mkShell { - name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.40.0"; + name = "spine-0.18.0 base dev shell, ldc-1.42.0, dub-1.40.0"; inherit shell; inherit devEnv; packages = with pkgs-ovl; [ diff --git a/org/config_env.org b/org/config_env.org index 75732ca..8aa8fa7 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -33,12 +33,16 @@ fi #+NAME: envrc #+HEADER: :tangle ../.envrc +#+HEADER: :tangle-mode (identity #o644) +#+HEADER: :shebang "# -*- mode: sh -*-" #+BEGIN_SRC shell 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 +elif [ -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 @@ -53,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 @@ -119,6 +124,8 @@ echo ' ** .envrc-git-init #+HEADER: :tangle ../.envrc-git-init +#+HEADER: :tangle-mode (identity #o644) +#+HEADER: :shebang "# -*- mode: sh -*-" #+HEADER: :noweb yes #+BEGIN_SRC shell if [[ ! -d ./.git ]]; then @@ -131,7 +138,9 @@ fi - bespoke modify appropriately and generate if needed -#+HEADER: :tangle ../.envrc-local +#+HEADER: :tangle ../.envrc-local_ +#+HEADER: :tangle-mode (identity #o644) +#+HEADER: :shebang "# -*- mode: sh -*-" #+HEADER: :noweb yes #+BEGIN_SRC shell export SpineVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g') @@ -142,7 +151,7 @@ export SpineCGIform='spine_search' export SpineCGIbin=/var/www/cgi/cgi-bin #+END_SRC -* versions GET +* org includes - versions GET ** direnv #+NAME: direnv_version @@ -157,14 +166,6 @@ export SpineCGIbin=/var/www/cgi/cgi-bin <<./nix-develop-dlang-shared.org:direnv-hash()>> #+END_SRC -** spine project VERSION :version:set:project: - -#+NAME: spine_version -#+HEADER: :noweb yes -#+BEGIN_SRC emacs-lisp -<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>> -#+END_SRC - ** dlang overlays *** ldc @@ -198,4 +199,12 @@ export SpineCGIbin=/var/www/cgi/cgi-bin <<./nix-develop-dlang-shared.org:dtools-version()>> #+END_SRC +** spine project VERSION :version:set:project: + +#+NAME: spine_version +#+HEADER: :noweb yes +#+BEGIN_SRC emacs-lisp +<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>> +#+END_SRC + * __END__ diff --git a/org/config_git.org b/org/config_git.org index 014155e..f84a67b 100644 --- a/org/config_git.org +++ b/org/config_git.org @@ -15,7 +15,7 @@ #+PROPERTY: header-args+ :mkdirp yes #+OPTIONS: H:3 num:nil toc:t \n:t ::t |:t ^:nil -:t f:t *:t -* spine +* git config spine search ** .gitignore :gitignore: #+HEADER: :tangle "../.gitignore" @@ -33,11 +33,8 @@ !flake.lock !nixDevEnv.sh !.envrc -!.envrc-local !.envrc-nix !.envrc-git-init -!.env -!.env/** !nix-overlays !nix-overlays/** !README.md @@ -54,6 +51,8 @@ !*.org !org !org/*.org +!*.md +!*.txt !*.d !*.rb !*.txt @@ -72,16 +71,17 @@ tmp/** ,*_.org ,*_.nix ,*_.d +,*_.md ,*_.txt ,*_ -,*.swp -,*~ -\#* -,*.\#* !.envrc-local_ !src/sisudoc/spine_search.d_ !views/configuration.txt_remotehost_ !views/configuration.txt_localhost_ +,*.swp +,*~ +\#* +,*.\#* #!*/ #\#* #*.\#* diff --git a/org/config_nix.org b/org/config_nix.org index b371dab..142964e 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -327,6 +327,7 @@ with pkgs-nix; # ❯❯❯ nix_related #nix direnv + nix-direnv nixVersions.latest #nixVersions.latest #nixVersions.git nix-prefetch-git validatePkgConfig @@ -397,6 +398,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 005d7f7..d11b752 100644 --- a/org/nix-develop-dlang-shared.org +++ b/org/nix-develop-dlang-shared.org @@ -63,66 +63,6 @@ update flake.lock: sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM= #+END_SRC -**** 3.0.7 - -#+NAME: direnv_version_3_0_7 -#+BEGIN_SRC org -3.0.7 -#+END_SRC - -#+NAME: direnv_hash_3_0_7 -#+BEGIN_SRC org -sha256-bn8WANE5a91RusFmRI7kS751ApelG02nMcwRekC/qzc= -#+END_SRC - -**** 3.0.6 - -#+NAME: direnv_version_3_0_6 -#+BEGIN_SRC org -3.0.6 -#+END_SRC - -#+NAME: direnv_hash_3_0_6 -#+BEGIN_SRC org -sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM= -#+END_SRC - -**** 3.0.4 - -#+NAME: direnv_version_3_0_4 -#+BEGIN_SRC org -3.0.4 -#+END_SRC - -#+NAME: direnv_hash_3_0_4 -#+BEGIN_SRC org -sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4= -#+END_SRC - -**** 3.0.0 - -#+NAME: direnv_version_3_0_0 -#+BEGIN_SRC org -3.0.0 -#+END_SRC - -#+NAME: direnv_hash_3_0_0 -#+BEGIN_SRC org -sha256-21TMnI2xWX7HkSTjFFri2UaohXVj854mgvWapWrxRXg= -#+END_SRC - -**** 2.4.0 - -#+NAME: direnv_version_2_4_0 -#+BEGIN_SRC org -2.4.0 -#+END_SRC - -#+NAME: direnv_hash_2_4_0 -#+BEGIN_SRC org -sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U= -#+END_SRC - * dlang ** ldc *** tags link @@ -7,6 +7,7 @@ with pkgs-nix; # ❯❯❯ nix_related #nix direnv + nix-direnv nixVersions.latest #nixVersions.latest #nixVersions.git nix-prefetch-git validatePkgConfig |