aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2021-06-27 16:59:44 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2021-08-01 07:46:58 -0400
commit4d5ee2ead874c7a436faa8754eb99215927ea94d (patch)
treec1519c0b8db2302bcf46ffdce04a6580d7a012e5
parentorg-mode code block headers (diff)
dir rename ./sundry (from ./misc)
-rw-r--r--.gitignore4
-rwxr-xr-xdefault.nix3
-rw-r--r--dub.json3
-rw-r--r--flake.nix2
-rw-r--r--makefile32
-rw-r--r--org/out_cgi_search_sqlite.org2
-rw-r--r--org/out_latex.org2
-rw-r--r--org/spine_build_scaffold.org199
-rw-r--r--org/spine_info.org2
-rw-r--r--org/util_cgi_d_sqlite_search.org6
-rw-r--r--org/util_cgi_rb_fcgi_sqlite_search.org32
-rw-r--r--org/util_spine_markup_conversion_from_sisu.org8
-rw-r--r--org/util_spine_syntax_highlighting_emacs.org6
-rw-r--r--org/util_spine_syntax_highlighting_vim.org20
-rwxr-xr-xshell.nix29
-rw-r--r--sundry/misc/editor-syntax-etc/README (renamed from misc/editor-syntax-etc/README)0
-rw-r--r--sundry/misc/editor-syntax-etc/emacs/README (renamed from misc/editor-syntax-etc/emacs/README)0
-rw-r--r--sundry/misc/editor-syntax-etc/emacs/sisu-spine-mode-autoloads.el (renamed from misc/editor-syntax-etc/emacs/sisu-spine-mode-autoloads.el)0
-rw-r--r--sundry/misc/editor-syntax-etc/emacs/sisu-spine-mode.el (renamed from misc/editor-syntax-etc/emacs/sisu-spine-mode.el)0
-rw-r--r--sundry/misc/editor-syntax-etc/gedit/sisu.lang (renamed from misc/editor-syntax-etc/gedit/sisu.lang)0
-rw-r--r--sundry/misc/editor-syntax-etc/kate/sisu.xml (renamed from misc/editor-syntax-etc/kate/sisu.xml)0
-rw-r--r--sundry/misc/editor-syntax-etc/nano/nanorc (renamed from misc/editor-syntax-etc/nano/nanorc)0
-rw-r--r--sundry/misc/editor-syntax-etc/nedit/sisu_nedit.pats (renamed from misc/editor-syntax-etc/nedit/sisu_nedit.pats)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/8.vim (renamed from misc/editor-syntax-etc/vim/colors/8.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/def-ruby.vim (renamed from misc/editor-syntax-etc/vim/colors/def-ruby.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/def-sisu.vim (renamed from misc/editor-syntax-etc/vim/colors/def-sisu.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/def.vim (renamed from misc/editor-syntax-etc/vim/colors/def.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/def256-ruby.vim (renamed from misc/editor-syntax-etc/vim/colors/def256-ruby.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/def256-sisu.vim (renamed from misc/editor-syntax-etc/vim/colors/def256-sisu.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/def256.vim (renamed from misc/editor-syntax-etc/vim/colors/def256.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim (renamed from misc/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim (renamed from misc/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/frugal-cterm.vim (renamed from misc/editor-syntax-etc/vim/colors/frugal-cterm.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/frugal.vim (renamed from misc/editor-syntax-etc/vim/colors/frugal.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/slate.vim (renamed from misc/editor-syntax-etc/vim/colors/slate.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim (renamed from misc/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim (renamed from misc/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/filetype.vim (renamed from misc/editor-syntax-etc/vim/filetype.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/ftplugin/sisu.vim (renamed from misc/editor-syntax-etc/vim/ftplugin/sisu.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/ftplugin/sisurb.vim (renamed from misc/editor-syntax-etc/vim/ftplugin/sisurb.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/rc/vimrc_statusline (renamed from misc/editor-syntax-etc/vim/rc/vimrc_statusline)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/syntax/sisu.vim (renamed from misc/editor-syntax-etc/vim/syntax/sisu.vim)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/templates/ssi.tpl (renamed from misc/editor-syntax-etc/vim/templates/ssi.tpl)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/templates/ssm.tpl (renamed from misc/editor-syntax-etc/vim/templates/ssm.tpl)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/templates/sst.tpl (renamed from misc/editor-syntax-etc/vim/templates/sst.tpl)0
-rw-r--r--sundry/misc/editor-syntax-etc/vim/vim-sisu.yaml (renamed from misc/editor-syntax-etc/vim/vim-sisu.yaml)0
-rw-r--r--sundry/misc/ext_lib/src/arsd/README (renamed from misc/ext_lib/src/arsd/README)0
-rw-r--r--sundry/misc/ext_lib/src/arsd/cgi.d (renamed from misc/ext_lib/src/arsd/cgi.d)0
-rw-r--r--sundry/misc/util/d/cgi/search/README (renamed from misc/util/d/cgi/search/README)0
-rw-r--r--sundry/misc/util/d/cgi/search/dub.sdl (renamed from misc/util/d/cgi/search/dub.sdl)0
-rw-r--r--sundry/misc/util/d/cgi/search/src/spine_cgi_sqlite_search.d (renamed from misc/util/d/cgi/search/src/spine_cgi_sqlite_search.d)0
-rw-r--r--sundry/misc/util/d/tools/markup_conversion/README (renamed from misc/util/d/tools/markup_conversion/README)0
-rwxr-xr-xsundry/misc/util/d/tools/markup_conversion/endnotes_inline_from_binary.d (renamed from misc/util/d/tools/markup_conversion/endnotes_inline_from_binary.d)0
-rw-r--r--sundry/misc/util/d/tools/markup_conversion/markup_changes.d (renamed from misc/util/d/tools/markup_conversion/markup_changes.d)0
-rwxr-xr-xsundry/misc/util/d/tools/markup_conversion/markup_changes_header_and_content.d (renamed from misc/util/d/tools/markup_conversion/markup_changes_header_and_content.d)0
-rwxr-xr-xsundry/misc/util/d/tools/markup_conversion/markup_conversion_from_sisu_ruby_to_sisu_spine.d (renamed from misc/util/d/tools/markup_conversion/markup_conversion_from_sisu_ruby_to_sisu_spine.d)0
-rwxr-xr-xsundry/misc/util/d/tools/spine_scaffold.d (renamed from misc/util/d/tools/spine_scaffold.d)0
-rwxr-xr-xsundry/misc/util/rb/cgi/spine.search.cgi (renamed from misc/util/rb/cgi/spine.search.cgi)0
-rwxr-xr-xsundry/misc/util/rb/tex/dr_tex.rb (renamed from misc/util/rb/tex/dr_tex.rb)0
-rw-r--r--sundry/spine_search_cgi/.gitignore46
60 files changed, 242 insertions, 154 deletions
diff --git a/.gitignore b/.gitignore
index 3790a8b..b6917dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,8 +19,8 @@
!man
!man/**
!org
-!misc
-!misc/**
+!sundry
+!sundry/**
!*.nix
!nix
!nix/**
diff --git a/default.nix b/default.nix
index fa1969f..5cc3592 100755
--- a/default.nix
+++ b/default.nix
@@ -84,8 +84,7 @@ mkDubDerivation rec {
version = "0.11.3";
src = ./.;
buildInputs = [
- pkgs.sqlite
- (
+ pkgs.sqlite (
with pkgs; [
nixFlakes
rund
diff --git a/dub.json b/dub.json
index 088f5e7..dd817a5 100644
--- a/dub.json
+++ b/dub.json
@@ -42,7 +42,8 @@
"sourcePaths": [ "./src/ext_depends/d2sqlite3/source" ],
"configurations": [
{
- "name": "with-lib",
+ "name": "d2sqlite3",
+ "d2sqlite3": "with-lib",
"targetType": "library",
"systemDependencies": "SQLite version >= 3.8.7",
"libs": [ "sqlite3" ],
diff --git a/flake.nix b/flake.nix
index 759fb8b..9c8709c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
description = "a sisu like document parser";
inputs = {
flake-utils.url = "github:numtide/flake-utils";
- nixpkgs.url = "/nixpkgs-ra/nixpkgs";
+ nixpkgs.url = "github:nixos/nixpkgs";
};
outputs = { self, nixpkgs, flake-utils }:
let
diff --git a/makefile b/makefile
index 400d0cf..e386448 100644
--- a/makefile
+++ b/makefile
@@ -226,14 +226,14 @@ skel:
mkdir -p build; \
mkdir -p views; \
mkdir -p data; \
- mkdir -p misc/util/d/cgi/search/cgi-bin/src; \
- mkdir -p misc/util/d/tools/markup_conversion; \
- mkdir -p misc/editor-syntax-etc/emacs; \
- mkdir -p misc/editor-syntax-etc/vim/syntax; \
- mkdir -p misc/editor-syntax-etc/vim/colors; \
- mkdir -p misc/editor-syntax-etc/vim/ftplugin; \
- mkdir -p misc/editor-syntax-etc/vim/rc; \
- mkdir -p misc/editor-syntax-etc/vim/templates; \
+ mkdir -p sundry/util/d/cgi/search/cgi-bin/src; \
+ mkdir -p sundry/util/d/tools/markup_conversion; \
+ mkdir -p sundry/editor-syntax-etc/emacs; \
+ mkdir -p sundry/editor-syntax-etc/vim/syntax; \
+ mkdir -p sundry/editor-syntax-etc/vim/colors; \
+ mkdir -p sundry/editor-syntax-etc/vim/ftplugin; \
+ mkdir -p sundry/editor-syntax-etc/vim/rc; \
+ mkdir -p sundry/editor-syntax-etc/vim/templates; \
mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/conf; \
mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/io_in; \
mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/io_out; \
@@ -261,14 +261,14 @@ expunge:
distclean: expunge
distclean_and_init: expunge
mkdir -p views; \
- mkdir -p misc/util/d/cgi/search/cgi-bin/src; \
- mkdir -p misc/util/d/tools/markup_conversion; \
- mkdir -p misc/editor-syntax-etc/emacs; \
- mkdir -p misc/editor-syntax-etc/vim/syntax; \
- mkdir -p misc/editor-syntax-etc/vim/colors; \
- mkdir -p misc/editor-syntax-etc/vim/ftplugin; \
- mkdir -p misc/editor-syntax-etc/vim/rc; \
- mkdir -p misc/editor-syntax-etc/vim/templates; \
+ mkdir -p sundry/util/d/cgi/search/cgi-bin/src; \
+ mkdir -p sundry/util/d/tools/markup_conversion; \
+ mkdir -p sundry/editor-syntax-etc/emacs; \
+ mkdir -p sundry/editor-syntax-etc/vim/syntax; \
+ mkdir -p sundry/editor-syntax-etc/vim/colors; \
+ mkdir -p sundry/editor-syntax-etc/vim/ftplugin; \
+ mkdir -p sundry/editor-syntax-etc/vim/rc; \
+ mkdir -p sundry/editor-syntax-etc/vim/templates; \
mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR); \
mkdir -p $(PRG_BINDIR);
ver:
diff --git a/org/out_cgi_search_sqlite.org b/org/out_cgi_search_sqlite.org
index 3a5595d..64adb91 100644
--- a/org/out_cgi_search_sqlite.org
+++ b/org/out_cgi_search_sqlite.org
@@ -2272,7 +2272,7 @@ configuration "default" {
* cgi-search README
-#+HEADER: :NO-tangle "../misc/util/d/cgi/search/README"
+#+HEADER: :NO-tangle "../sundry/util/d/cgi/search/README"
#+BEGIN_SRC text
change db name to match name of db you create
cv.db_selected = "spine.search.sql.db";
diff --git a/org/out_latex.org b/org/out_latex.org
index b278cda..4156071 100644
--- a/org/out_latex.org
+++ b/org/out_latex.org
@@ -1939,7 +1939,7 @@ string latex_tail(M)(
* latex system command helper script
** latex command, ruby script
-#+HEADER: :tangle "../misc/util/rb/tex/dr_tex.rb"
+#+HEADER: :tangle "../sundry/util/rb/tex/dr_tex.rb"
#+HEADER: :tangle-mode (identity #o755)
#+HEADER: :shebang #!/usr/bin/env ruby
#+BEGIN_SRC ruby
diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org
index f4d950e..a91caf1 100644
--- a/org/spine_build_scaffold.org
+++ b/org/spine_build_scaffold.org
@@ -614,14 +614,14 @@ skel:
mkdir -p build; \
mkdir -p views; \
mkdir -p data; \
- mkdir -p misc/util/d/cgi/search/cgi-bin/src; \
- mkdir -p misc/util/d/tools/markup_conversion; \
- mkdir -p misc/editor-syntax-etc/emacs; \
- mkdir -p misc/editor-syntax-etc/vim/syntax; \
- mkdir -p misc/editor-syntax-etc/vim/colors; \
- mkdir -p misc/editor-syntax-etc/vim/ftplugin; \
- mkdir -p misc/editor-syntax-etc/vim/rc; \
- mkdir -p misc/editor-syntax-etc/vim/templates; \
+ mkdir -p sundry/util/d/cgi/search/cgi-bin/src; \
+ mkdir -p sundry/util/d/tools/markup_conversion; \
+ mkdir -p sundry/editor-syntax-etc/emacs; \
+ mkdir -p sundry/editor-syntax-etc/vim/syntax; \
+ mkdir -p sundry/editor-syntax-etc/vim/colors; \
+ mkdir -p sundry/editor-syntax-etc/vim/ftplugin; \
+ mkdir -p sundry/editor-syntax-etc/vim/rc; \
+ mkdir -p sundry/editor-syntax-etc/vim/templates; \
mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/conf; \
mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/io_in; \
mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR)/io_out; \
@@ -649,14 +649,14 @@ expunge:
distclean: expunge
distclean_and_init: expunge
mkdir -p views; \
- mkdir -p misc/util/d/cgi/search/cgi-bin/src; \
- mkdir -p misc/util/d/tools/markup_conversion; \
- mkdir -p misc/editor-syntax-etc/emacs; \
- mkdir -p misc/editor-syntax-etc/vim/syntax; \
- mkdir -p misc/editor-syntax-etc/vim/colors; \
- mkdir -p misc/editor-syntax-etc/vim/ftplugin; \
- mkdir -p misc/editor-syntax-etc/vim/rc; \
- mkdir -p misc/editor-syntax-etc/vim/templates; \
+ mkdir -p sundry/util/d/cgi/search/cgi-bin/src; \
+ mkdir -p sundry/util/d/tools/markup_conversion; \
+ mkdir -p sundry/editor-syntax-etc/emacs; \
+ mkdir -p sundry/editor-syntax-etc/vim/syntax; \
+ mkdir -p sundry/editor-syntax-etc/vim/colors; \
+ mkdir -p sundry/editor-syntax-etc/vim/ftplugin; \
+ mkdir -p sundry/editor-syntax-etc/vim/rc; \
+ mkdir -p sundry/editor-syntax-etc/vim/templates; \
mkdir -p $(PRG_SRCDIR)/$(PRG_NAME_DIR); \
mkdir -p $(PRG_BINDIR);
#+END_SRC
@@ -1200,7 +1200,8 @@ gitsnapshot: distclean tangle
"sourcePaths": [ "./src/ext_depends/d2sqlite3/source" ],
"configurations": [
{
- "name": "with-lib",
+ "name": "d2sqlite3",
+ "d2sqlite3": "with-lib",
"targetType": "library",
"systemDependencies": "SQLite version >= 3.8.7",
"libs": [ "sqlite3" ],
@@ -2123,8 +2124,8 @@ fi
#+HEADER: :tangle ../.envrc-local_
#+BEGIN_SRC sh
-export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
-#export NIX_PATH=nixpkgs=<<nixpkgs_path>>
+export NIX_PATH=<<nix_path_channel>>
+#export NIX_PATH=<<nixpkgs_path_local>>
## reload when these files change
use flake
watch_file flake.nix
@@ -2134,6 +2135,7 @@ eval "$(nix print-dev-env)"
# echo $NIX_BUILD_TOP
export SpineVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
export SpineSRC=<<project_path_local_src>>
+export SpineBIN=<<project_path_local_bin>>
export SpineDOC=<<project_path_local_doc>>
export SpineOUT=<<project_path_local_out>>
export SpineOUTstatic=<<project_path_local_out_static>>
@@ -2163,92 +2165,99 @@ echo '
nix-instantiate | nix show-derivation | jq
nix-instantiate | nix show-derivation --recursive | jq
+ nix search --json 2>/dev/null |jq
+
,* version and build info
' >> SHELL_NIX_NOTE_
echo " spine version (git) == $SpineVER" >> SHELL_NIX_NOTE_
echo " nix-instantiate == `nix-instantiate`" >> SHELL_NIX_NOTE_
-echo '
+echo "
,* initialised shell variables
- SpineSRC=<<project_path_local_src>>
- SpineDOC=<<project_path_local_doc>>
- SpineOUT=<<project_path_local_out>>
- SpineOUTstatic=<<project_path_local_out_static>>
+ SpineSRC=$SpineSRC
+ SpineDOC=$SpineDOC
+ SpineOUT=$SpineOUT
+ SpineOUTstatic=$SpineOUTstatic
+" >> SHELL_NIX_NOTE_
-,* spine run instruction examples
+echo '* spine run instruction examples
,** parallelized tasks
- doc source
- $SpineSRC/result/bin/spine --very-verbose --pod --source --output="$SpineOUT" $SpineDOC/markup/pod/*
+ $SpineBIN/spine --very-verbose --pod --source --output="$SpineOUT" $SpineDOC/markup/pod/*
- html & epub output
- $SpineSRC/result/bin/spine --very-verbose --html --epub --output="$SpineOUT" $SpineDOC/markup/pod/*
+ $SpineBIN/spine --very-verbose --html --epub --output="$SpineOUT" $SpineDOC/markup/pod/*
- sqlite db for each document - populate each db
- $SpineSRC/result/bin/spine --very-verbose --sqlite-discrete --output="$SpineOUT" $SpineDOC/markup/pod/*
+ $SpineBIN/spine --very-verbose --sqlite-discrete --output="$SpineOUT" $SpineDOC/markup/pod/*
- doc source; html, epub; sqlite outputs
- $SpineSRC/result/bin/spine --verbose --pod --html --epub --sqlite-discrete --output="$SpineOUT" $SpineDOC/markup/pod/*
+ $SpineBIN/spine --verbose --pod --html --epub --sqlite-discrete --output="$SpineOUT" $SpineDOC/markup/pod/*
- harvest (authors topics)
- $SpineSRC/result/bin/spine --very-verbose --harvest --output="$SpineOUT" $SpineDOC/markup/pod/*
+ $SpineBIN/spine --very-verbose --harvest --output="$SpineOUT" $SpineDOC/markup/pod/*
- html, harvest
- $SpineSRC/result/bin/spine --verbose --dark --html --html-link-harvest --harvest --output="$SpineOUT" $SpineDOC/markup/pod/*
- $SpineSRC/result/bin/spine --very-verbose --html --html-link-harvest --harvest --output="$SpineOUT" $SpineDOC/markup/pod/*
+ $SpineBIN/spine --verbose --dark --html --html-link-harvest --harvest --output="$SpineOUT" $SpineDOC/markup/pod/*
+ $SpineBIN/spine --very-verbose --html --html-link-harvest --harvest --output="$SpineOUT" $SpineDOC/markup/pod/*
- composite command: source pod, html, epub, harvest, sqlite
- $SpineSRC/result/bin/spine --verbose --dark --pod --epub --html --html-link-harvest --harvest --sqlite-discrete --output="$SpineOUT" $SpineDOC/markup/pod/*
+ $SpineBIN/spine --verbose --dark --pod --epub --html --html-link-harvest --harvest --sqlite-discrete --output="$SpineOUT" $SpineDOC/markup/pod/*
,** sequential tasks
- sqlite db (shared) - create db
- $SpineSRC/result/bin/spine --very-verbose --sqlite-db-create --output="$SpineOUT"
+ $SpineBIN/spine --very-verbose --sqlite-db-create --output="$SpineOUT"
- sqlite db (shared) - populate db
- $SpineSRC/result/bin/spine --very-verbose --sqlite-update --output="$SpineOUT" $SpineDOC/spine-markup-samples/markup/pod/*
+ $SpineBIN/spine --very-verbose --sqlite-update --output="$SpineOUT" $SpineDOC/spine-markup-samples/markup/pod/*
- sqlite db (shared) - drop db
- $SpineSRC/result/bin/spine --very-verbose --sqlite-db-drop --output="$SpineOUT"
+ $SpineBIN/spine --very-verbose --sqlite-db-drop --output="$SpineOUT"
- sqlite db (shared) - create & populate db (single step)
- $SpineSRC/result/bin/spine --very-verbose --sqlite-db-create --sqlite-update --output="$SpineOUT" $SpineDOC/markup/pod/*
+ $SpineBIN/spine --very-verbose --sqlite-db-create --sqlite-update --output="$SpineOUT" $SpineDOC/markup/pod/*
- composite command: source pod, html, epub, harvest, sqlite
- $SpineSRC/result/bin/spine --verbose --no-parallel --dark --pod --epub --html --html-link-harvest --harvest --sqlite-discrete --output="$SpineOUT" $SpineDOC/markup/pod/*
+ $SpineBIN/spine --verbose --no-parallel --dark --pod --epub --html --html-link-harvest --harvest --sqlite-discrete --output="$SpineOUT" $SpineDOC/markup/pod/*
-,** cgi operations (output to $SpineOUTstatic /var/www)
+,** config [./pod/].dr/config_local_site
cat $SpineDOC/markup/pod/.dr/config_local_site
- $SpineSRC/result/bin/spine --show-config $SpineDOC/markup/pod
- $SpineSRC/result/bin/spine --show-config --output="$SpineOUT" $SpineDOC/markup/pod
+ $SpineBIN/spine --show-config $SpineDOC/markup/pod
+ $SpineBIN/spine --show-config --output="$SpineOUT" $SpineDOC/markup/pod
-,** cgi operations (output to /var/www)
+,** cgi operations (output to $SpineOUTstatic /var/www)
- $SpineSRC/result/bin/spine --very-verbose --sqlite-db-create --output="$SpineOUTstatic" $SpineDOC/markup/pod/*
+ $SpineBIN/spine --very-verbose --sqlite-db-create --output="$SpineOUTstatic" $SpineDOC/markup/pod/*
- $SpineSRC/result/bin/spine -v --cgi-search-form-codegen --output=$SpineOUTstatic/html $SpineDOC/markup/pod/*
+ $SpineBIN/spine -v --cgi-search-form-codegen --output=$SpineOUTstatic $SpineDOC/markup/pod/*
- $SpineSRC/result/bin/spine -v --show-config --config=$SpineDOC/markup/pod/.dr
+ $SpineBIN/spine -v --show-config --config=$SpineDOC/markup/pod/.dr
- $SpineSRC/result/bin/spine --html $SpineDOC/markup/pod/*
+ $SpineBIN/spine --html $SpineDOC/markup/pod/*
- $SpineSRC/result/bin/spine -v --sqlite-db-create --sqlite-filename="spine.search.db" --output="$SpineOUTstatic/html" $SpineDOC/markup/pod/*
+ $SpineBIN/spine -v --sqlite-db-create --sqlite-filename="spine.search.db" --output="$SpineOUTstatic" $SpineDOC/markup/pod/*
- $SpineSRC/result/bin/spine -v --sqlite-db-create --sqlite-filename="spine.search.db" --cgi-sqlite-search-filename="spine-search" --output=$SpineOUTstatic/html $SpineDOC/markup/pod/*
+ $SpineBIN/spine -v --sqlite-db-create --sqlite-filename="spine.search.db" --cgi-sqlite-search-filename="spine-search" --output=$SpineOUTstatic $SpineDOC/markup/pod/*
+ $SpineBIN/spine -v --sqlite-db-recreate --sqlite-filename="spine.search.db" --cgi-sqlite-search-filename="spine-search" --output=$SpineOUTstatic $SpineDOC/markup/pod/*
- $SpineSRC/result/bin/spine -v --sqlite-db-recreate --sqlite-filename="spine.search.db" --cgi-sqlite-search-filename="spine-search" --output=$SpineOUTstatic/html $SpineDOC/markup/pod/*
+ $SpineBIN/spine -v --sqlite-update --sqlite-filename="spine.search.db" --output=$SpineOUTstatic $SpineDOC/markup/pod/*
- $SpineSRC/result/bin/spine -v --sqlite-update --sqlite-filename="spine.search.db" --output=$SpineOUTstatic/html $SpineDOC/markup/pod/*
+ $SpineBIN/spine -v --cgi-search-form-codegen --config=$SpineDOC/markup/pod/.dr/config_local_site
- - make search form
- $SpineSRC/result/bin/spine -v --cgi-search-form-codegen --config=$SpineDOC/markup/pod/.dr/config_local_site
- generate html linked to search form
- $SpineSRC/result/bin/spine -v --html --html-link-search --html-link-harvest --harvest --output=$SpineOUTstatic/html $SpineDOC/markup/pod/*
+ $SpineBIN/spine -v --html --html-link-search --html-link-harvest --harvest --output=$SpineOUTstatic $SpineDOC/markup/pod/*
+
+ - populate sqlite db
+ $SpineBIN/spine -v --sqlite-db-recreate --sqlite-filename="spine.search.db" --cgi-sqlite-search-filename="spine-search" --sqlite-update --output=$SpineOUTstatic $SpineDOC/markup/pod/*
+
+ - make search form
+ $SpineBIN/spine -v --cgi-search-form-codegen --config=$SpineDOC/markup/pod/.dr/config_local_site --output=$SpineOUTstatic
' >> SHELL_NIX_NOTE_
cat SHELL_NIX_NOTE_
echo "cat SHELL_NIX_NOTE_"
-
#+END_SRC
**** nixpkgs_path SETUP
@@ -2279,11 +2288,26 @@ echo "cat SHELL_NIX_NOTE_"
- local path SET WARN
+#+NAME: nix_path_channel
+#+BEGIN_SRC nix
+/nix/var/nix/profiles/per-user/root/channels/nixos
+#+END_SRC
+
+#+NAME: nix_path_directory
+#+BEGIN_SRC nix
+nixpkgs=<<nixpkgs_path_local>>
+#+END_SRC
+
#+NAME: project_path_local_src
#+BEGIN_SRC nix
/grotto-ra/repo/git.repo/projects/project-spine/doc-reform
#+END_SRC
+#+NAME: project_path_local_bin
+#+BEGIN_SRC nix
+<<project_path_local_src>>/result/bin
+#+END_SRC
+
#+NAME: project_path_local_doc
#+BEGIN_SRC nix
/grotto-ra/repo/git.repo/projects/project-spine/doc-reform-markup/spine-markup-samples
@@ -2291,11 +2315,21 @@ echo "cat SHELL_NIX_NOTE_"
#+NAME: project_path_local_out
#+BEGIN_SRC nix
+/srv/www/spine/$SpineVER
+#+END_SRC
+
+#+NAME: project_path_local_out_
+#+BEGIN_SRC nix
/tmp/spine/$SpineVER/www
#+END_SRC
#+NAME: project_path_local_out_static
#+BEGIN_SRC nix
+/srv/www/spine/static
+#+END_SRC
+
+#+NAME: project_path_local_out_static_
+#+BEGIN_SRC nix
/var/www
#+END_SRC
@@ -2315,13 +2349,22 @@ nix develop
nix flake update
+#+NAME: nixpkgs_url
+#+BEGIN_SRC nix
+github:nixos/nixpkgs
+#+END_SRC
+
+#+BEGIN_SRC nix
+<<nixpkgs_path_local>>
+#+END_SRC
+
#+HEADER: :tangle ../flake.nix
#+BEGIN_SRC nix
{
description = "a sisu like document parser";
inputs = {
flake-utils.url = "github:numtide/flake-utils";
- nixpkgs.url = "/nixpkgs-ra/nixpkgs";
+ nixpkgs.url = "<<nixpkgs_url>>";
};
outputs = { self, nixpkgs, flake-utils }:
let
@@ -2346,7 +2389,7 @@ nix flake update
description = "a sisu like document parser";
inputs = {
flake-utils.url = "github:numtide/flake-utils";
- nixpkgs.url = "/nixpkgs-ra/nixpkgs";
+ nixpkgs.url = "<<nixpkgs_url>>";
d2sqlite3 = {
url = "github:dlang-community/d2sqlite3";
flake = false;
@@ -2388,7 +2431,7 @@ nix flake update
description = "a sisu like document parser";
inputs = {
flake-utils.url = "github:numtide/flake-utils";
- nixpkgs.url = "/nixpkgs-ra/nixpkgs";
+ nixpkgs.url = "<<nixpkgs_url>>";
# pkgs /nixpkgs-ra/nixpkgs {}
#spine.url = "/grotto-ra/repo/git.repo/projects/project-spine/doc-reform";
#spine.url = "./.";
@@ -2433,6 +2476,8 @@ nix flake update
shell.nix -I .envrc
shell.nix
+ nix develop
+
nix-build
nix-build -I nixpkgs=<provide local nix path>
nix-build -I .envrc
@@ -2454,21 +2499,19 @@ nix flake update
#+BEGIN_SRC nix
{ pkgs ? import <nixpkgs> {} }:
pkgs.mkShell {
- buildInputs = with pkgs; [
- (
- with pkgs; [
- nixFlakes
- rund
- dub
- ldc
- sqlite
- nix-prefetch-git
- validatePkgConfig
- jq
- git
- ]
- )
- ];
+ buildInputs = with pkgs; [(
+ with pkgs; [
+ nixFlakes
+ rund
+ dub
+ ldc
+ sqlite
+ nix-prefetch-git
+ validatePkgConfig
+ jq
+ git
+ ]
+ )];
shellHook = ''
if [[ -e ".envrc" ]]; then
source .envrc
@@ -2605,8 +2648,7 @@ mkDubDerivation rec {
version = "<<version_spine>>";
src = ./.;
buildInputs = [
- pkgs.sqlite
- (
+ pkgs.sqlite (
with pkgs; [
nixFlakes
rund
@@ -2747,7 +2789,8 @@ git
* .gitignore :gitignore:
-#+BEGIN_SRC sh :tangle ../.gitignore
+#+HEADER: :tangle "../.gitignore"
+#+BEGIN_SRC sh
# git ls-files --others --exclude-from=.git/info/exclude
,*
!.gitignore
@@ -2769,8 +2812,8 @@ git
!man
!man/**
!org
-!misc
-!misc/**
+!sundry
+!sundry/**
!*.nix
!nix
!nix/**
@@ -2822,7 +2865,7 @@ tmp/**
#.reggae/**
#+END_SRC
-* misc
+* sundry misc
** sh script to batch process _emacs org babel tangle_ :shell_script:tangle:
[[https://orgmode.org/manual/Batch-execution.html]]
creates a shell batch script called "tangle", that will tangle (emacs org
diff --git a/org/spine_info.org b/org/spine_info.org
index 0729e60..5e7ff86 100644
--- a/org/spine_info.org
+++ b/org/spine_info.org
@@ -4771,7 +4771,7 @@ matches are found.
- Copyright: (C) 2008 - 2021 Adam D. Ruppe
- - code: cgi.d (copy in ./misc/ext_lib/src/arsd/)
+ - code: cgi.d (copy in ./sundry/ext_lib/src/arsd/)
aria2c https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d
- License: BSL-1.0
diff --git a/org/util_cgi_d_sqlite_search.org b/org/util_cgi_d_sqlite_search.org
index 9ce40e3..2d38329 100644
--- a/org/util_cgi_d_sqlite_search.org
+++ b/org/util_cgi_d_sqlite_search.org
@@ -26,7 +26,7 @@ dub --force --compiler=ldc2 && sudo cp -v cgi-bin/spine-search /usr/lib/cgi-bin/
** set program tangle
-#+HEADER: :tangle "../misc/util/d/cgi/search/src/spine_cgi_sqlite_search.d"
+#+HEADER: :tangle "../sundry/util/d/cgi/search/src/spine_cgi_sqlite_search.d"
#+BEGIN_SRC d
<<cgi_sqlite_head>>
<<cgi_sqlite_imports>>
@@ -1212,7 +1212,7 @@ LIMIT %s OFFSET %s
* cgi-search dub.sdl
-#+HEADER: :tangle "../misc/util/d/cgi/search/dub.sdl"
+#+HEADER: :tangle "../sundry/util/d/cgi/search/dub.sdl"
#+BEGIN_SRC d
name "spine_search"
description "A minimal D application."
@@ -1245,7 +1245,7 @@ configuration "default" {
* cgi-search README
-#+HEADER: :tangle "../misc/util/d/cgi/search/README"
+#+HEADER: :tangle "../sundry/util/d/cgi/search/README"
#+BEGIN_SRC text
change db name to match name of db you create
cv.db_selected = "spine.search.sql.db";
diff --git a/org/util_cgi_rb_fcgi_sqlite_search.org b/org/util_cgi_rb_fcgi_sqlite_search.org
index 4bfdf5f..5e1d058 100644
--- a/org/util_cgi_rb_fcgi_sqlite_search.org
+++ b/org/util_cgi_rb_fcgi_sqlite_search.org
@@ -34,7 +34,7 @@ document home currently at /var/www/html (better placed at /var/www or srv/proje
*** sqlite cgi search TODO
**** head
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+HEADER: :tangle-mode (identity #o755)
#+HEADER: :shebang #!/usr/bin/env ruby
#+BEGIN_SRC ruby
@@ -95,7 +95,7 @@ document home currently at /var/www/html (better placed at /var/www or srv/proje
**** initialize
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
begin
require 'cgi'
@@ -122,7 +122,7 @@ end
**** form
***** initialize form
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
class Form
def initialize(base,search_field,selected_db,result_type,checked_sql_limit,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can='')
@@ -139,7 +139,7 @@ class Form
***** submission form
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
def submission_form
search_form =<<-WOK
@@ -225,7 +225,7 @@ end
**** search request
***** initialize request
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
class SearchRequest #% search_for
attr_accessor :text1,:fulltext,:keywords,:title,:author,:topic_register,:subject,:description,:publisher,:editor,:contributor,:date,:type,:format,:identifier,:source,:language,:relation,:coverage,:rights,:comment,:abstract,:owner,:date_created,:date_issued,:date_modified,:date_available,:date_valid,:src_filename_base
@@ -301,7 +301,7 @@ class SearchRequest #% sea
***** text to match
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
def text_to_match(identifier='')
m={
@@ -327,7 +327,7 @@ end
**** search string
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
class DBI_SearchString
def initialize(l,t,q,cse=false)
@@ -356,7 +356,7 @@ end
**** search statement
***** init
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
class DBI_SearchStatement
attr_reader :text_search_flag,:sql_select_body_format,:sql_offset,:sql_limit
@@ -464,7 +464,7 @@ class DBI_SearchStatement
***** misc
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
def sql_offset
@@offset
@@ -552,7 +552,7 @@ class DBI_SearchStatement
***** select statement
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
def sql_select_body
limit ||= @@limit
@@ -578,7 +578,7 @@ end
**** tail
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
def tail
<<-'WOK'
@@ -683,7 +683,7 @@ end
**** fcgi each
***** init & start loop
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
@tail=tail
@counter_txt_doc,@counter_txt_ocn,@counter_endn_doc,@counter_endn_ocn=0,0,0,0
@@ -759,7 +759,7 @@ FCGI.each_cgi do |cgi|
***** canned search
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
#Canned_search.new(@base,@search_for.text1,cgi)
if @search_for.text1=~/\S+/ or @search_for.fulltext=~/\S+/ or @search_for.author=~/\S+/ or @search_for.topic_register=~/\S+/ #and search_field =~/\S/
@@ -861,7 +861,7 @@ FCGI.each_cgi do |cgi|
***** submission form
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
@header = Form.new(@base,search_field,selected_db,result_type,checked_sql_limit,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can).submission_form #% form
unless q['s1'] =~/\S/ or q['au'] =~/\S/ or @search[:text][1] =~/\S/
@@ -957,7 +957,7 @@ FCGI.each_cgi do |cgi|
***** contents each, text body
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
#% text_objects_body
s_contents.each do |c| #% text body
@@ -1054,7 +1054,7 @@ FCGI.each_cgi do |cgi|
***** after
-#+HEADER: :tangle "../misc/util/rb/cgi/spine.search.cgi"
+#+HEADER: :tangle "../sundry/util/rb/cgi/spine.search.cgi"
#+BEGIN_SRC ruby
olduid = ""
offset=dbi_statement.sql_offset.to_s
diff --git a/org/util_spine_markup_conversion_from_sisu.org b/org/util_spine_markup_conversion_from_sisu.org
index d6f51c6..4b7a997 100644
--- a/org/util_spine_markup_conversion_from_sisu.org
+++ b/org/util_spine_markup_conversion_from_sisu.org
@@ -20,14 +20,14 @@
** README
-#+HEADER: :tangle "../misc/util/d/tools/markup_conversion/README"
+#+HEADER: :tangle "../sundry/util/d/tools/markup_conversion/README"
#+BEGIN_SRC text
#+END_SRC
** endnotes, inline from binary
*** tangle
-#+HEADER: :tangle "../misc/util/d/tools/markup_conversion/endnotes_inline_from_binary.d"
+#+HEADER: :tangle "../sundry/util/d/tools/markup_conversion/endnotes_inline_from_binary.d"
#+HEADER: :tangle-mode (identity #o755)
#+HEADER: :shebang #!/usr/bin/env rdmd
#+BEGIN_SRC d
@@ -207,7 +207,7 @@ if (endnotes.length == endnote_ref_count) {
** conversion from sisu (sisu bespoke headers) any binary to inline notes TODO
*** tangle
-#+HEADER: :tangle "../misc/util/d/tools/markup_conversion/markup_conversion_from_sisu_ruby_to_sisu_spine.d"
+#+HEADER: :tangle "../sundry/util/d/tools/markup_conversion/markup_conversion_from_sisu_ruby_to_sisu_spine.d"
#+HEADER: :tangle-mode (identity #o755)
#+HEADER: :shebang #!/usr/bin/env rdmd
#+BEGIN_SRC d
@@ -668,7 +668,7 @@ foreach (paragraph; paragraphs) {
** conversion from sisu and multiple headers (sisu bespoke, sdlang, toml) incomplete
*** tangle
-#+HEADER: :tangle "../misc/util/d/tools/markup_conversion/markup_changes_header_and_content.d"
+#+HEADER: :tangle "../sundry/util/d/tools/markup_conversion/markup_changes_header_and_content.d"
#+HEADER: :tangle-mode (identity #o755)
#+HEADER: :shebang #!/usr/bin/env rdmd
#+BEGIN_SRC d
diff --git a/org/util_spine_syntax_highlighting_emacs.org b/org/util_spine_syntax_highlighting_emacs.org
index 11741b3..bce3fe2 100644
--- a/org/util_spine_syntax_highlighting_emacs.org
+++ b/org/util_spine_syntax_highlighting_emacs.org
@@ -20,7 +20,7 @@
** README
-#+HEADER: :tangle "../misc/editor-syntax-etc/emacs/README"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/emacs/README"
#+BEGIN_SRC elisp
; put this into your .emacs file, then use the mode file:
@@ -30,7 +30,7 @@
** autoload sisuspine-mode-autoloads.el
-#+HEADER: :tangle "../misc/editor-syntax-etc/emacs/sisu-spine-mode-autoloads.el"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/emacs/sisu-spine-mode-autoloads.el"
#+BEGIN_SRC elisp
(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
(autoload 'sisu-spine-mode "sisu-spine-mode" "\
@@ -46,7 +46,7 @@ and search.
** mode sisu-spine-mode.el
-#+HEADER: :tangle "../misc/editor-syntax-etc/emacs/sisu-spine-mode.el"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/emacs/sisu-spine-mode.el"
#+BEGIN_SRC elisp
;;; sisu-spine-mode.el --- Major mode for SiSU (spine parser) markup text
diff --git a/org/util_spine_syntax_highlighting_vim.org b/org/util_spine_syntax_highlighting_vim.org
index 1925f73..b8f2c14 100644
--- a/org/util_spine_syntax_highlighting_vim.org
+++ b/org/util_spine_syntax_highlighting_vim.org
@@ -19,7 +19,7 @@
* Vim Syntax highlighting
** filetype
-#+HEADER: :tangle "../misc/editor-syntax-etc/vim/filetype.vim"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/vim/filetype.vim"
#+BEGIN_SRC text
" SiSU filetype file
if exists("did_load_filetypes")
@@ -33,7 +33,7 @@ augroup END
** debian vim addon manager
-#+HEADER: :tangle "../misc/editor-syntax-etc/vim/vim-sisu.yaml"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/vim/vim-sisu.yaml"
#+BEGIN_SRC text
#vim-addons: debian vim-addon-manager
addon: sisu
@@ -47,7 +47,7 @@ files:
** color files
*** def.vim
-#+HEADER: :tangle "../misc/editor-syntax-etc/vim/colors/def.vim"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/vim/colors/def.vim"
#+BEGIN_SRC text
" Vim color file
" Name: def
@@ -276,7 +276,7 @@ endif
*** slate.vim
-#+HEADER: :tangle "../misc/editor-syntax-etc/vim/colors/slate.vim"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/vim/colors/slate.vim"
#+BEGIN_SRC text
"%% SiSU Vim color file
" Name: Slate
@@ -357,7 +357,7 @@ endif
*** def-sisu.vim
-#+HEADER: :tangle "../misc/editor-syntax-etc/vim/colors/def-sisu.vim"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/vim/colors/def-sisu.vim"
#+BEGIN_SRC text
" Vim color file
" Name: def-sisu
@@ -586,7 +586,7 @@ endif
*** frugal-cterm.vim
-#+HEADER: :tangle "../misc/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim"
#+BEGIN_SRC text
" Vim color file
" Name: frugal-cterm-sisu
@@ -658,7 +658,7 @@ endif
** ftplugin sisu.vim
-#+HEADER: :tangle "../misc/editor-syntax-etc/vim/ftplugin/sisu.vim"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/vim/ftplugin/sisu.vim"
#+BEGIN_SRC text
"%% SiSU Vim ftplugin
" SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
@@ -889,7 +889,7 @@ endif
** templates
*** sst.tpl
-#+HEADER: :tangle "../misc/editor-syntax-etc/vim/templates/sst.tpl"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/vim/templates/sst.tpl"
#+BEGIN_SRC text
# SiSU 8.0
@@ -925,7 +925,7 @@ make:
*** ssm.tpl
-#+HEADER: :tangle "../misc/editor-syntax-etc/vim/templates/ssm.tpl"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/vim/templates/ssm.tpl"
#+BEGIN_SRC text
# SiSU 8.0 master
@@ -961,7 +961,7 @@ make:
*** ssm.tpl
-#+HEADER: :tangle "../misc/editor-syntax-etc/vim/templates/ssi.tpl"
+#+HEADER: :tangle "../sundry/editor-syntax-etc/vim/templates/ssi.tpl"
#+BEGIN_SRC text
# SiSU 8.0 insert
diff --git a/shell.nix b/shell.nix
index a426e51..7f37eee 100755
--- a/shell.nix
+++ b/shell.nix
@@ -1,20 +1,19 @@
+#!/usr/bin/env -S nix-shell --pure
{ pkgs ? import <nixpkgs> {} }:
pkgs.mkShell {
- buildInputs = with pkgs; [
- (
- with pkgs; [
- nixFlakes
- rund
- dub
- ldc
- sqlite
- nix-prefetch-git
- validatePkgConfig
- jq
- git
- ]
- )
- ];
+ buildInputs = with pkgs; [(
+ with pkgs; [
+ nixFlakes
+ rund
+ dub
+ ldc
+ sqlite
+ nix-prefetch-git
+ validatePkgConfig
+ jq
+ git
+ ]
+ )];
shellHook = ''
if [[ -e ".envrc" ]]; then
source .envrc
diff --git a/misc/editor-syntax-etc/README b/sundry/misc/editor-syntax-etc/README
index c03f356..c03f356 100644
--- a/misc/editor-syntax-etc/README
+++ b/sundry/misc/editor-syntax-etc/README
diff --git a/misc/editor-syntax-etc/emacs/README b/sundry/misc/editor-syntax-etc/emacs/README
index 6dabf72..6dabf72 100644
--- a/misc/editor-syntax-etc/emacs/README
+++ b/sundry/misc/editor-syntax-etc/emacs/README
diff --git a/misc/editor-syntax-etc/emacs/sisu-spine-mode-autoloads.el b/sundry/misc/editor-syntax-etc/emacs/sisu-spine-mode-autoloads.el
index 4cc6332..4cc6332 100644
--- a/misc/editor-syntax-etc/emacs/sisu-spine-mode-autoloads.el
+++ b/sundry/misc/editor-syntax-etc/emacs/sisu-spine-mode-autoloads.el
diff --git a/misc/editor-syntax-etc/emacs/sisu-spine-mode.el b/sundry/misc/editor-syntax-etc/emacs/sisu-spine-mode.el
index 773fa5c..773fa5c 100644
--- a/misc/editor-syntax-etc/emacs/sisu-spine-mode.el
+++ b/sundry/misc/editor-syntax-etc/emacs/sisu-spine-mode.el
diff --git a/misc/editor-syntax-etc/gedit/sisu.lang b/sundry/misc/editor-syntax-etc/gedit/sisu.lang
index b82d5f8..b82d5f8 100644
--- a/misc/editor-syntax-etc/gedit/sisu.lang
+++ b/sundry/misc/editor-syntax-etc/gedit/sisu.lang
diff --git a/misc/editor-syntax-etc/kate/sisu.xml b/sundry/misc/editor-syntax-etc/kate/sisu.xml
index a8054f2..a8054f2 100644
--- a/misc/editor-syntax-etc/kate/sisu.xml
+++ b/sundry/misc/editor-syntax-etc/kate/sisu.xml
diff --git a/misc/editor-syntax-etc/nano/nanorc b/sundry/misc/editor-syntax-etc/nano/nanorc
index 30ba439..30ba439 100644
--- a/misc/editor-syntax-etc/nano/nanorc
+++ b/sundry/misc/editor-syntax-etc/nano/nanorc
diff --git a/misc/editor-syntax-etc/nedit/sisu_nedit.pats b/sundry/misc/editor-syntax-etc/nedit/sisu_nedit.pats
index ef01b2b..ef01b2b 100644
--- a/misc/editor-syntax-etc/nedit/sisu_nedit.pats
+++ b/sundry/misc/editor-syntax-etc/nedit/sisu_nedit.pats
diff --git a/misc/editor-syntax-etc/vim/colors/8.vim b/sundry/misc/editor-syntax-etc/vim/colors/8.vim
index 08c43b1..08c43b1 100644
--- a/misc/editor-syntax-etc/vim/colors/8.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/8.vim
diff --git a/misc/editor-syntax-etc/vim/colors/def-ruby.vim b/sundry/misc/editor-syntax-etc/vim/colors/def-ruby.vim
index 6578593..6578593 100644
--- a/misc/editor-syntax-etc/vim/colors/def-ruby.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/def-ruby.vim
diff --git a/misc/editor-syntax-etc/vim/colors/def-sisu.vim b/sundry/misc/editor-syntax-etc/vim/colors/def-sisu.vim
index ac3e0c3..ac3e0c3 100644
--- a/misc/editor-syntax-etc/vim/colors/def-sisu.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/def-sisu.vim
diff --git a/misc/editor-syntax-etc/vim/colors/def.vim b/sundry/misc/editor-syntax-etc/vim/colors/def.vim
index aca1975..aca1975 100644
--- a/misc/editor-syntax-etc/vim/colors/def.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/def.vim
diff --git a/misc/editor-syntax-etc/vim/colors/def256-ruby.vim b/sundry/misc/editor-syntax-etc/vim/colors/def256-ruby.vim
index eb15db0..eb15db0 100644
--- a/misc/editor-syntax-etc/vim/colors/def256-ruby.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/def256-ruby.vim
diff --git a/misc/editor-syntax-etc/vim/colors/def256-sisu.vim b/sundry/misc/editor-syntax-etc/vim/colors/def256-sisu.vim
index a7c3def..a7c3def 100644
--- a/misc/editor-syntax-etc/vim/colors/def256-sisu.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/def256-sisu.vim
diff --git a/misc/editor-syntax-etc/vim/colors/def256.vim b/sundry/misc/editor-syntax-etc/vim/colors/def256.vim
index 06faefa..06faefa 100644
--- a/misc/editor-syntax-etc/vim/colors/def256.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/def256.vim
diff --git a/misc/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim b/sundry/misc/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
index 46938cf..46938cf 100644
--- a/misc/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
diff --git a/misc/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim b/sundry/misc/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
index aae822d..aae822d 100644
--- a/misc/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
diff --git a/misc/editor-syntax-etc/vim/colors/frugal-cterm.vim b/sundry/misc/editor-syntax-etc/vim/colors/frugal-cterm.vim
index 9751538..9751538 100644
--- a/misc/editor-syntax-etc/vim/colors/frugal-cterm.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/frugal-cterm.vim
diff --git a/misc/editor-syntax-etc/vim/colors/frugal.vim b/sundry/misc/editor-syntax-etc/vim/colors/frugal.vim
index ee2f5ea..ee2f5ea 100644
--- a/misc/editor-syntax-etc/vim/colors/frugal.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/frugal.vim
diff --git a/misc/editor-syntax-etc/vim/colors/slate.vim b/sundry/misc/editor-syntax-etc/vim/colors/slate.vim
index 4d741e8..4d741e8 100644
--- a/misc/editor-syntax-etc/vim/colors/slate.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/slate.vim
diff --git a/misc/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim b/sundry/misc/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
index 53619b5..53619b5 100644
--- a/misc/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
diff --git a/misc/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim b/sundry/misc/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
index 1410a69..1410a69 100644
--- a/misc/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
+++ b/sundry/misc/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
diff --git a/misc/editor-syntax-etc/vim/filetype.vim b/sundry/misc/editor-syntax-etc/vim/filetype.vim
index 917c3e0..917c3e0 100644
--- a/misc/editor-syntax-etc/vim/filetype.vim
+++ b/sundry/misc/editor-syntax-etc/vim/filetype.vim
diff --git a/misc/editor-syntax-etc/vim/ftplugin/sisu.vim b/sundry/misc/editor-syntax-etc/vim/ftplugin/sisu.vim
index 43c7e53..43c7e53 100644
--- a/misc/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/sundry/misc/editor-syntax-etc/vim/ftplugin/sisu.vim
diff --git a/misc/editor-syntax-etc/vim/ftplugin/sisurb.vim b/sundry/misc/editor-syntax-etc/vim/ftplugin/sisurb.vim
index b959626..b959626 100644
--- a/misc/editor-syntax-etc/vim/ftplugin/sisurb.vim
+++ b/sundry/misc/editor-syntax-etc/vim/ftplugin/sisurb.vim
diff --git a/misc/editor-syntax-etc/vim/rc/vimrc_statusline b/sundry/misc/editor-syntax-etc/vim/rc/vimrc_statusline
index e0ba493..e0ba493 100644
--- a/misc/editor-syntax-etc/vim/rc/vimrc_statusline
+++ b/sundry/misc/editor-syntax-etc/vim/rc/vimrc_statusline
diff --git a/misc/editor-syntax-etc/vim/syntax/sisu.vim b/sundry/misc/editor-syntax-etc/vim/syntax/sisu.vim
index effa9df..effa9df 100644
--- a/misc/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/sundry/misc/editor-syntax-etc/vim/syntax/sisu.vim
diff --git a/misc/editor-syntax-etc/vim/templates/ssi.tpl b/sundry/misc/editor-syntax-etc/vim/templates/ssi.tpl
index 28e8101..28e8101 100644
--- a/misc/editor-syntax-etc/vim/templates/ssi.tpl
+++ b/sundry/misc/editor-syntax-etc/vim/templates/ssi.tpl
diff --git a/misc/editor-syntax-etc/vim/templates/ssm.tpl b/sundry/misc/editor-syntax-etc/vim/templates/ssm.tpl
index 579375f..579375f 100644
--- a/misc/editor-syntax-etc/vim/templates/ssm.tpl
+++ b/sundry/misc/editor-syntax-etc/vim/templates/ssm.tpl
diff --git a/misc/editor-syntax-etc/vim/templates/sst.tpl b/sundry/misc/editor-syntax-etc/vim/templates/sst.tpl
index 069d498..069d498 100644
--- a/misc/editor-syntax-etc/vim/templates/sst.tpl
+++ b/sundry/misc/editor-syntax-etc/vim/templates/sst.tpl
diff --git a/misc/editor-syntax-etc/vim/vim-sisu.yaml b/sundry/misc/editor-syntax-etc/vim/vim-sisu.yaml
index ca665bc..ca665bc 100644
--- a/misc/editor-syntax-etc/vim/vim-sisu.yaml
+++ b/sundry/misc/editor-syntax-etc/vim/vim-sisu.yaml
diff --git a/misc/ext_lib/src/arsd/README b/sundry/misc/ext_lib/src/arsd/README
index 792a2bb..792a2bb 100644
--- a/misc/ext_lib/src/arsd/README
+++ b/sundry/misc/ext_lib/src/arsd/README
diff --git a/misc/ext_lib/src/arsd/cgi.d b/sundry/misc/ext_lib/src/arsd/cgi.d
index a0249ee..a0249ee 100644
--- a/misc/ext_lib/src/arsd/cgi.d
+++ b/sundry/misc/ext_lib/src/arsd/cgi.d
diff --git a/misc/util/d/cgi/search/README b/sundry/misc/util/d/cgi/search/README
index eb8fcde..eb8fcde 100644
--- a/misc/util/d/cgi/search/README
+++ b/sundry/misc/util/d/cgi/search/README
diff --git a/misc/util/d/cgi/search/dub.sdl b/sundry/misc/util/d/cgi/search/dub.sdl
index 30b076d..30b076d 100644
--- a/misc/util/d/cgi/search/dub.sdl
+++ b/sundry/misc/util/d/cgi/search/dub.sdl
diff --git a/misc/util/d/cgi/search/src/spine_cgi_sqlite_search.d b/sundry/misc/util/d/cgi/search/src/spine_cgi_sqlite_search.d
index 987c319..987c319 100644
--- a/misc/util/d/cgi/search/src/spine_cgi_sqlite_search.d
+++ b/sundry/misc/util/d/cgi/search/src/spine_cgi_sqlite_search.d
diff --git a/misc/util/d/tools/markup_conversion/README b/sundry/misc/util/d/tools/markup_conversion/README
index 8b13789..8b13789 100644
--- a/misc/util/d/tools/markup_conversion/README
+++ b/sundry/misc/util/d/tools/markup_conversion/README
diff --git a/misc/util/d/tools/markup_conversion/endnotes_inline_from_binary.d b/sundry/misc/util/d/tools/markup_conversion/endnotes_inline_from_binary.d
index b084052..b084052 100755
--- a/misc/util/d/tools/markup_conversion/endnotes_inline_from_binary.d
+++ b/sundry/misc/util/d/tools/markup_conversion/endnotes_inline_from_binary.d
diff --git a/misc/util/d/tools/markup_conversion/markup_changes.d b/sundry/misc/util/d/tools/markup_conversion/markup_changes.d
index 4274f78..4274f78 100644
--- a/misc/util/d/tools/markup_conversion/markup_changes.d
+++ b/sundry/misc/util/d/tools/markup_conversion/markup_changes.d
diff --git a/misc/util/d/tools/markup_conversion/markup_changes_header_and_content.d b/sundry/misc/util/d/tools/markup_conversion/markup_changes_header_and_content.d
index 86792ff..86792ff 100755
--- a/misc/util/d/tools/markup_conversion/markup_changes_header_and_content.d
+++ b/sundry/misc/util/d/tools/markup_conversion/markup_changes_header_and_content.d
diff --git a/misc/util/d/tools/markup_conversion/markup_conversion_from_sisu_ruby_to_sisu_spine.d b/sundry/misc/util/d/tools/markup_conversion/markup_conversion_from_sisu_ruby_to_sisu_spine.d
index 0ec541d..0ec541d 100755
--- a/misc/util/d/tools/markup_conversion/markup_conversion_from_sisu_ruby_to_sisu_spine.d
+++ b/sundry/misc/util/d/tools/markup_conversion/markup_conversion_from_sisu_ruby_to_sisu_spine.d
diff --git a/misc/util/d/tools/spine_scaffold.d b/sundry/misc/util/d/tools/spine_scaffold.d
index dbcc857..dbcc857 100755
--- a/misc/util/d/tools/spine_scaffold.d
+++ b/sundry/misc/util/d/tools/spine_scaffold.d
diff --git a/misc/util/rb/cgi/spine.search.cgi b/sundry/misc/util/rb/cgi/spine.search.cgi
index ff2bfc2..ff2bfc2 100755
--- a/misc/util/rb/cgi/spine.search.cgi
+++ b/sundry/misc/util/rb/cgi/spine.search.cgi
diff --git a/misc/util/rb/tex/dr_tex.rb b/sundry/misc/util/rb/tex/dr_tex.rb
index b71d8c1..b71d8c1 100755
--- a/misc/util/rb/tex/dr_tex.rb
+++ b/sundry/misc/util/rb/tex/dr_tex.rb
diff --git a/sundry/spine_search_cgi/.gitignore b/sundry/spine_search_cgi/.gitignore
new file mode 100644
index 0000000..0b3f555
--- /dev/null
+++ b/sundry/spine_search_cgi/.gitignore
@@ -0,0 +1,46 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+*
+!.gitignore
+!README.md
+!COPYRIGHT
+!CHANGELOG
+!makefile
+!version.txt
+!*.json
+!*.sdl
+!meson.build
+!tangle
+!*.org
+!*.d
+!*.rb
+!*.txt
+!conf.sdl
+!*.nix
+!nix
+!nix/**
+!.envrc
+!src
+!src/**
+!*.sst
+!*.ssm
+!**/*.sst
+!**/*.ssm
+!config_local_site
+!views
+.dub/**
+**/.dub/**
+**/cgi-bin/**
+tmp/**
+*_.org
+*_.d
+*_.txt
+*_
+*.swp
+*~
+*~
+\#*
+*.\#*
+#!*/
+#\#*
+#*.\#*
+#.reggae/**