diff options
| -rw-r--r-- | .editorconfig | 28 | ||||
| -rw-r--r-- | .envrc-nix | 1 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | flake.lock | 22 | ||||
| -rw-r--r-- | org/config_env.org | 37 | ||||
| -rw-r--r-- | org/config_git.org | 2 |
6 files changed, 80 insertions, 12 deletions
diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..8a834da --- /dev/null +++ b/.editorconfig @@ -0,0 +1,28 @@ +# EditorConfig : https://editorconfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +# Matches multiple files with brace expansion notation +# Set default charset +[*.{org,d,nix}] +charset = utf-8 + +# Indentation override for all D under src directory +[src/sisudoc/**.d] +indent_style = space +indent_size = 2 + +# Tab indentation (no size specified) +[Makefile] +indent_style = tab + +[{dub.selections.json,dub_describe.json}] +indent_style = space +indent_size = 2 @@ -47,6 +47,7 @@ echo ' • nix flake set default ❯❯ nix build --print-build-logs ❯❯ nix build ".#" --print-build-logs + • nix build using nixpkgs ❯❯ nix build ".#spine-nixpkgs-dmd" --print-build-logs ❯❯ nix build ".#spine-nixpkgs-ldc" --print-build-logs • nix build using package overlays: (dmd, ldc, dub, dtools) @@ -1,4 +1,5 @@ # git ls-files --others --exclude-from=.git/info/exclude +# git ls-files --others --ignored --exclude-standard --directory # git check-ignore -v flake.lock # git clean -ix # find . -name "*_" | xargs rm -rf @@ -6,6 +7,7 @@ * !.gitignore !.gitattributes +!.editorconfig !nix/** !*.nix !flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1775708141, - "narHash": "sha256-MjjhikIgXjNcsEzyZmjKXHk+DaEk5ic2h15DC6w4W50=", + "lastModified": 1775877366, + "narHash": "sha256-W33lhJ9+/KEl1xoGKw/BYHIZpuqjLpDHjlue2CVQrcM=", "ref": "refs/heads/main", - "rev": "bcb38c5014f2870ba7d6412b0b39c757ad4ae725", - "revCount": 29, + "rev": "40ccbcf2cf53b1fd1476e7ced6b70c29d491d464", + "revCount": 30, "type": "git", "url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake" }, @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775793324, - "narHash": "sha256-omax7atcZbol+6HJ2RLpP+ZCFcPa5bZ65Hn71RufeWQ=", + "lastModified": 1777395829, + "narHash": "sha256-HposVFZcsBCevgqLR73w/BpSe8J1lMgw5kASnnxO3A4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d29d5f667d7467f98efc31881e824fa586c927e", + "rev": "e75f25705c2934955ee5075e62530d74aca973c6", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1775741093, - "narHash": "sha256-O/w5qKNcj08PK+s6Bq6DIPgjzgvwLRLbcC3EcTnpRl4=", + "lastModified": 1776910249, + "narHash": "sha256-s3S2Cuu5Os34PH6zmYwV6j+KzaTEfRoXvSDnNkEQxIY=", "ref": "refs/heads/main", - "rev": "f125c5892ce48c60af00dc3114bf2aa8c2014a89", - "revCount": 713, + "rev": "3e60254927f7b7bc271586146f9f49dc756b4027", + "revCount": 729, "type": "git", "url": "git://git.sisudoc.org/software/sisudoc-spine" }, diff --git a/org/config_env.org b/org/config_env.org index 151435b..31b5661 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -108,6 +108,7 @@ echo ' • nix flake set default ❯❯ nix build --print-build-logs ❯❯ nix build ".#" --print-build-logs + • nix build using nixpkgs ❯❯ nix build ".#spine-nixpkgs-dmd" --print-build-logs ❯❯ nix build ".#spine-nixpkgs-ldc" --print-build-logs • nix build using package overlays: (dmd, ldc, dub, dtools) @@ -195,6 +196,40 @@ export SpineDBpath=/var/www/sqlite #export SpineDBpath=/srv/www/spine/sqlite #+END_SRC +* editorconfig + +#+HEADER: :tangle "../.editorconfig" +#+BEGIN_SRC gitignore +# EditorConfig : https://editorconfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +# Matches multiple files with brace expansion notation +# Set default charset +[*.{org,d,nix}] +charset = utf-8 + +# Indentation override for all D under src directory +[src/sisudoc/**.d] +indent_style = space +indent_size = 2 + +# Tab indentation (no size specified) +[Makefile] +indent_style = tab + +[{dub.selections.json,dub_describe.json}] +indent_style = space +indent_size = 2 +#+END_SRC + * org includes - versions GET ** direnv @@ -249,7 +284,7 @@ export SpineDBpath=/var/www/sqlite <<./nix-develop-dlang-shared.org:dtools-version()>> #+END_SRC -** spine project VERSION :version:set:project: +** spine project VERSION #+NAME: spine_version #+HEADER: :noweb yes diff --git a/org/config_git.org b/org/config_git.org index 220cad7..6a0cdbe 100644 --- a/org/config_git.org +++ b/org/config_git.org @@ -21,6 +21,7 @@ #+HEADER: :tangle "../.gitignore" #+BEGIN_SRC gitignore # git ls-files --others --exclude-from=.git/info/exclude +# git ls-files --others --ignored --exclude-standard --directory # git check-ignore -v flake.lock # git clean -ix # find . -name "*_" | xargs rm -rf @@ -28,6 +29,7 @@ ,* !.gitignore !.gitattributes +!.editorconfig !nix/** !*.nix !flake.lock |