diff --git a/autoload/plug.vim b/autoload/plug.vim index 7e52441..3f81310 100644 --- a/autoload/plug.vim +++ b/autoload/plug.vim @@ -1063,7 +1063,7 @@ function! s:update_finish() elseif has_key(spec, 'tag') let tag = spec.tag if tag =~ '\*' - let tags = s:lines(s:system('git tag --list '.string(tag).' --sort -version:refname 2>&1', spec.dir)) + let tags = s:lines(s:system('git tag --list '.s:shellesc(tag).' --sort -version:refname 2>&1', spec.dir)) if !v:shell_error && !empty(tags) let tag = tags[0] call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag)) diff --git a/plugins.vim b/plugins.vim index ed93efa..6a0dd2e 100644 --- a/plugins.vim +++ b/plugins.vim @@ -1,7 +1,5 @@ call plug#begin('~/.vim/plugged') - - """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " General """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -11,35 +9,52 @@ Plug 'ervandew/supertab' Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } Plug 'tomasr/molokai' Plug 'tpope/vim-fugitive' -Plug 'tpope/vim-git' +Plug 'airblade/vim-gitgutter' Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } Plug 'junegunn/fzf.vim' +Plug 'ctrlpvim/ctrlp.vim' Plug 'tpope/vim-eunuch' Plug 'janko-m/vim-test' Plug 'rizzatti/dash.vim' Plug 'ntpeters/vim-better-whitespace' Plug 'tomtom/tcomment_vim' -Plug 'airblade/vim-gitgutter' Plug 'tpope/vim-endwise' Plug 'rstacruz/vim-closer' -Plug 'benekastah/neomake' Plug 'jszakmeister/vim-togglecursor' +Plug 'ajh17/Spacegray.vim' +Plug 'mxw/vim-jsx' +Plug 'tpope/vim-surround' +Plug 'guns/xterm-color-table.vim' +Plug 'fmoralesc/molokayo' +Plug 'morhetz/gruvbox' +Plug 'chriskempson/base16-vim' +Plug 'Quramy/tsuquyomi' +Plug 'prettier/vim-prettier', { + \ 'do': 'npm install', + \ 'for': ['javascript', 'typescript', 'css', 'less', 'scss', 'json'] } +Plug 'LucHermitte/local_vimrc' +Plug 'LucHermitte/lh-vim-lib' +Plug 'jceb/vim-orgmode' +Plug 'jparise/vim-graphql' + +" Linters/builders - pick one: +Plug 'benekastah/neomake' +" Plug 'w0rp/ale' if has('nvim') Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } - Plug 'carlitux/deoplete-ternjs', { 'do': 'npm install -g tern' } - Plug 'steelsojka/deoplete-flow', { 'for': ['javascript', 'javascript.jsx'] } + " Plug 'carlitux/deoplete-ternjs', { 'do': 'npm install -g tern' } + " Plug 'steelsojka/deoplete-flow', { 'for': ['javascript', 'javascript.jsx'] } Plug 'kassio/neoterm' else - Plug 'Valloric/YouCompleteMe', { - \ 'for': ['elixir', 'eelixir', 'javascript', 'javascript.jsx'], - \ 'do': './install.py --tern-completer' - \} + " Plug 'Valloric/YouCompleteMe' + " \,{ + " \ 'for': ['elixir', 'eelixir', 'javascript', 'javascript.jsx'], + " \ 'do': './install.py' + " \} Plug 'larrylv/ycm-elixir', { 'for': ['elixir', 'eelixir'] } Plug 'flowtype/vim-flow', { 'for': ['javascript', 'javascript.jsx'] } - - Plug 'tpope/vim-dispatch' endif """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" diff --git a/settings.vim b/settings.vim index b216e8f..7d4916e 100644 --- a/settings.vim +++ b/settings.vim @@ -1,6 +1,10 @@ let vimsettings = '~/.vim/settings' let uname = system("uname -s") +set mouse=a + +set clipboard=unnamed + let g:flow_path = '/usr/local/bin/flow' for fpath in split(globpath(vimsettings, '*.vim'), '\n') diff --git a/settings/NERDTree.vim b/settings/NERDTree.vim index 1adfe3c..435be06 100644 --- a/settings/NERDTree.vim +++ b/settings/NERDTree.vim @@ -3,5 +3,5 @@ let NERDTreeMinimalUI = 1 let NERDTreeDirArrows = 1 let g:NERDTreeWinSize = 30 -nnoremap :NERDTreeToggle -inoremap :NERDTreeToggle +nnoremap :NERDTreeToggle +inoremap :NERDTreeToggle diff --git a/settings/ale.vim b/settings/ale.vim new file mode 100644 index 0000000..be4c7af --- /dev/null +++ b/settings/ale.vim @@ -0,0 +1,12 @@ +let g:ale_javascript_prettier_use_local_config = 1 +let g:ale_javascript_eslint_executable = 'eslint_d' +let g:ale_lint_on_insert_leave = 1 +let g:ale_fix_on_save = 1 +let g:ale_linters = { +\ 'javascript': ['eslint', 'flow'], +\ } +" +" \ ‘html’: [], +let g:ale_fixers = { +\ 'javascript': ['eslint', 'prettier'], +\ } diff --git a/settings/ctrlp.vim b/settings/ctrlp.vim new file mode 100644 index 0000000..0ecc52f --- /dev/null +++ b/settings/ctrlp.vim @@ -0,0 +1,8 @@ +if executable('rg') + set grepprg="rg\ --color=never" + let g:ctrlp_user_command = 'rg %s --files --color=never --glob ""' + let g:ctrlp_use_caching = 0 +endif + +" let g:ctrlp_map = 'f' +map f :CtrlP diff --git a/settings/expand.vim b/settings/expand.vim index b6ed607..132ee8f 100644 --- a/settings/expand.vim +++ b/settings/expand.vim @@ -1,2 +1,2 @@ " %% to expand active buffer location on cmdline -cmap %% =expand("%:p:h") . "/" +" cmap %% =expand("%:p:h") . "/" diff --git a/settings/fzf.vim b/settings/fzf.vim index 340b067..6c34708 100644 --- a/settings/fzf.vim +++ b/settings/fzf.vim @@ -1,13 +1,14 @@ -let g:fzf_action = { - \ 'ctrl-t': 'tab split', - \ 'ctrl-x': 'split', - \ 'ctrl-v': 'vsplit' } +" let g:fzf_action = { +" \ 'ctrl-x': 'split', +" \ 'ctrl-v': 'vsplit' } +" 'ctrl-t': 'tab split', " Default fzf layout " - down / up / left / right -let g:fzf_layout = { 'down': '~30%' } +" " let g:fzf_layout = { 'down': '~30%' } +" let g:fzf_layout = { 'window': 'enew' } +" let $FZF_DEFAULT_COMMAND = 'ag --hidden --ignore .git -l -g ""' -map f :FZF! -map g :GFiles +" map g :GFiles map a :Ag map A :Ag! diff --git a/settings/local_vimrc.vim b/settings/local_vimrc.vim new file mode 100644 index 0000000..ccac11d --- /dev/null +++ b/settings/local_vimrc.vim @@ -0,0 +1 @@ +let g:local_vimrc = ['.vimrc.local.vim'] diff --git a/settings/neomake.vim b/settings/neomake.vim index d2b3fdc..18bf85f 100644 --- a/settings/neomake.vim +++ b/settings/neomake.vim @@ -34,4 +34,4 @@ let g:neomake_elixir_lint_maker = { let g:neomake_elixir_enabled_makers = ['mix', 'lint'] -autocmd! BufWritePost * Neomake +" autocmd! BufWritePost * Neomake diff --git a/settings/tsuqoyomi.vim b/settings/tsuqoyomi.vim new file mode 100644 index 0000000..f10b20b --- /dev/null +++ b/settings/tsuqoyomi.vim @@ -0,0 +1,12 @@ +let g:tsuquyomi_use_local_typescript = 0 +let g:tsuquyomi_use_dev_node_module = 0 + +function! ToggleVerbose() + if !&verbose + set verbosefile=~/.log/vim/verbose.log + set verbose=15 + else + set verbose=0 + set verbosefile= + endif +endfunction diff --git a/settings/vim-javascript.vim b/settings/vim-javascript.vim index ac45e35..741161e 100644 --- a/settings/vim-javascript.vim +++ b/settings/vim-javascript.vim @@ -1 +1 @@ -let g:javascript_plugin_flow = 1 +" let g:javascript_plugin_flow = 1 diff --git a/settings/vim-prettier.vim b/settings/vim-prettier.vim new file mode 100644 index 0000000..5edc152 --- /dev/null +++ b/settings/vim-prettier.vim @@ -0,0 +1,3 @@ +let g:prettier#exec_cmd_async = 1 +" let g:prettier#autoformat = 0 +" autocmd BufWritePre *.js,*.jsx,*.ts,*.tsx,*.json,*.css,*.scss,*.less,*.graphql PrettierAsync diff --git a/settings/ycm.vim b/settings/ycm.vim new file mode 100644 index 0000000..a9ccd53 --- /dev/null +++ b/settings/ycm.vim @@ -0,0 +1,4 @@ +" If YCM acts up, which it often does... +" let g:ycm_keep_logfiles = 1 +" let g:ycm_log_level = 'debug' + diff --git a/vimrc b/vimrc index 62c5a73..9e60ad5 100644 --- a/vimrc +++ b/vimrc @@ -79,6 +79,8 @@ set formatoptions=cqrj nnoremap p p=`] nnoremap P P=`] +map w :w + filetype plugin on filetype indent on @@ -141,4 +143,4 @@ so ~/.vim/settings.vim " =================== Color ========================= -color molokai +color molokayo