random leftover changes in old dotfiles

.bash/environ.sh

@@ -4,14 +4,13 @@ export TERM="xterm-256color"
 
 eval "$(dircolors -b)"
 
+export PATH="/usr/lib/ccache:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin"
 export PATH="$HOME/.gem/ruby/1.8/bin:$PATH"
 export PATH="$HOME/.gem/ruby/1.9.1/bin:$PATH"
 export PATH="$HOME/.perl6/bin:$PATH"
 export PATH="$HOME/.local/bin:$PATH"
 
-export PATH="$HOME/.ghc/bin:$PATH"
 export PATH="$HOME/.cabal/bin:$PATH"
-export PATH="cabal-dev/bin:$PATH"
 
 export MANPATH="$HOME/.local/share/man:$MANPATH"
 
@@ -30,3 +29,4 @@ export XDG_CONFIG_HOME="$HOME/.config"
 
 export DARCS_DO_COLOR_LINES=1
 export DARCS_ALWAYS_COLOR=1
+export DARCS_DONT_ESCAPE_ISPRINT=1

.darcs/boring

@@ -1,3 +1,6 @@
-^cabal-dev($|/)
-^dist(/|$)
-^state(/|$)
+(^|/)tags$
+(^|/)cabal-dev($|/)
+(^|/)dist(/|$)
+(^|/)\.cumino\.buff$
+\..*\.swp$
+\..*\.un~$

.darcs/defaults

@@ -1,8 +1,6 @@
-ALL test
 apply interactive
 diff diff-command colordiff -Nur %1 %2
 diff no-pause-for-gui
-get lazy
 log max-count 10
 log number
 log reverse

.gitconfig

@@ -18,7 +18,7 @@ cl = clone
 co = checkout
 dc = diff --cached
 di = diff
-ed = commit --amend
+ed = commit --amend --reuse-message=HEAD
 h = help
 hub = browse
 l = log --graph --decorate --pretty=oneline --abbrev-commit

.gvimrc

@@ -1,6 +1,6 @@
 " GUI {{{
 
-let &guifont = 'Monospace'
+let &guifont = 'Source Code Pro 9'
 set guioptions=aceg
 set guiheadroom=0
 
@@ -9,8 +9,8 @@ set guiheadroom=0
 
 " Colorscheme {{{
 
-set background=dark
-colorscheme vydark
+set background=light
+colorscheme Tomorrow
 
 " }}} Colorscheme
 
@@ -19,7 +19,7 @@ colorscheme vydark
 
 set relativenumber
 set numberwidth=5
-set foldcolumn=1
+set foldcolumn=3
 
 " }}} Settings
 
@@ -37,6 +37,8 @@ augroup Focus
     \ |   setlocal nonumber norelativenumber foldcolumn=0
     \ | endif
 
+  auto FileType qf setlocal nonumber norelativenumber foldcolumn=0
+
   auto BufWinEnter
     \ * if &buftype ==# 'quickfix'
     \ |   setlocal wrap

.vim/ftplugin/haskell.vim

@@ -6,6 +6,7 @@ nnoremap <buffer> <silent> <leader>hc :Tabularize haskell_comments<cr>
 vnoremap <buffer> <silent> <leader>hc :Tabularize haskell_comments<cr>
 
 setlocal omnifunc=necoghc#omnifunc
+setlocal formatprg=stylish-haskell
 
 nnoremap <buffer> <silent> <leader>gt :HdevtoolsType<cr>
 nnoremap <buffer> <silent> <leader>gc :HdevtoolsClear<cr>

.vim/vundle.vim

@@ -3,10 +3,14 @@ Bundle 'gmarik/vundle'
 
 " Colorschemes {{{
 
-Bundle 'altercation/vim-colors-solarized'
 Bundle 'neutron.vim'
 Bundle 'vydark'
 Bundle 'vylight'
