diff options
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/.vimrc | 30 | ||||
| -rw-r--r-- | vim/plug.vim | 14 |
2 files changed, 27 insertions, 17 deletions
@@ -21,22 +21,23 @@ set hidden " plugin manager call plug#begin('~/.vim/plugged') +Plug 'airblade/vim-gitgutter' +Plug 'mg979/vim-visual-multi' +Plug 'christoomey/vim-tmux-navigator' +Plug 'w0rp/ale' Plug 'sickill/vim-monokai' -Plug 'bling/vim-airline' +Plug 'thaerkh/vim-indentguides' Plug 'scrooloose/nerdtree' Plug 'scrooloose/nerdcommenter' +Plug 'Xuyuanp/nerdtree-git-plugin' + +Plug 'bling/vim-airline' Plug 'tpope/vim-fireplace' -Plug 'kien/ctrlp.vim' -Plug 'airblade/vim-gitgutter' +Plug 'ctrlpvim/ctrlp.vim' Plug 'majutsushi/tagbar' Plug 'xolox/vim-misc' -Plug 'w0rp/ale' -Plug 'thaerkh/vim-indentguides' Plug 'vim-scripts/paredit.vim' -Plug 'christoomey/vim-tmux-navigator' Plug 'ryanoasis/vim-devicons' -Plug 'Xuyuanp/nerdtree-git-plugin' -Plug 'mg979/vim-visual-multi' "Plug 'tpope/vim-fugitive.git' "Plug 'severin-lemaignan/vim-minimap' @@ -76,6 +77,10 @@ autocmd FileType make set tabstop=4 shiftwidth=8 softtabstop=0 noexpandtab " gui settings set linespace=4 set guifont=Droid\ Sans\ Mono:h12 +if exists('g:GuiLoaded') + GuiTabline 0 +endif +autocmd UIEnter * GuiTabline 0 " reload vimrc on change augroup reload_vimrc @@ -85,7 +90,7 @@ augroup END " airline configuration set laststatus=2 -"let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#tabline#enabled = 1 " display tabs and trailing spaces set list @@ -135,7 +140,7 @@ set mouse=a " ale configuration let g:ale_linters = { \ 'python': ['flake8'] -\} +\ } " YouCompleteMe configuration "let g:ycm_auto_trigger = 0 @@ -146,3 +151,8 @@ set completeopt=menuone " disable conceal autocmd FileType json set conceallevel=0 + +" ctrlP +"let g:ctrlp_prompt_mappings = { +"\ 'ToggleType(1)': ['<c-p>', '<c-f>', '<c-up>'], +"\ } diff --git a/vim/plug.vim b/vim/plug.vim index 69033ec..7914bfe 100644 --- a/vim/plug.vim +++ b/vim/plug.vim @@ -179,7 +179,7 @@ function! s:define_commands() endif if has('win32') \ && &shellslash - \ && (&shell =~# 'cmd\.exe' || &shell =~# 'powershell\.exe') + \ && (&shell =~# 'cmd\(\.exe\)\?$' || &shell =~# 'powershell\(\.exe\)\?$') return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.') endif if !has('nvim') @@ -419,7 +419,7 @@ if s:is_win let batchfile = s:plug_tempname().'.bat' call writefile(s:wrap_cmds(a:cmd), batchfile) let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0}) - if &shell =~# 'powershell\.exe' + if &shell =~# 'powershell\(\.exe\)\?$' let cmd = '& ' . cmd endif return [batchfile, cmd] @@ -890,9 +890,9 @@ function! s:chsh(swap) set shell=sh endif if a:swap - if &shell =~# 'powershell\.exe' || &shell =~# 'pwsh$' + if &shell =~# 'powershell\(\.exe\)\?$' || &shell =~# 'pwsh$' let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s' - elseif &shell =~# 'sh' || &shell =~# 'cmd\.exe' + elseif &shell =~# 'sh' || &shell =~# 'cmd\(\.exe\)\?$' set shellredir=>%s\ 2>&1 endif endif @@ -2128,9 +2128,9 @@ function! plug#shellescape(arg, ...) let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {} let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh') let script = get(opts, 'script', 1) - if shell =~# 'cmd\.exe' + if shell =~# 'cmd\(\.exe\)\?$' return s:shellesc_cmd(a:arg, script) - elseif shell =~# 'powershell\.exe' || shell =~# 'pwsh$' + elseif shell =~# 'powershell\(\.exe\)\?$' || shell =~# 'pwsh$' return s:shellesc_ps1(a:arg) endif return s:shellesc_sh(a:arg) @@ -2182,7 +2182,7 @@ function! s:system(cmd, ...) return system(a:cmd) endif let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"shell": &shell, "script": 0})')) - if &shell =~# 'powershell\.exe' + if &shell =~# 'powershell\(\.exe\)\?$' let cmd = '& ' . cmd endif else |