tobast/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changes to vimrc

Browse source
This commit is contained in:
Théophile Bastian 2018-10-23 10:21:50 +02:00
parent b4c72c46ac
commit 1d652d0417
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
files/.bashrc
View file

@ -53,7 +53,7 @@ export TERMINAL="/usr/bin/terminator"
export LC_REALUSER='tbastian' export LC_REALUSER='tbastian'
# Opam # Opam
which opam > /dev/null 2>&1 && [ -d ~/.opam ] && eval `opam config env` which opam > /dev/null 2>&1 && [ -d ~/.opam ] && eval $(opam config env)
# Gem # Gem
if [ -d "$HOME/.gem/ruby/2.4.0/bin" ] ; then if [ -d "$HOME/.gem/ruby/2.4.0/bin" ] ; then

24
files/.vimrc
View file

@ -59,7 +59,8 @@ Plugin 'tpope/vim-fugitive'
Plugin 'hynek/vim-python-pep8-indent' Plugin 'hynek/vim-python-pep8-indent'
Plugin 'tpope/vim-git' Plugin 'tpope/vim-git'
Plugin 'fs111/pydoc.vim' Plugin 'fs111/pydoc.vim'
Plugin 'vim-syntastic/syntastic' " Plugin 'vim-syntastic/syntastic'
Plugin 'w0rp/ale'
Plugin 'itchyny/vim-haskell-indent' Plugin 'itchyny/vim-haskell-indent'
Plugin 'junegunn/goyo.vim' Plugin 'junegunn/goyo.vim'
Plugin 'vim-airline/vim-airline' Plugin 'vim-airline/vim-airline'
@ -67,10 +68,12 @@ Plugin 'vim-airline/vim-airline-themes'
"Plugin 'davidhalter/jedi-vim' "Plugin 'davidhalter/jedi-vim'
Plugin 'vim-scripts/a.vim' Plugin 'vim-scripts/a.vim'
Plugin 'rhysd/vim-clang-format' Plugin 'rhysd/vim-clang-format'
Plugin 'christoomey/vim-tmux-navigator'
Plugin 'chrisbra/csv.vim' Plugin 'chrisbra/csv.vim'
Plugin 'let-def/vimbufsync' Plugin 'let-def/vimbufsync'
Plugin 'the-lambda-church/coquille' Plugin 'the-lambda-church/coquille'
Plugin 'vim-latex/vim-latex'
Plugin 'let-def/ocp-indent-vim'
Plugin 'christoomey/vim-tmux-navigator'
call vundle#end() " required call vundle#end() " required
filetype plugin indent on " required filetype plugin indent on " required
@ -103,12 +106,19 @@ let g:syntastic_python_checkers = ['flake8']
" let g:syntastic_ignore_files = [] " let g:syntastic_ignore_files = []
""""""""""""""""" OCaml """"""""""""""""" OCaml
au BufEnter *.ml setf ocaml
au BufEnter *.mli setf ocaml
au FileType ocaml call FT_ocaml()
function FT_ocaml()
set shiftwidth=2
set tabstop=2
endfunction
let g:opamshare = substitute(system('opam config var share'),'\n$','','''') let g:opamshare = substitute(system('opam config var share'),'\n$','','''')
"""" Merlin
execute "set rtp+=" . g:opamshare . "/merlin/vim" execute "set rtp+=" . g:opamshare . "/merlin/vim"
let g:syntastic_ocaml_checkers = ['merlin'] execute "set rtp+=" . g:opamshare . "/merlin/vimbufsync"
"""" Ocp-indent (OCaml indentation) execute "set rtp+=" . g:opamshare . "/ocp-indent/vim"
set rtp^=g:opamshare."/ocp-indent/vim"
""""""""""""""""" Python """"""""""""""""" Python
let g:jedi#goto_definitions_command = "<LocalLeader>l" let g:jedi#goto_definitions_command = "<LocalLeader>l"
@ -159,3 +169,5 @@ noremap <Right> <NOP>
xnoremap <leader>b <esc>:'<,'>:w ! xnoremap <leader>b <esc>:'<,'>:w !
xnoremap <Leader>x <esc>:'<,'>:w !xclip -selection clipboard<CR><esc> xnoremap <Leader>x <esc>:'<,'>:w !xclip -selection clipboard<CR><esc>
noremap <leader>a <esc>:ALEToggle<CR><esc>