+Bundle 'Zenburn'
+
+Bundle 'altercation/vim-colors-solarized'
+Bundle 'chriskempson/base16-vim'
+Bundle 'chriskempson/vim-tomorrow-theme'
 
 " }}}
 
@@ -17,7 +21,9 @@ Bundle 'FuzzyFinder'
 Bundle 'L9'
 Bundle 'renamer.vim'
 
+Bundle 'adinapoli/vim-markmultiple'
 Bundle 'Bogdanp/quicksilver.vim'
+Bundle 'chrisbra/Recover.vim'
 Bundle 'godlygeek/tabular'
 Bundle 'kana/vim-textobj-indent'
 Bundle 'kana/vim-textobj-user'
@@ -26,7 +32,6 @@ Bundle 'Lokaltog/vim-powerline'
 Bundle 'mileszs/ack.vim'
 Bundle 'scrooloose/nerdtree'
 Bundle 'scrooloose/syntastic'
-Bundle 'Shougo/neocomplcache'
 Bundle 'Shougo/unite.vim'
 Bundle 'Shougo/vimproc'
 Bundle 'SirVer/ultisnips'
@@ -36,6 +41,7 @@ Bundle 'tpope/vim-eunuch'
 Bundle 'tpope/vim-fugitive'
 Bundle 'tpope/vim-repeat'
 Bundle 'tpope/vim-rhubarb'
+Bundle 'tpope/vim-scriptease'
 Bundle 'tpope/vim-surround'
 Bundle 'tpope/vim-unimpaired'
 
@@ -50,7 +56,10 @@ Bundle 'eagletmt/ghcmod-vim'
 Bundle 'hallison/vim-markdown'
 Bundle 'ujihisa/neco-ghc'
 
+Bundle 'mozilla/rust', {'rtp': 'src/etc/vim'}
+
 Bundle 'dag/vim2hs'
+" Bundle 'dag/vim-haskell-syntax'
 
 " }}}
 

.vimrc

@@ -54,7 +54,7 @@ nnoremap <silent> <leader>tsp :setlocal spell!<CR>
 nnoremap <silent> <leader>tcu :setlocal cursorline! cursorcolumn!<CR>
 nnoremap <silent> <leader>tnu :call toggle#relativenumber()<CR>
 nnoremap <silent> <leader>tsy :SyntasticToggleMode<CR>
-nnoremap <silent> <leader>tne :NERDTreeToggle<CR>
+nnoremap <silent> <F9> :NERDTreeToggle<CR>
 nnoremap <silent> <leader>tli :setlocal wrap! list!<CR>
 
 " }}} Toggles
@@ -157,8 +157,31 @@ nnoremap <silent> sr     :FufRenewCache<CR>
 
 " }}} FuzzyFinder
 
+" Configuring Vim {{{
+
+nnoremap <F6> :vsplit $MYVIMRC<CR>
+nnoremap <C-F6> :vsplit $MYGVIMRC<CR>
+nnoremap <S-F6> :vsplit ~/.vim/vundle.vim<cr>
+nnoremap <C-S-F6> :NERDTreeToggle ~/.vim<cr>
+
+" }}} Configuring Vim
+
+" Fold Navigation {{{
+
+nnoremap <m-h> zc
+nnoremap <m-j> zj
+nnoremap <m-k> zk
+nnoremap <m-l> zo
+
+" }}} Fold Navigation
+
 " Various {{{
 
+nnoremap ; :
+vnoremap ; :
+nnoremap : ;
+vnoremap ; :
+
 vnoremap <c-right> :s/^\s*\zs/ /<cr>:nohl<cr>gv
 vnoremap <c-left> :s/^\s*\zs\s//<cr>:nohl<cr>gv
 
@@ -167,14 +190,7 @@ nnoremap <leader>gs :Gstatus<cr>
 nnoremap <leader>a :Tabularize<space>
 vnoremap <leader>a :Tabularize<space>
 
