commit 8248723e583d1c058f7c1dc535009ee22d14a5de
parent 2f4928a4377260db7d01aa05620d9570154ffb78
Author: mcol <mcol@posteo.net>
Date:   Sun,  6 Jan 2019 15:14:24 +0000

lots

Diffstat:
M
ftplugin/help.vim
 | 
1
+
M
ftplugin/sh.vim
 | 
5
-----
M
plugin/keybindings.vim
 | 
6
++++++
M
plugin/theme.vim
 | 
6
++++++
M
tmux.conf
 | 
6
+++---
M
vimrc
 | 
12
++----------

6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ftplugin/help.vim b/ftplugin/help.vim
@@ -1 +1,2 @@
+" this overrides :Bclose in help windows
 nnoremap <buffer> <BS> :bd<CR>
diff --git a/ftplugin/sh.vim b/ftplugin/sh.vim
@@ -1,6 +1 @@
 setlocal textwidth=79
-
-
-" use vim terminal as vimslime
-"let g:slime_target = "vimterminal"
-"let g:slime_target = "neovim"
diff --git a/plugin/keybindings.vim b/plugin/keybindings.vim
@@ -83,3 +83,9 @@ nnoremap <Leader>h :set hlsearch!<CR>
 
 " shortcut to fix lines
 nnoremap <leader>p gqip
+
+" shortcut to vert split
+nnoremap vs :vsp<CR>
+
+" toggle spell checking
+nnoremap <leader>S :setlocal spell! spelllang=en_gb spell?<CR>
diff --git a/plugin/theme.vim b/plugin/theme.vim
@@ -18,6 +18,12 @@ hi User3 ctermfg=0 ctermbg=14 cterm=none
 hi User4 ctermfg=0 ctermbg=2 cterm=none 
 hi User5 ctermfg=0 ctermbg=3 cterm=none 
 
+" tab bar
+hi TabLineFill ctermfg=0 ctermbg=1
+hi TabLine ctermfg=0 ctermbg=13
+hi TabLineSel ctermfg=0 ctermbg=12
+hi Title ctermfg=0 ctermbg=12
+
 " vimdiff
 hi DiffAdd      cterm=none ctermfg=0 ctermbg=2
 hi DiffChange   cterm=none ctermfg=0 ctermbg=4
diff --git a/tmux.conf b/tmux.conf
@@ -7,9 +7,9 @@ bind C-a send-prefix
 
 # bindings
 bind r source-file ~/.tmux.conf
-bind-key C-a last-window
-bind-key | split-window -h
-bind-key - split-window -v
+#bind-key C-a last-window
+bind-key | split-window -hb \; run-shell "bsptm"
+bind-key -n C-d kill-pane \; run-shell "bsptm"
 bind C-l send-keys 'C-l'
 
 # general settings
diff --git a/vimrc b/vimrc
@@ -107,21 +107,13 @@ nmap <C-n> :Explore<CR>
 nmap <C-t> :Texplore<CR>
 let g:netrw_sort_sequence='[\/]$'
 
-" function text object: force top level
-let g:argumentobject_force_toplevel = 1
-
-
-"------------------------------------------------------------------"
-" vimlab setup
-"------------------------------------------------------------------"
-
-" mlint code checking 
+" machine specific settings
 if hostname() == "zenbook"
     let g:mlint_path_to_mlint = expand("$HOME") . "/applications/MATLAB/R2018b/bin/glnxa64/mlint"
+    let g:vimwiki_list = [{'path': '~/work/research/research.wiki/', 'path_html': '~/work/research/research.wiki.html/'}]
 else
     let g:mlint_path_to_mlint = "to be filled in later"
 endif
-let g:mlint_hover = 0
 
 " session saving
 let g:vimlab_session = "~/.vim/sessions/matlab-session.vim"