completely new tvim and reworked vimwiki

2 files changed, 23 insertions, 8 deletions

diff --git a/tvim b/tvim
index d7a5883..375ba8f 100755
--- a/tvim
+++ b/tvim
@@ -1,5 +1,15 @@
 #!/usr/bin/env bash
-TERM=$(command -v default-terminal-emulator)
-VIM=$(command -v nvim) || VIM=$(command -v vim)
+typeset -a vimopt=(
+    '--cmd' 'let g:tvim = 1'
+    '--cmd' "set tgc mouse=a title titlestring=[%F]%m\\ -\\ TVIM"
+)
 
-exec "$TERM" -e "$VIM" -c 'set mouse=a' "$@" &>/dev/null & disown
+error() {
+    echo "$*" >&2
+    exit 1
+}
+
+termbin=$(command -v st) || termbin=$(command -v xterm) || error "No terminal found!"
+vimbin=$(command -v nvim) || vimbin=$(command -v vim) || error "No vim binary found!"
+
+exec "$termbin" -e "$vimbin" "${vimopt[@]}" "$@" &>/dev/null & disown
diff --git a/vimwiki b/vimwiki
index 4dd1b7a..9bf614a 100755
--- a/vimwiki
+++ b/vimwiki
@@ -1,8 +1,13 @@
 #!/usr/bin/bash
+index="$HOME/vimwiki/index.wiki"
+typeset -a vimopts=(
+    '--cmd' 'packadd vimwiki'
+    '-c' 'set titlestring=vimwiki'
+    "$index"
+)
 case $1 in
-    -g) VIM=$(command -v gvim);;
-    -n) VIM=$(command -v nvim) || VIM=$(command -v vim);;
-    *) VIM=$(command -v tvim);;
+    -g) vimbin=$(command -v gvim);;
+    -n) vimbin=$(command -v nvim) || vimbin=$(command -v vim);;
+    *) vimbin=$(command -v tvim);;
 esac
-VIMWIKI_RC="$HOME/vimwiki/.vimwikirc"
-exec flock -w0 "$VIMWIKI_RC" "$VIM" -c "source $VIMWIKI_RC"
+exec flock -w0 "$index" "$vimbin" "${vimopts[@]}"