-nnoremap <leader>ev :split $MYVIMRC<cr>
-nnoremap <leader>eg :split $MYGVIMRC<cr>
-nnoremap <leader>eb :split ~/.vim/vundle.vim<cr>
-nnoremap <leader>et :NERDTreeToggle ~/.vim<cr>
-
-call togglebg#map('<F5>')
-
-nnoremap <silent> <F9> :write \| make \| cwindow<cr>
+nnoremap <silent> <F5> :write \| make \| cwindow<cr>
 
 nnoremap gt <C-]>
 
@@ -218,12 +234,14 @@ set autowriteall
 set confirm
 set hidden
 set keywordprg=:help
+set maxmempattern=2000000
 set modeline
 set mouse=a
 set path+=bin
 set path+=src
 set path+=test
 set undofile
+set virtualedit=block
 
 " }}} Behavior
 
@@ -234,6 +252,7 @@ set laststatus=2
 set listchars=eol:¶,tab:»—,trail:!
 set ruler
 set scrolloff=3
+set shortmess+=I
 set showcmd
 
 let g:changelog_spacing_errors = 0
@@ -261,11 +280,13 @@ set smartcase
 
 " Plugins {{{
 
+let g:ackprg                          = 'ag --nogroup --nocolor --column'
 let g:ctrlp_custom_ignore             = '\v%(\.git|_darcs|cabal-dev|dist|state|tags)$'
 let g:ctrlp_working_path_mode         = 0
 let g:cumino_default_terminal         = '/usr/bin/gnome-terminal'
 let g:neocomplcache_enable_at_startup = 1
 let g:Powerline_symbols               = 'fancy'
+let g:syntastic_check_on_open         = 1
 let g:syntastic_enable_highlighting   = 0
 let g:syntastic_stl_format            = '%E{ E:%fe }'
 let g:UltiSnipsDontReverseSearchPath  = 1
@@ -296,14 +317,17 @@ let python_space_error_highlight = 1
 
 " Haskell {{{
 
-let g:haddock_browser          = 'xdg-open'
-let g:haskell_conceal_wide     = 1
-let g:haskell_autotags         = 1
-let g:haskell_tags_generator   = 'hasktags'
-let g:hpaste_author            = 'donri'
+let g:ghcmod_ghc_options     = ['-fno-code']
+let g:haddock_browser        = 'xdg-open'
+let g:haskell_autotags       = 1
+let g:haskell_conceal_wide   = 0
+let g:haskell_tags_generator = 'hasktags'
+let g:hdevtools_options      = '-g-fno-code'
+let g:hpaste_author          = 'donri'
 
 let g:syntastic_haskell_checker_args =
-  \ '--hlintOpt="--language=XmlSyntax" --hlintOpt="--ignore=Use import/export shortcut" --ghcOpt="-fno-warn-name-shadowing"'
+  \ '-h-XXmlSyntax -h-i"Use import/export shortcut" -h--cpp-include=include -g-Iinclude -g-fno-warn-name-shadowing -g-fno-code -g-ibench:bin:src:test'
+
 
 " }}} Haskell
 
@@ -314,6 +338,12 @@ let g:sh_fold_enabled = 1
 
 " }}} Shellscript
 
+" Rust {{{
+
+let g:no_rust_conceal = 1
+
+" }}} Rust
+
 " }}} Settings
 
 
@@ -323,12 +353,13 @@ augroup Workarounds
   auto!
   auto ColorScheme
     \ * filetype detect
-    \ | highlight! link CursorLineNr LineNr
-    \ | highlight! link Directory Typedef
-    \ | highlight! link FoldColumn Folded
     \ | highlight! link SignColumn FoldColumn
-    \ | highlight! link Conceal Operator
-    \ | highlight! Normal guibg=#222222
+
+    " \ | highlight! link CursorLineNr LineNr
+    " \ | highlight! link FoldColumn Folded
+    " \ | highlight! link Folded LineNr
+    " \ | highlight! link Directory Typedef
+    " \ | highlight! link Conceal Operator
 augroup END
 
 " }}} Workarounds