Various smaller changes and new plugins

This commit is contained in:
Alexander Gehrke 2019-05-09 11:15:30 +02:00
parent e18d288351
commit 5e960cdbc8
3 changed files with 35 additions and 5 deletions

View file

@ -11,3 +11,5 @@ noremap <Leader>ri :EnInline<CR>
noremap K :EnDocBrowse<CR> noremap K :EnDocBrowse<CR>
noremap <Leader>f :Autoformat<CR> noremap <Leader>f :Autoformat<CR>
au BufWritePost *.scala Neomake!

View file

@ -48,6 +48,7 @@ set hidden
set mouse= set mouse=
set cursorline set cursorline
set guicursor=
set undofile set undofile
set undodir=~/.local/share/nvim/undo set undodir=~/.local/share/nvim/undo
@ -113,6 +114,9 @@ autocmd BufNewFile *.{h,hpp} call <SID>insert_gates()
nnoremap <space> za nnoremap <space> za
vnoremap <silent> . :normal .<CR> vnoremap <silent> . :normal .<CR>
nnoremap q: :q
nnoremap <leader>: q:
map <Left> <C-w>h map <Left> <C-w>h
map <Down> <C-w>j map <Down> <C-w>j
map <Up> <C-w>k map <Up> <C-w>k
@ -123,11 +127,27 @@ map <S-Right> <C-w>>
map <S-Down> <C-w>- map <S-Down> <C-w>-
map <S-Up> <C-w>+ map <S-Up> <C-w>+
" navigate windows with alt+[hjkl]
tnoremap <A-h> <C-\><C-N><C-w>h
tnoremap <A-j> <C-\><C-N><C-w>j
tnoremap <A-k> <C-\><C-N><C-w>k
tnoremap <A-l> <C-\><C-N><C-w>l
inoremap <A-h> <C-\><C-N><C-w>h
inoremap <A-j> <C-\><C-N><C-w>j
inoremap <A-k> <C-\><C-N><C-w>k
inoremap <A-l> <C-\><C-N><C-w>l
nnoremap <A-h> <C-w>h
nnoremap <A-j> <C-w>j
nnoremap <A-k> <C-w>k
nnoremap <A-l> <C-w>l
inoremap <C-U> <C-G>u<C-U> inoremap <C-U> <C-G>u<C-U>
nnoremap & :&&<CR> nnoremap & :&&<CR>
xnoremap & :&&<CR> xnoremap & :&&<CR>
nnoremap Y y$ nnoremap Y y$
inoremap <C-Space> <C-x><C-o>
nmap <C-L> :noh<cr>:redraw!<cr> nmap <C-L> :noh<cr>:redraw!<cr>
nmap <F9> :make<CR> nmap <F9> :make<CR>
@ -165,4 +185,5 @@ let g:localvimrc_whitelist='/home/crater2150/code/.*'
let g:localvimrc_sandbox=0 let g:localvimrc_sandbox=0
let g:UltiSnipsEnableSnipMate = 0 let g:UltiSnipsEnableSnipMate = 0
let g:ale_completion_enabled = 1
" vi:foldmethod=marker sw=2 " vi:foldmethod=marker sw=2

View file

@ -25,7 +25,7 @@ Plug 'vim-scripts/argtextobj.vim'
Plug 'mhinz/vim-signify' Plug 'mhinz/vim-signify'
Plug 'neomake/neomake' Plug 'neomake/neomake'
Plug 'vim-syntastic/syntastic' "Plug 'vim-syntastic/syntastic'
Plug 'Chiel92/vim-autoformat' Plug 'Chiel92/vim-autoformat'
" completion and snippets " completion and snippets
@ -33,10 +33,9 @@ Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
"Plug 'nixprime/cpsm', { 'do': 'PY3=ON ./install.sh' } | Plug 'Shougo/denite.nvim'
Plug '/usr/share/vim/vimfiles' Plug '/usr/share/vim/vimfiles'
Plug 'junegunn/fzf.vim' Plug 'junegunn/fzf.vim'
Plug 'mileszs/ack.vim'
Plug 'bling/vim-airline' Plug 'bling/vim-airline'
@ -56,11 +55,18 @@ Plug 'gisphm/vim-gitignore'
" C " C
Plug 'derekwyatt/vim-fswitch' Plug 'derekwyatt/vim-fswitch'
" other filetype specific plugins
Plug 'derekwyatt/vim-scala' "Scala
Plug 'crater2150/vim-scala', { 'branch': 'indent-fix' }
Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' } Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' }
" Rust
Plug 'racer-rust/vim-racer'
Plug 'rust-lang/rust.vim'
Plug 'cespare/vim-toml'
Plug 'w0rp/ale'
" other filetype specific plugins
Plug 'jamessan/vim-gnupg' Plug 'jamessan/vim-gnupg'
Plug 'powerman/vim-plugin-AnsiEsc' Plug 'powerman/vim-plugin-AnsiEsc'
Plug 'tpope/vim-markdown' Plug 'tpope/vim-markdown'
@ -69,6 +75,7 @@ Plug 'ledger/vim-ledger'
Plug 'elzr/vim-json' Plug 'elzr/vim-json'
Plug 'kchmck/vim-coffee-script' Plug 'kchmck/vim-coffee-script'
Plug 'gre/play2vim' Plug 'gre/play2vim'
Plug 'isobit/vim-caddyfile'
function! BuildComposer(info) function! BuildComposer(info)
if a:info.status != 'unchanged' || a:info.force if a:info.status != 'unchanged' || a:info.force