new gen of vimwiki script

3 files changed, 10 insertions, 10 deletions

diff --git a/gvimwiki b/gvimwiki
deleted file mode 100755
index ecfd6be..0000000
--- a/gvimwiki
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/bash
-vim_wiki="$HOME/vimwiki/index.wiki"
-# gvim wiki to scratchpad
-flock -w0 ${vim_wiki} gvim ${vim_wiki}
diff --git a/tvim b/tvim
index 918fa24..d7a5883 100755
--- a/tvim
+++ b/tvim
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-term=default-terminal-emulator
-vim=$(command -v nvim) || vim=$(command -v vim)
+TERM=$(command -v default-terminal-emulator)
+VIM=$(command -v nvim) || VIM=$(command -v vim)
 
-exec $term -e $vim -c 'set mouse=a' "$@" &>/dev/null & disown
+exec "$TERM" -e "$VIM" -c 'set mouse=a' "$@" &>/dev/null & disown
diff --git a/vimwiki b/vimwiki
index 977c481..4dd1b7a 100755
--- a/vimwiki
+++ b/vimwiki
@@ -1,4 +1,8 @@
 #!/usr/bin/bash
-vim_wiki="$HOME/vimwiki/index.wiki"
-# vim wiki to scratchpad
-default-terminal-emulator -e flock -w0 ${vim_wiki} vim ${vim_wiki}
+case $1 in
+    -g) VIM=$(command -v gvim);;
+    -n) VIM=$(command -v nvim) || VIM=$(command -v vim);;
+    *) VIM=$(command -v tvim);;
+esac
+VIMWIKI_RC="$HOME/vimwiki/.vimwikirc"
+exec flock -w0 "$VIMWIKI_RC" "$VIM" -c "source $VIMWIKI_RC"