Compare commits
No commits in common. "4bc374c6400bc617fb4cd3a557887159ca183da8" and "7efad8aba1a441e486accb09a99da11cb18201a9" have entirely different histories.
4bc374c640
...
7efad8aba1
@ -3,6 +3,10 @@ setlocal ts=2 sw=2 expandtab
|
|||||||
"set background=light
|
"set background=light
|
||||||
"set guifont=Neep\ Medium\ Semi-Condensed\ 18
|
"set guifont=Neep\ Medium\ Semi-Condensed\ 18
|
||||||
|
|
||||||
|
syntax on
|
||||||
|
filetype plugin indent on
|
||||||
|
|
||||||
|
|
||||||
" tags
|
" tags
|
||||||
call CmdAlias('hasktags', '!hasktags -c .<CR>')
|
call CmdAlias('hasktags', '!hasktags -c .<CR>')
|
||||||
|
|
||||||
@ -180,6 +184,11 @@ nmap <F6> :GhcModType<CR>
|
|||||||
|
|
||||||
let g:neoformat_enabled_haskell = ['brittany']
|
let g:neoformat_enabled_haskell = ['brittany']
|
||||||
|
|
||||||
|
" rainbow
|
||||||
|
let g:rainbow_conf = {
|
||||||
|
\ 'guifgs': ['#DC322F', 'royalblue3', 'darkorange3', 'seagreen3'],
|
||||||
|
\ 'ctermfgs': ['lightred', 'lightblue', 'lightyellow', 'lightcyan', 'lightmagenta'],
|
||||||
|
\}
|
||||||
|
|
||||||
|
|
||||||
" map <silent> <leader>t <Plug>InteroGenericType
|
" map <silent> <leader>t <Plug>InteroGenericType
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
let g:ale_linters = {'python':['mypy']}
|
|
||||||
|
|
||||||
let g:ale_python_mypy_options = '--no-warn-incomplete-stub --ignore-missing-imports'
|
|
||||||
|
|
||||||
let g:ale_python_pycodestyle_options = '--ignore=W391'
|
|
||||||
|
|
||||||
let g:neoformat_enabled_python = ['autopep8']
|
|
||||||
|
|
||||||
augroup fmt
|
|
||||||
autocmd!
|
|
||||||
autocmd BufWritePre * undojoin | Neoformat
|
|
||||||
augroup END
|
|
||||||
|
|
||||||
let g:jedi#completions_enabled = 0
|
|
@ -158,8 +158,3 @@ inoremap <C-A> <C-O>:call Select()<CR>
|
|||||||
nnoremap <leader>ag :call fzf#vim#ag(expand('<cword>'), WithGitRoot())<CR>
|
nnoremap <leader>ag :call fzf#vim#ag(expand('<cword>'), WithGitRoot())<CR>
|
||||||
nnoremap <leader>tg :call fzf#vim#tags(expand('<cword>'), {'options': '--exact --select-1 --exit-0'})<CR>
|
nnoremap <leader>tg :call fzf#vim#tags(expand('<cword>'), {'options': '--exact --select-1 --exit-0'})<CR>
|
||||||
|
|
||||||
" gitgutter
|
|
||||||
nmap <leader>ggt <Esc>:GitGutterToggle<CR>
|
|
||||||
nmap <leader>nh <Plug>GitGutterNextHunk
|
|
||||||
nmap <leader>bh <Plug>GitGutterPrevHunk
|
|
||||||
|
|
||||||
|
17
vimrc
17
vimrc
@ -27,6 +27,7 @@ Plug 'Keithbsmiley/swift.vim'
|
|||||||
Plug 'majutsushi/tagbar'
|
Plug 'majutsushi/tagbar'
|
||||||
Plug 'ternjs/tern_for_vim'
|
Plug 'ternjs/tern_for_vim'
|
||||||
Plug 'xolox/vim-easytags'
|
Plug 'xolox/vim-easytags'
|
||||||
|
Plug 'tpope/vim-fugitive'
|
||||||
Plug 'nathanaelkane/vim-indent-guides'
|
Plug 'nathanaelkane/vim-indent-guides'
|
||||||
Plug 'xolox/vim-misc'
|
Plug 'xolox/vim-misc'
|
||||||
Plug 'Shougo/vimproc.vim', {'do' : 'make'}
|
Plug 'Shougo/vimproc.vim', {'do' : 'make'}
|
||||||
@ -40,18 +41,14 @@ Plug 'junegunn/fzf', { 'do': './install --bin' }
|
|||||||
Plug 'junegunn/fzf.vim'
|
Plug 'junegunn/fzf.vim'
|
||||||
Plug 'sbdchd/neoformat'
|
Plug 'sbdchd/neoformat'
|
||||||
|
|
||||||
" scm
|
|
||||||
Plug 'tpope/vim-fugitive'
|
|
||||||
Plug 'airblade/vim-gitgutter'
|
|
||||||
|
|
||||||
" local_vimrc
|
" local_vimrc
|
||||||
Plug 'LucHermitte/lh-vim-lib'
|
Plug 'LucHermitte/lh-vim-lib'
|
||||||
Plug 'LucHermitte/local_vimrc'
|
Plug 'LucHermitte/local_vimrc'
|
||||||
|
|
||||||
" completion
|
" completion
|
||||||
" Plug 'Valloric/YouCompleteMe', { 'do': './install.py --clang-completer --go-completer --rust-completer --system-boost --system-libclang',
|
Plug 'Valloric/YouCompleteMe', { 'do': './install.py --clang-completer --go-completer --rust-completer --system-boost --system-libclang',
|
||||||
" \ 'for': ['c', 'python', 'sh', 'go', 'clojure'],
|
\ 'for': ['c', 'python', 'sh', 'go', 'clojure'],
|
||||||
" \ }
|
\ }
|
||||||
" deoplete for haskell
|
" deoplete for haskell
|
||||||
if has('nvim')
|
if has('nvim')
|
||||||
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins',
|
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins',
|
||||||
@ -129,8 +126,6 @@ Plug 'pangloss/vim-javascript', { 'for': 'javascript' }
|
|||||||
|
|
||||||
" python
|
" python
|
||||||
Plug 'icedwater/vimpython', { 'for': 'python' }
|
Plug 'icedwater/vimpython', { 'for': 'python' }
|
||||||
Plug 'zchee/deoplete-jedi', { 'for': 'python' }
|
|
||||||
Plug 'davidhalter/jedi-vim', { 'for': 'python' }
|
|
||||||
|
|
||||||
" scala
|
" scala
|
||||||
Plug 'derekwyatt/vim-scala', { 'for': 'scala' }
|
Plug 'derekwyatt/vim-scala', { 'for': 'scala' }
|
||||||
@ -204,10 +199,6 @@ let g:neosnippet#snippets_directory='~/.vim/custom-snippets'
|
|||||||
|
|
||||||
|
|
||||||
" rainbow
|
" rainbow
|
||||||
let g:rainbow_conf = {
|
|
||||||
\ 'guifgs': ['#DC322F', 'royalblue3', 'darkorange3', 'seagreen3'],
|
|
||||||
\ 'ctermfgs': ['lightred', 'lightblue', 'lightyellow', 'lightcyan', 'lightmagenta'],
|
|
||||||
\}
|
|
||||||
let g:rainbow_active = 1
|
let g:rainbow_active = 1
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user