fix vimwiki command order; fix window class for tvim

2 files changed, 5 insertions, 4 deletions

diff --git a/tvim b/tvim
index 375ba8f..449ed71 100755
--- a/tvim
+++ b/tvim
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 typeset -a vimopt=(
     '--cmd' 'let g:tvim = 1'
-    '--cmd' "set tgc mouse=a title titlestring=[%F]%m\\ -\\ TVIM"
+    '--cmd' "set tgc title titlestring=[%F]%m\\ -\\ TVIM"
+    '-c' 'set mouse=a'
 )
 
 error() {
@@ -12,4 +13,4 @@ error() {
 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
+exec "$termbin" -c tvim -e "$vimbin" "${vimopt[@]}" "$@" &>/dev/null & disown
diff --git a/vimwiki b/vimwiki
index 9bf614a..a937a73 100755
--- a/vimwiki
+++ b/vimwiki
@@ -1,9 +1,9 @@
 #!/usr/bin/bash
 index="$HOME/vimwiki/index.wiki"
 typeset -a vimopts=(
-    '--cmd' 'packadd vimwiki'
     '-c' 'set titlestring=vimwiki'
-    "$index"
+    '-c' 'packadd vimwiki'
+    '-c' "e $index"
 )
 case $1 in
     -g) vimbin=$(command -v gvim);;