Skip to content

Commit

Permalink
feat: use ftplugin files for simpler .vimrc
Browse files Browse the repository at this point in the history
  • Loading branch information
st3v3nhunt committed Jul 21, 2020
1 parent c1ccc4c commit 406d3ab
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 29 deletions.
32 changes: 6 additions & 26 deletions dotfiles/.vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -122,26 +122,15 @@ let g:airline_powerline_fonts = 1
" only load these extensions to speed up loading
let g:airline_extension = ['ale']
let g:airline_theme='base16_isotope'
let g:airline#extensions#ale#enabled=1 " error information in the status bar

" ALE configuration
let g:ale_sign_error='✗✗'
let g:ale_sign_warning='∆∆'
let g:airline#extensions#ale#enabled=1 " error information in the status bar
let g:ale_lint_on_save=1
let g:ale_fix_on_save=1
" Set standard as the only JS linter and fixer
let g:ale_linters={
\ 'cs': ['OmniSharp'],
\ 'javascript': ['standard'],
\ 'typescript': ['prettier'],
\}
let g:ale_fixers={
\ 'cs': ['OmniSharp'],
\ 'javascript': ['standard'],
\ 'typescript': ['prettier'],
\}
let g:ale_completion_enabled = 1
let g:ale_completion_tsserver_autoimport = 1
let g:ale_lint_on_save=1
let g:ale_fix_on_save=1
let g:ale_sign_error='✗✗'
let g:ale_sign_warning='∆∆'

" vim-go configuration
let g:go_fmt_command='goimports'
Expand Down Expand Up @@ -177,13 +166,7 @@ nnoremap <leader>gg :YcmCompleter GoTo<CR>
nnoremap <leader>gr :YcmCompleter GoToReferences<CR>
nnoremap <leader>gi :YcmCompleter GoToImplementation<CR>
nnoremap <leader>gt :YcmCompleter GoToType<CR>
nnoremap <leader>rr :YcmCompleter RefactorRename<Space>
" Specific mappings for C# files
autocmd FileType cs nmap <buffer> <leader>fi :OmniSharpFindUsages<CR>
autocmd FileType cs nmap <buffer> <leader>gg :OmniSharpFindUsages<CR>
autocmd FileType cs nmap <buffer> <leader>gi :OmniSharpFindImplementations<CR>
autocmd FileType cs nmap <buffer> <leader>gt :OmniSharpFindType<CR>
autocmd FileType cs nmap <buffer> <leader>rr :OmniSharpRenameTo<Space>
nnoremap <leader>rr :YcmCompleter RefactorRename<space>
" Copy into the system clipboard
let s:clip = '/c/Windows/System32/clip.exe'
Expand All @@ -196,7 +179,6 @@ end
" Paste from the system clipboard
map <silent> <leader>p :r !powershell.exe -Command Get-Clipboard<CR>
" Leaders
" Save and close
nnoremap <leader>w :w<CR>
nnoremap <leader>q :q<CR>
Expand All @@ -213,8 +195,6 @@ nnoremap <leader>f :Autoformat<CR>
" Run jq on the current buffer
nnoremap <leader>jf :%! jq<CR>
" OmniSharp settings

" Add all plugins to the runtimepath and then load all helptags, ignoring any
" errors as the command will continue to run
packloadall
Expand Down
13 changes: 10 additions & 3 deletions scripts/install-vim-stuff.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,15 @@ fi
# Install YouCompleteMe
~/.vim/bundle/YouCompleteMe/install.py --all

# Use existing word list for vim spell
if [[ ! -d ~/.vim/spell/ ]]; then
mkdir ~/.vim/spell
fi

REPO_DIR="$( cd "$( dirname "$(dirname "${BASH_SOURCE[0]}" )" )" && pwd )"

# Use existing word list for vim spell
mkdir ~/.vim/spell
ln -nfsv "$REPO_DIR/vim/en.utf-8.add" ~/.vim/spell/
# mkdir ~/.vim/spell
ln -fsv "$REPO_DIR/vim/spell" ~/.vim/

# Link ftplugin
ln -fsv "$REPO_DIR/vim/ftplugin" ~/.vim/
11 changes: 11 additions & 0 deletions vim/ftplugin/cs.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
set foldlevel=9
let b:ale_linters=['OmniSharp']

nmap <buffer> <leader>f :OmniSharpCodeFormat<CR>
" nmap <buffer> <leader>fi :OmniSharpFixUsings<CR>
nmap <buffer> <leader>gg :OmniSharpFindUsages<CR>
nmap <buffer> <leader>gi :OmniSharpFindImplementations<CR>
nmap <buffer> <leader>gt :OmniSharpFindType<CR>
nmap <buffer> <leader>rr :OmniSharpRenameTo<space>
autocmd BufWritePost <buffer> :OmniSharpFixUsings | :OmniSharpCodeFormat
2 changes: 2 additions & 0 deletions vim/ftplugin/javascript.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
let b:ale_fixers=['standard']
let b:ale_linters=['standard']
3 changes: 3 additions & 0 deletions vim/ftplugin/typescript.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
let b:ale_fixers=['prettier']
let b:ale_linters=['prettier']

File renamed without changes.

0 comments on commit 406d3ab

Please sign in to comment.