diff options
Diffstat (limited to 'stow/vim/.vim')
-rw-r--r-- | stow/vim/.vim/ftplugin/sh/sh.vim | 2 | ||||
-rw-r--r-- | stow/vim/.vim/ftplugin/sh/snippets/template.txt | 10 | ||||
-rw-r--r-- | stow/vim/.vim/ftplugin/tex/tex.vim | 2 | ||||
-rw-r--r-- | stow/vim/.vim/ftplugin/typescript/typescript.vim | 4 | ||||
-rw-r--r-- | stow/vim/.vim/ftplugin/vimwiki/vimwiki.vim | 5 | ||||
-rw-r--r-- | stow/vim/.vim/rc/color.vim | 9 |
6 files changed, 19 insertions, 13 deletions
diff --git a/stow/vim/.vim/ftplugin/sh/sh.vim b/stow/vim/.vim/ftplugin/sh/sh.vim index 58d39fe..f716617 100644 --- a/stow/vim/.vim/ftplugin/sh/sh.vim +++ b/stow/vim/.vim/ftplugin/sh/sh.vim @@ -11,7 +11,7 @@ setlocal textwidth=110 let mapleader = " " nnoremap <buffer> <leader>C :sp ~/.vim/ftplugin/sh/sh.vim<CR><CR> -nnoremap <buffer> <leader>+x :!chmod 744 %<CR><CR> +nnoremap <buffer> <leader>+x :!chmod 744 %<CR> nnoremap <buffer> <leader>x :w<CR>:!./%<Space> nnoremap <buffer> <leader>X :w<CR>:!./%<CR><CR> diff --git a/stow/vim/.vim/ftplugin/sh/snippets/template.txt b/stow/vim/.vim/ftplugin/sh/snippets/template.txt index 171dcf8..8b257fe 100644 --- a/stow/vim/.vim/ftplugin/sh/snippets/template.txt +++ b/stow/vim/.vim/ftplugin/sh/snippets/template.txt @@ -4,14 +4,16 @@ # # Usage: template.sh [-ac] [-b OPTARG] FILE... -usageMessage="Usage: ${0} [-ac] [-b OPTARG] FILE..." +scriptName="${0##*/}" + +usageMessage="Usage: ${scriptName} [-ac] [-b OPTARG] FILE..." error() { - printf '%s error: %s\n' "$0" "$*" >&2 + printf '%s error: %s\n' "$scriptName" "$*" >&2 } errorAndUsage() { - printf '%s error: %s\n%s\n' "$0" "$*" "$usageMessage" >&2 + printf '%s error: %s\n%s\n' "$scriptName" "$*" "$usageMessage" >&2 } # Process options @@ -31,7 +33,7 @@ while getopts ':ab:c' opt; do ;; '?' ) - printf '%s\n' "$usageMessage" + printf '%s\n' "$usageMessage" >&2 exit 1 esac diff --git a/stow/vim/.vim/ftplugin/tex/tex.vim b/stow/vim/.vim/ftplugin/tex/tex.vim index c57bbc5..0893e40 100644 --- a/stow/vim/.vim/ftplugin/tex/tex.vim +++ b/stow/vim/.vim/ftplugin/tex/tex.vim @@ -47,4 +47,4 @@ inoremap <buffer> <leader>lenumerate \begin{enumerate}<Esc>o<Enter><Enter><Enter inoremap <buffer> <leader>litemize \begin{itemize}<Esc>o<Enter><Enter><Enter>\end{itemize}<Esc>kkI\item<Enter><Esc>I<Tab><++><Esc>k<<i<Tab><Esc>$a<Space> inoremap <buffer> <leader>litem \item<Enter><++><Esc>k$a<Space> inoremap <buffer> <leader>limage \begin{figure}[h]<Enter>\begin{center}<Enter>\includegraphics[width=\textwidth]{}<Enter>\caption{<++>}<Enter>\end{center}<Enter>\end{figure}<Enter><++><Esc>4k$i -inoremap <buffer> <leader>ltable \begin{table}[h]<Enter>\makebox[\linewidth]{\centering<Enter>\centering<Enter>\begin{tabular}{c<Space>cxxx}<Enter>\toprule<Enter><++><Space>&<Space><++><Space>\\<Enter>\midrule<Enter><++><Space>&<Space><++><Space>\\<Enter>\bottomrule<Enter>\end{tabular}<Enter>}<Enter>\end{table}<Enter><++><Esc>?xxx<Enter>cw +inoremap <buffer> <leader>ltable \begin{table}[h]<Enter>\makebox[\linewidth]{<Enter>\begin{tabular}{c<Space>cxxx}<Enter>\toprule<Enter><++><Space>&<Space><++><Space>\\<Enter>\midrule<Enter><++><Space>&<Space><++><Space>\\<Enter>\bottomrule<Enter>\end{tabular}<Enter>}<Enter>\end{table}<Enter><++><Esc>?xxx<Enter>cw diff --git a/stow/vim/.vim/ftplugin/typescript/typescript.vim b/stow/vim/.vim/ftplugin/typescript/typescript.vim index 65e3c1a..b91ea16 100644 --- a/stow/vim/.vim/ftplugin/typescript/typescript.vim +++ b/stow/vim/.vim/ftplugin/typescript/typescript.vim @@ -19,8 +19,8 @@ let mapleader = " " nnoremap <buffer> <leader>C :sp ~/.vim/ftplugin/typescript/typescript.vim<CR> -nnoremap <buffer> <leader>s :!tmux new-window -db -t 9 -n 'npm start' npm start<CR><CR> -nnoremap <buffer> <leader>S :!tmux new-window -b -t 9 -n 'npm start' 'tmux set -w remain-on-exit on; npm start'<CR><CR> +nnoremap <buffer> <leader>s :silent !~/scripts/tmux/tmux-npmStart.sh<CR> +nnoremap <buffer> <leader>S :silent !~/scripts/tmux/tmux-npmStart.sh -r<CR> let mapleader = "," diff --git a/stow/vim/.vim/ftplugin/vimwiki/vimwiki.vim b/stow/vim/.vim/ftplugin/vimwiki/vimwiki.vim index c904efe..7d36f10 100644 --- a/stow/vim/.vim/ftplugin/vimwiki/vimwiki.vim +++ b/stow/vim/.vim/ftplugin/vimwiki/vimwiki.vim @@ -27,8 +27,9 @@ nnoremap <buffer> <leader>C :sp ~/.vim/ftplugin/vimwiki/vimwiki.vim<CR> nnoremap <buffer> <leader>temp :r ~/.vim/ftplugin/vimwiki/snips/template.txt<CR> nnoremap <buffer> <leader>tp :r ~/.vim/ftplugin/vimwiki/snips/plantUml.txt<CR>/<+++><CR>cf> -nnoremap <buffer> <leader>c :w<CR>:!toPDF.sh "%"<CR><CR> -nnoremap <buffer> <leader>o :w<CR>:!toPDF.sh -o "%"<CR><CR> +nnoremap <buffer> <leader>c :silent w<CR>:!toPDF.sh "%"<CR><CR> +nnoremap <buffer> <leader>o :silent w<CR>:!toPDF.sh -o "%"<CR><CR> +nnoremap <buffer> <leader>O :silent w<CR>:!toPDF.sh -o "%"<CR> let mapleader = "," diff --git a/stow/vim/.vim/rc/color.vim b/stow/vim/.vim/rc/color.vim index ec18335..e57d86b 100644 --- a/stow/vim/.vim/rc/color.vim +++ b/stow/vim/.vim/rc/color.vim @@ -13,9 +13,9 @@ highlight LineNr cterm=NONE highlight CursorLineNr ctermfg=5 highlight CursorLineNr cterm=underline -" Completion color -highlight Pmenu ctermbg=blue ctermfg=black -highlight PmenuSel ctermbg=darkblue ctermfg=white +" Completion color (also nvim LSP hint color) +"highlight Pmenu ctermbg=blue ctermfg=black +"highlight PmenuSel ctermbg=darkblue ctermfg=white " Panel border color "highlight VertSplit ctermbg=black ctermfg=darkblue @@ -31,6 +31,9 @@ highlight SpellBad ctermbg=red ctermfg=black " Comments colors highlight Comment ctermfg=green +" QuickFix colors +highlight QuickFixLine ctermbg=darkblue ctermfg=black + " Line size marking highlight ColorColumn ctermbg=darkblue ctermfg=black "Redjail Bomb (thx Damian Conway!) |