From 73b30ca10a816e32c3ef0411d240c81e522b63c7 Mon Sep 17 00:00:00 2001 From: Jannik ZANDER Date: Wed, 18 Jul 2018 18:00:38 +0200 Subject: [PATCH] Add vim-snippets --- .config/user-dirs.dirs | 14 +++++------ .gitmodules | 6 ++--- .profile | 5 ---- .vim/pack/github/opt/vim-netranger | 1 - .vim/pack/github/opt/vim-snippets | 1 + .vim/vimrc | 39 +++++++++++++++++++++--------- 6 files changed, 39 insertions(+), 27 deletions(-) delete mode 160000 .vim/pack/github/opt/vim-netranger create mode 160000 .vim/pack/github/opt/vim-snippets diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs index e56ad96..323a8f6 100644 --- a/.config/user-dirs.dirs +++ b/.config/user-dirs.dirs @@ -4,12 +4,12 @@ # Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an # absolute path. No other format is supported. -# +# XDG_DESKTOP_DIR="$HOME/cloud" XDG_DOWNLOAD_DIR="$HOME/Download" -XDG_TEMPLATES_DIR="$HOME/cloud/Templates" -XDG_PUBLICSHARE_DIR="$HOME/cloud/PublicShare" -XDG_DOCUMENTS_DIR="$HOME/cloud/Documents" -XDG_MUSIC_DIR="$HOME/cloud/Music" -XDG_PICTURES_DIR="$HOME/cloud/Pictures" -XDG_VIDEOS_DIR="$HOME/cloud/Videos" +XDG_TEMPLATES_DIR="$HOME/" +XDG_PUBLICSHARE_DIR="$HOME/" +XDG_DOCUMENTS_DIR="$HOME/" +XDG_MUSIC_DIR="$HOME/" +XDG_PICTURES_DIR="$HOME/" +XDG_VIDEOS_DIR="$HOME/" diff --git a/.gitmodules b/.gitmodules index 17b2b45..3187df6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,9 +46,9 @@ [submodule ".vim/pack/github/opt/mesonic"] path = .vim/pack/github/opt/mesonic url = https://github.com/igankevich/mesonic.git -[submodule ".vim/pack/github/opt/vim-netranger"] - path = .vim/pack/github/opt/vim-netranger - url = https://github.com/ipod825/vim-netranger.git [submodule ".vim/pack/github/opt/ranger.vim"] path = .vim/pack/github/opt/ranger.vim url = https://github.com/francoiscabrol/ranger.vim.git +[submodule ".vim/pack/github/opt/vim-snippets"] + path = .vim/pack/github/opt/vim-snippets + url = https://github.com/honza/vim-snippets.git diff --git a/.profile b/.profile index 9cb795d..25b8dd5 100644 --- a/.profile +++ b/.profile @@ -8,11 +8,6 @@ fi # set PATH to bin directory export PATH=~/.local/bin:~/bin:$PATH -# set TMP directory -export TMP=~/tmp -export TEMP=$TMP -export TMPDIR=$TMP - # Set default programs export SHELL='bash' export EDITOR='vim' diff --git a/.vim/pack/github/opt/vim-netranger b/.vim/pack/github/opt/vim-netranger deleted file mode 160000 index c29312f..0000000 --- a/.vim/pack/github/opt/vim-netranger +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c29312ff545ec3349868442d6a0ff9f5183d2832 diff --git a/.vim/pack/github/opt/vim-snippets b/.vim/pack/github/opt/vim-snippets new file mode 160000 index 0000000..103523d --- /dev/null +++ b/.vim/pack/github/opt/vim-snippets @@ -0,0 +1 @@ +Subproject commit 103523dbc5e0482365d5f6f9bc8ccf4101433c43 diff --git a/.vim/vimrc b/.vim/vimrc index 55fc659..7351ce8 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -142,8 +142,15 @@ let g:netrw_sort_sequence = '[\/]$,*' " Packages +" Airline +packadd! vim-airline +let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#tabline#formatter = 'unique_tail_improved' + " ALE -"packadd! ale +packadd! ale +let g:ale_enabled = 1 +let g:airline#extensions#ale#enabled = 1 " Tagbar packadd! tagbar @@ -168,14 +175,9 @@ packadd! vim-unimpaired " Ranger packadd! ranger.vim +packadd! bclose.vim let g:ranger_replace_netrw = 1 -" Airline -packadd! vim-airline -let g:airline#extensions#tabline#enabled = 1 -let g:airline#extensions#tabline#formatter = 'unique_tail_improved' -let g:airline_section_error = airline#section#create_right(['%{g:asyncrun_status}']) - " Editorconfig "packadd! editorconfig-vim "let g:editorconfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] @@ -205,7 +207,8 @@ packadd! matchit " Async shell commands packadd asyncrun.vim let g:asyncrun_open = 8 -let g:asyncrun_status = "stopped" +let g:asyncrun_status = "" +let g:airline_section_error = airline#section#create_right(['%{g:asyncrun_status}']) let g:asyncrun_auto = "make" command! -bang -nargs=* -complete=file Make AsyncRun -program=make @ command! -bang -nargs=* -complete=file Grep AsyncRun -program=grep @ @@ -216,6 +219,11 @@ packadd errormarker.vim " Meson build system packadd mesonic +" UltiSnips +packadd ultisnips +packadd vim-snippets + + " Normal mode Mappings nnoremap ; : nnoremap : ; @@ -276,9 +284,9 @@ if has('autocmd') augroup END augroup quickfix - autocmd QuickFixCmdPost [^l]* nested cwindow - autocmd QuickFixCmdPost l* nested lwindow -" autocmd QuickFixCmdPost * call asyncrun#quickfix_toggle(8, 1) +" autocmd QuickFixCmdPost [^l]* nested cwindow +" autocmd QuickFixCmdPost l* nested lwindow + autocmd QuickFixCmdPost * call asyncrun#quickfix_toggle(8, 1) augroup END endif @@ -286,3 +294,12 @@ endif if filereadable(expand('~/.vim/vimrc.local')) source ~/.vim/vimrc.local endif + + +" Load all plugins now. +" Plugins need to be added to runtimepath before helptags can be generated. +packloadall +" Load all of the helptags now, after plugins have been loaded. +" All messages and errors will be ignored. +silent! helptags ALL + -- 2.43.0