Compare commits
4 Commits
master
...
4457d21b1f
| Author | SHA1 | Date | |
|---|---|---|---|
| 4457d21b1f | |||
| 3a053ca5c7 | |||
| 5960256ae0 | |||
| 75731d35c2 |
@@ -5,7 +5,6 @@ setlocal ts=2 sw=2 expandtab omnifunc=necoghc#omnifunc
|
||||
|
||||
let g:haskell_classic_highlighting = 1
|
||||
|
||||
let g:ghcmod_hlint_options = ['--ignore=Eta reduce $']
|
||||
|
||||
syntax on
|
||||
filetype plugin indent on
|
||||
@@ -14,21 +13,6 @@ filetype plugin indent on
|
||||
call CmdAlias('hasktags', '!/home/jule/.cabal/bin/hasktags -c .<CR>')
|
||||
|
||||
|
||||
let g:necoghc_enable_detailed_browse = 1
|
||||
|
||||
" ALE
|
||||
let g:ale_linters = {'haskell':['ghc-mod', 'hdevtools'], 'c':['clang']}
|
||||
" let g:ale_fixers = {
|
||||
" \ 'go': ['gofmt', 'goimports'],
|
||||
" \}
|
||||
let g:ale_haskell_hdevtools_options = "-g '-Wall' -g '-Wno-orphans'"
|
||||
|
||||
" neco-ghc
|
||||
let g:haskellmode_completion_ghc = 0
|
||||
let g:necoghc_enable_detailed_browse = 1
|
||||
autocmd FileType haskell setlocal omnifunc=necoghc#omnifunc
|
||||
let g:ycm_semantic_triggers = {'haskell' : ['.']}
|
||||
|
||||
|
||||
function! HaskellDocCurrentWord()
|
||||
let word = expand("<cword>")
|
||||
@@ -36,17 +20,9 @@ function! HaskellDocCurrentWord()
|
||||
endfunction
|
||||
|
||||
|
||||
" clear search
|
||||
nmap <F2> :noh<CR>:GhcModTypeClear<CR>
|
||||
imap <F2> <C-O>:noh<CR>:GhcModTypeClear<CR>
|
||||
|
||||
" unmap <F3>
|
||||
" unmap <F4>
|
||||
|
||||
nmap <F6> :GhcModType<CR>
|
||||
nmap <F8> :call HaskellDocCurrentWord()<CR><CR>
|
||||
|
||||
|
||||
nmap <silent> <F3> :silent update <bar> HsimportModule<CR>
|
||||
nmap <silent> <F4> :silent update <bar> HsimportSymbol<CR>
|
||||
|
||||
@@ -96,3 +72,55 @@ let g:vim_annotations_offset = '/.liquid/'
|
||||
" nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR>
|
||||
|
||||
" autocmd VimEnter * LanguageClientStart
|
||||
|
||||
if has("nvim")
|
||||
let g:ale_enabled = 0
|
||||
|
||||
" let g:intero_backend = {
|
||||
" \ 'command': 'cabal new-repl',
|
||||
" \ 'options': '',
|
||||
" \ 'cwd': expand('%:p:h'),
|
||||
" \}
|
||||
|
||||
" Intero starts automatically. Set this if you'd like to prevent that.
|
||||
let g:intero_start_immediately = 1
|
||||
|
||||
" Enable type information on hover (when holding cursor at point for ~1 second).
|
||||
let g:intero_type_on_hover = 1
|
||||
|
||||
" Change the intero window size; default is 10.
|
||||
let g:intero_window_size = 15
|
||||
|
||||
" Sets the intero window to split vertically; default is horizontal
|
||||
let g:intero_vertical_split = 1
|
||||
|
||||
" OPTIONAL: Make the update time shorter, so the type info will trigger faster.
|
||||
set updatetime=1000
|
||||
|
||||
map <silent> <leader>t <Plug>InteroGenericType
|
||||
else
|
||||
let g:ghcmod_hlint_options = ['--ignore=Eta reduce $']
|
||||
|
||||
" ALE
|
||||
let g:ale_linters = {'haskell':['ghc-mod', 'hdevtools'], 'c':['clang']}
|
||||
" let g:ale_fixers = {
|
||||
" \ 'go': ['gofmt', 'goimports'],
|
||||
" \}
|
||||
let g:ale_haskell_hdevtools_options = "-g '-Wall' -g '-Wno-orphans'"
|
||||
|
||||
" neco-ghc
|
||||
let g:necoghc_enable_detailed_browse = 1
|
||||
let g:haskellmode_completion_ghc = 0
|
||||
let g:necoghc_enable_detailed_browse = 1
|
||||
autocmd FileType haskell setlocal omnifunc=necoghc#omnifunc
|
||||
let g:ycm_semantic_triggers = {'haskell' : ['.']}
|
||||
|
||||
" clear search
|
||||
nmap <F2> :noh<CR>:GhcModTypeClear<CR>
|
||||
imap <F2> <C-O>:noh<CR>:GhcModTypeClear<CR>
|
||||
|
||||
" unmap <F3>
|
||||
" unmap <F4>
|
||||
|
||||
nmap <F6> :GhcModType<CR>
|
||||
endif
|
||||
|
||||
70
vimrc
70
vimrc
@@ -25,16 +25,10 @@ Plug 'vim-scripts/genindent.vim'
|
||||
Plug 'sjl/gundo.vim'
|
||||
Plug 'idris-hackers/idris-vim'
|
||||
Plug 'wimstefan/Lightning'
|
||||
Plug 'vim-scripts/LustyJuggler'
|
||||
Plug 'yegappan/mru'
|
||||
Plug 'scrooloose/nerdcommenter'
|
||||
Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
|
||||
Plug 'NLKNguyen/papercolor-theme'
|
||||
Plug 'powerline/powerline', {
|
||||
\ 'branch': 'develop',
|
||||
\ 'do': 'python setup.py install --user',
|
||||
\ 'rtp': 'powerline/bindings/vim',
|
||||
\ }
|
||||
Plug 'vim-scripts/promela.vim'
|
||||
Plug 'AndrewRadev/simple_bookmarks.vim'
|
||||
Plug 'Keithbsmiley/swift.vim'
|
||||
@@ -51,6 +45,17 @@ Plug 'nathanaelkane/vim-indent-guides'
|
||||
Plug 'xolox/vim-misc'
|
||||
Plug 'Shougo/vimproc.vim', {'do' : 'make'}
|
||||
Plug 'tpope/vim-rhubarb'
|
||||
if has("nvim")
|
||||
Plug 'iCyMind/NeoSolarized'
|
||||
Plug 'vim-airline/vim-airline'
|
||||
else
|
||||
Plug 'vim-scripts/LustyJuggler'
|
||||
Plug 'powerline/powerline', {
|
||||
\ 'branch': 'develop',
|
||||
\ 'do': 'python setup.py install --user',
|
||||
\ 'rtp': 'powerline/bindings/vim',
|
||||
\ }
|
||||
endif
|
||||
|
||||
" local_vimrc
|
||||
Plug 'LucHermitte/lh-vim-lib'
|
||||
@@ -78,8 +83,12 @@ Plug 'Valloric/YouCompleteMe', { 'do': './install.py --clang-completer --go-comp
|
||||
\ }
|
||||
|
||||
" haskell
|
||||
Plug 'eagletmt/ghcmod-vim', { 'for': 'haskell' }
|
||||
Plug 'eagletmt/neco-ghc', { 'for': 'haskell' }
|
||||
if has("nvim")
|
||||
Plug 'parsonsmatt/intero-neovim'
|
||||
else
|
||||
Plug 'eagletmt/ghcmod-vim', { 'for': 'haskell' }
|
||||
Plug 'eagletmt/neco-ghc', { 'for': 'haskell' }
|
||||
endif
|
||||
Plug 'lukerandall/haskellmode-vim', { 'for': 'haskell' }
|
||||
Plug 'raichoo/haskell-vim', { 'for': 'haskell' }
|
||||
Plug 'ucsd-progsys/liquid-types.vim', { 'for': 'haskell' }
|
||||
@@ -127,12 +136,14 @@ Plug 'derekwyatt/vim-scala', { 'for': 'scala' }
|
||||
" unmanaged
|
||||
Plug '~/.vim/unmanaged-vim-plug/bufonly'
|
||||
Plug '~/.vim/unmanaged-vim-plug/colorschemedegrade'
|
||||
Plug '~/.vim/unmanaged-vim-plug/fontzoom'
|
||||
Plug '~/.vim/unmanaged-vim-plug/fuzzyfinder'
|
||||
Plug '~/.vim/unmanaged-vim-plug/L9'
|
||||
Plug '~/.vim/unmanaged-vim-plug/log'
|
||||
Plug '~/.vim/unmanaged-vim-plug/ScrollColor'
|
||||
Plug '~/.vim/unmanaged-vim-plug/txtfmt'
|
||||
if !has("nvim")
|
||||
Plug '~/.vim/unmanaged-vim-plug/fontzoom'
|
||||
endif
|
||||
|
||||
|
||||
" Initialize plugin system
|
||||
@@ -142,14 +153,17 @@ call plug#end()
|
||||
" ===== further plugin initialization =====
|
||||
so ~/.vim/plugged/cmdalias.vim/plugin/cmdalias.vim
|
||||
|
||||
"powerline
|
||||
python from powerline.vim import setup as powerline_setup
|
||||
python powerline_setup()
|
||||
python del powerline_setup
|
||||
set laststatus=2
|
||||
|
||||
" lj
|
||||
let g:LustyJugglerSuppressRubyWarning = 1
|
||||
if !has("nvim")
|
||||
"powerline
|
||||
python from powerline.vim import setup as powerline_setup
|
||||
python powerline_setup()
|
||||
python del powerline_setup
|
||||
set laststatus=2
|
||||
|
||||
" lj
|
||||
let g:LustyJugglerSuppressRubyWarning = 1
|
||||
endif
|
||||
|
||||
|
||||
" global settings
|
||||
@@ -267,8 +281,30 @@ if has('gui_running')
|
||||
else
|
||||
set background=dark
|
||||
colorscheme solarized
|
||||
" colorscheme dante
|
||||
endif
|
||||
|
||||
if has("nvim")
|
||||
if exists('g:GtkGuiLoaded')
|
||||
let g:neosolarized_contrast = "normal"
|
||||
let g:neosolarized_visibility = "normal"
|
||||
let g:neosolarized_vertSplitBgTrans = 0
|
||||
let g:neosolarized_bold = 1
|
||||
let g:neosolarized_underline = 1
|
||||
let g:neosolarized_italic = 1
|
||||
set background=dark
|
||||
colorscheme NeoSolarized
|
||||
else
|
||||
let g:neosolarized_contrast = "normal"
|
||||
let g:neosolarized_visibility = "normal"
|
||||
let g:neosolarized_vertSplitBgTrans = 0
|
||||
let g:neosolarized_bold = 1
|
||||
let g:neosolarized_underline = 1
|
||||
let g:neosolarized_italic = 1
|
||||
set background=dark
|
||||
colorscheme NeoSolarized
|
||||
endif
|
||||
endif
|
||||
|
||||
" ===========================
|
||||
|
||||
" Solarized stuff
|
||||
|
||||
Reference in New Issue
Block a user