better vimrc haskelling and other stuff

3 files changed, 33 insertions, 6 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index 289cab0..f660181 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -161,3 +161,5 @@ export PROMPT_COMMAND='history -a' #&&history -n'
 
 alias vi="nvim"
 alias vim="nvim"
+
+export PATH=$PATH:/home/miguel/.local/bin
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 6722cf5..3e94f46 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -27,10 +27,10 @@ unbind C-b
 # vi mode
 set-window-option -g mode-keys vi
 
-# terminal 
+# terminal
 # set -g default-terminal "tmux-256color"  # this makes problems in mc
 #set -g default-terminal "xterm-256color"
-set -g default-terminal "screen-256color" 
+set -g default-terminal "screen-256color"
 set -g base-index 1 # ADDED AT WORK
 
 # escape timeout
@@ -51,9 +51,11 @@ bind -n M-Up select-pane -U
 bind -n M-Down select-pane -D
 
 # Enable mouse control (clickable windows, panes, resizable panes)
-set -g mouse-select-window on
-set -g mouse-select-pane on
-set -g mouse-resize-pane on
+
+#set -g mouse-select-window on
+#set -g mouse-select-pane on
+#set -g mouse-resize-pane on
+set -g mouse on
 
 # don't rename windows automatically
 set-option -g allow-rename off
diff --git a/vim/vimrc b/vim/vimrc
index 022b39a..c7d0e6d 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -101,6 +101,8 @@ Plugin 'honza/vim-snippets'
 Plugin 'ndmitchell/ghcid', { 'rtp': 'plugins/nvim' } " added at work
 Plugin 'neomake/neomake'
 Plugin 'parsonsmatt/intero-neovim'
+Plugin 'mileszs/ack.vim'
+Plugin 'neovimhaskell/haskell-vim'
 
 call vundle#end()
 filetype plugin indent on
@@ -306,6 +308,7 @@ nnoremap <leader>W :match<cr>
 nnoremap <leader>cn :cnext<cr>
 nnoremap <leader>cp :cprevious<cr>
 nnoremap <leader>cc :cc<cr>
+nnoremap <leader>cq :copen<cr>
 
 " buffer navigaion
 nnoremap <leader>bn :MBEbn<cr>
@@ -316,8 +319,10 @@ nnoremap <leader>bd :MBEbd<cr>
 nnoremap <leader>ln :NERDTreeToggle<cr>
 nnoremap <leader>lt :TagbarToggle<cr>
 nnoremap <leader>lm :MBEToggle<cr>
-nnoremap <leader>lq :copen<cr>
 "nnoremap <leader>lg :ConqueGdb<cr>
+
+" silver search
+noremap <leader>a :Ack!<Space>
 " }}}
 
 " {{{ FILETYPES
@@ -472,3 +477,21 @@ let g:intero_load_targets= ["twg"]
 let g:ghcid_keep_open = 1
 " show trailing whitespace per default:
 match ErrorMsg /\v +$/
+
+" let g:ackprg = 'ag --nogroup --nocolor --column'
+let g:ackprg = 'ag --vimgrep'
+let g:ackhighlight = 1
+" let g:ack_autoclose = 1
+" let g:ack_autofold_results = 1
+cnoreabbrev Ack Ack!
+
+let g:haskell_enable_quantification = 1   " to enable highlighting of `forall`
+let g:haskell_enable_recursivedo = 1      " to enable highlighting of `mdo` and `rec`
+let g:haskell_enable_arrowsyntax = 1      " to enable highlighting of `proc`
+let g:haskell_enable_pattern_synonyms = 1 " to enable highlighting of `pattern`
+let g:haskell_enable_typeroles = 1        " to enable highlighting of type roles
+let g:haskell_enable_static_pointers = 1  " to enable highlighting of `static`
+let g:haskell_backpack = 1                " to enable highlighting of backpack keywords
+" let g:haskell_classic_highlighting = 1
+
+