From 61048f11c88cc1f7ae05dc6d999cc3cd3e1be75a Mon Sep 17 00:00:00 2001 From: Carolyn Saunders Date: Sat, 11 Feb 2017 10:54:23 -0800 Subject: [PATCH] Tweaked init.vim and .zshrc --- .config/nvim/init.vim | 40 ++++++++++++++++++++++++++++++++++++++++ .xprofile | 2 +- .zshrc | 1 + 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index febb300..8a3c519 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -15,6 +15,8 @@ Plug 'ntpeters/vim-better-whitespace' Plug 'jiangmiao/auto-pairs' Plug 'scrooloose/nerdcommenter' Plug 'neovimhaskell/haskell-vim', {'for' : 'haskell'} +Plug 'eagletmt/neco-ghc', {'for' : 'haskell'} +Plug 'Twinside/vim-hoogle', {'for' : 'haskell'} Plug 'scrooloose/nerdtree', {'on' : 'NERDTreeToggle'} Plug 'mileszs/ack.vim' Plug 'easymotion/vim-easymotion' @@ -31,6 +33,7 @@ Plug 'plasticboy/vim-markdown', {'for' : 'markdown'} Plug 'reedes/vim-pencil', {'for' : 'markdown'} Plug 'reedes/vim-lexical', {'for' : 'markdown'} Plug 'ElmCast/elm-vim', {'for' : 'elm'} +Plug 'bitterjug/vim-tagbar-ctags-elm', {'for' : 'elm'} Plug 'xolox/vim-misc' Plug 'xolox/vim-easytags' Plug 'janko-m/vim-test' @@ -216,6 +219,39 @@ let g:tagbar_type_elixir = { \] \} + let g:tagbar_type_haskell = { + \ 'ctagsbin' : 'hasktags', + \ 'ctagsargs' : '-x -c -o-', + \ 'kinds' : [ + \ 'm:modules:0:1', + \ 'd:data: 0:1', + \ 'd_gadt: data gadt:0:1', + \ 't:type names:0:1', + \ 'nt:new types:0:1', + \ 'c:classes:0:1', + \ 'cons:constructors:1:1', + \ 'c_gadt:constructor gadt:1:1', + \ 'c_a:constructor accessors:1:1', + \ 'ft:function types:1:1', + \ 'fi:function implementations:0:1', + \ 'o:others:0:1' + \ ], + \ 'sro' : '.', + \ 'kind2scope' : { + \ 'm' : 'module', + \ 'c' : 'class', + \ 'd' : 'data', + \ 't' : 'type' + \ }, + \ 'scope2kind' : { + \ 'module' : 'm', + \ 'class' : 'c', + \ 'data' : 'd', + \ 'type' : 't' + \ } +\ } + + "incsearch map / (incsearch-forward) @@ -322,3 +358,7 @@ set hidden let g:racer_cmd = "~/.cargo/bin/racer" let $RUST_SRC_PATH="~/.multirust/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src" let g:racer_experimental_completer = 1 + +" Disable haskell-vim omnifunc +let g:haskellmode_completion_ghc = 0 +autocmd FileType haskell setlocal omnifunc=necoghc#omnifunc diff --git a/.xprofile b/.xprofile index c9511bc..870e205 100755 --- a/.xprofile +++ b/.xprofile @@ -6,4 +6,4 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then fi [[ -f ~/.Xresources ]] && xrdb -merge -I$HOME ~/.Xresources -exec xmonad +exec bspwm diff --git a/.zshrc b/.zshrc index 3e84fc9..a906892 100644 --- a/.zshrc +++ b/.zshrc @@ -55,6 +55,7 @@ alias bar=". $HOME/.scripts/bar.sh" export PATH="$HOME/.apps/Elm-Platform/0.18/.cabal-sandbox/bin":$PATH export PATH="$HOME/.apps/admiral/target/release":$PATH export PATH="$HOME/.apps/roller/target/release":$PATH +export PATH="$HOME/.apps":$PATH export PATH="$HOME/.local/bin":$PATH export PATH="$HOME/.cargo/bin":$PATH