diff --git a/vim/ftplugin/javascript.vim b/vim/ftplugin/javascript.vim index 49fe656..d9daa2e 100644 --- a/vim/ftplugin/javascript.vim +++ b/vim/ftplugin/javascript.vim @@ -1,5 +1,8 @@ if has("nvim") - + " use prettier in ALE + let g:ale_fixers = {} + let g:ale_fixers['javascript'] = ['eslint', 'prettier'] + let g:ale_javascript_prettier_options = '--no-semi --single-qoute' else " Syntastic {{{ "let g:syntastic_javascript_checkers = ['standard'] diff --git a/vimrc.symlink b/vimrc.symlink index efcf3e5..795e521 100644 --- a/vimrc.symlink +++ b/vimrc.symlink @@ -88,6 +88,7 @@ Plug 'nbouscal/vim-stylish-haskell', { 'for': 'haskell' } " C/C++ Plug 'Rip-Rip/clang_complete', { 'for': ['c', 'cpp'], 'do': 'make install' } let g:clang_library_path='/usr/lib/llvm-4.0/lib/libclang-4.0.so.1' +Plug 'rhysd/vim-clang-format', { 'for' : ['c', 'cpp', 'java'] } " PHP "Plug 'shawncplus/phpcomplete.vim', { 'for': 'php', 'do': 'curl -Ss http://vim-php.com/phpctags/install/phpctags.phar > ~/bin/phpctags && chmod +x ~/bin/phpctags' } @@ -216,7 +217,7 @@ autocmd FileType java setlocal omnifunc=javacomplete#Complete " Python-mode config let g:pymode_lint_on_write = 0 -" Vimtex +" Vimtex{{{ if !exists('g:neocomplete#sources#omni#input_patterns') let g:neocomplete#sources#omni#input_patterns = {} endif @@ -228,6 +229,11 @@ let g:neocomplete#sources#omni#input_patterns.tex = \ . ')' "}}} +" C/C++ +autocmd FileType c,cpp,objc nnoremap f :ClangFormat +autocmd FileType c,cpp,objc vnoremap f :ClangFormat +"}}} + " Completion {{{ if !has("nvim") "Note: This option must be set in .vimrc(_vimrc). NOT IN .gvimrc(_gvimrc)! diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index e30ffad..038bcaa 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -1,6 +1,6 @@ # in case its not already thera alias la='ls -la' -alias sagu='sudo apt update && sudo apt upgrade' +alias sagu='sudo apt update && sudo apt dist-upgrade' alias v='vim '