diff --git a/kshrc b/kshrc index 78e654d..3a31094 100755 --- a/kshrc +++ b/kshrc @@ -2,10 +2,12 @@ alias gpg='gpg2' export GPG_TTY=$(tty) alias vim=nvim +alias uwpass='PASSWORD_STORE_DIR=~/.pass/uw pass' alias gca='git commit --amend --no-edit' alias gpf='git push --force-with-lease' alias gs='git show' alias gd='git diff' +alias openvpn='sudo openvpn --config *.ovpn' if [ -e "$HOME/.kshrc_private" ]; then . "$HOME/.kshrc_private" diff --git a/nvim/autoload/plug.vim b/nvim/autoload/plug.vim index 8a195d3..b6e4cbf 100644 --- a/nvim/autoload/plug.vim +++ b/nvim/autoload/plug.vim @@ -242,8 +242,6 @@ function! plug#begin(...) let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) elseif exists('g:plug_home') let home = s:path(g:plug_home) - elseif has('nvim') - let home = stdpath('data') . '/plugged' elseif !empty(&rtp) let home = s:path(split(&rtp, ',')[0]) . '/plugged' else @@ -407,7 +405,7 @@ function! plug#end() for [map, names] in items(lod.map) for [mode, map_prefix, key_prefix] in - \ [['i', '', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] + \ [['i', '', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] execute printf( \ '%snoremap %s %s:call lod_map(%s, %s, %s, "%s")', \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) diff --git a/nvim/init.vim b/nvim/init.vim index 78fd6b6..afcea00 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -38,6 +38,11 @@ set termguicolors set t_Co=256 colorscheme Tomorrow-Night +let g:gitgutter_sign_added = '+ ' +let g:gitgutter_sign_modified = '~ ' +let g:gitgutter_sign_modified_removed = '__' +let g:gitgutter_sign_removed = '_ ' + " Syntax syntax on set showmatch @@ -55,8 +60,6 @@ set tabstop=4 shiftwidth=4 noexpandtab autocmd BufRead,BufNewFile *.py set tabstop=4 shiftwidth=4 noexpandtab autocmd BufRead,BufNewFile *.yml set tabstop=2 shiftwidth=2 expandtab autocmd BufRead,BufNewFile *.yaml set tabstop=2 shiftwidth=2 expandtab -autocmd BufRead,BufNewFile *.ts set tabstop=2 shiftwidth=2 expandtab -autocmd BufRead,BufNewFile *.vue set tabstop=2 shiftwidth=2 expandtab " Disable auto newlines set wrap diff --git a/profile b/profile index 1eebbb2..7d5b273 100755 --- a/profile +++ b/profile @@ -10,7 +10,7 @@ fi export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock # Go -export GOPRIVATE="git.fuyu.moe/*/*" +export GOPRIVATE="git.fuyu.moe/*/*,git.ultraware.nl/*/*,git.sinuss.nl/*/*" # Fixes export _JAVA_AWT_WM_NONREPARENTING=1