From 7dba9df37f9b4114d88dfa2fa2a8457de26f061c Mon Sep 17 00:00:00 2001 From: hellerve Date: Tue, 29 Dec 2015 10:15:34 +0100 Subject: [PATCH] added ghc_home, cabal_home flags, branch config in git, sidharta->veitheller --- .vim/bundle/ctrlp.vim | 2 +- .vim/bundle/ghcmod-vim | 2 +- .vim/bundle/haskell-vim | 2 +- .vim/bundle/neco-ghc | 2 +- .vim/bundle/nerdtree | 2 +- .vim/bundle/supertab | 2 +- .vim/bundle/syntastic | 2 +- .vim/bundle/tagbar | 2 +- .vim/bundle/tslime.vim | 2 +- .vim/bundle/vim-airline | 2 +- .vim/bundle/vim-commentary | 2 +- .vim/bundle/vim-extradite | 2 +- .vim/bundle/vim-fugitive | 2 +- .vim/bundle/vim-haskellConcealPlus | 2 +- .vim/bundle/vim-indent-guides | 2 +- .vim/bundle/vim-indent-object | 2 +- .vim/bundle/vim-jade | 2 +- .vim/bundle/vim-tmux-navigator | 2 +- .vim/bundle/vimproc.vim | 2 +- .vim/bundle/vundle | 2 +- Makefile | 2 +- cabal/config | 10 +++++----- gitconfig | 4 ++++ zshrc | 6 ++++-- 24 files changed, 34 insertions(+), 28 deletions(-) diff --git a/.vim/bundle/ctrlp.vim b/.vim/bundle/ctrlp.vim index b5d3fe6..564176f 160000 --- a/.vim/bundle/ctrlp.vim +++ b/.vim/bundle/ctrlp.vim @@ -1 +1 @@ -Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f +Subproject commit 564176f01d7f3f7f8ab452ff4e1f5314de7b0981 diff --git a/.vim/bundle/ghcmod-vim b/.vim/bundle/ghcmod-vim index 7e5f610..1cab596 160000 --- a/.vim/bundle/ghcmod-vim +++ b/.vim/bundle/ghcmod-vim @@ -1 +1 @@ -Subproject commit 7e5f6102aa709244f5d4cedec807eac4b901c4cb +Subproject commit 1cab59653ef0fba71574c7f64e60a27df2bc38fc diff --git a/.vim/bundle/haskell-vim b/.vim/bundle/haskell-vim index 890395d..72900a1 160000 --- a/.vim/bundle/haskell-vim +++ b/.vim/bundle/haskell-vim @@ -1 +1 @@ -Subproject commit 890395d5f5dc32d4cb76d00a2bd3b496e3d5e9c7 +Subproject commit 72900a16f73f93de33c9ae4374a4fbd7cc3e660e diff --git a/.vim/bundle/neco-ghc b/.vim/bundle/neco-ghc index 7d2c360..53a3d63 160000 --- a/.vim/bundle/neco-ghc +++ b/.vim/bundle/neco-ghc @@ -1 +1 @@ -Subproject commit 7d2c360736679064986925873b8d1e2b1978d9f8 +Subproject commit 53a3d63bc4ecc10d8506a40a0472987f262050da diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree index 3b98a7f..4ebbb53 160000 --- a/.vim/bundle/nerdtree +++ b/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 3b98a7fcae8f9fff356907171f0406ff8cd28921 +Subproject commit 4ebbb533c3faf2c480211db2b547972bb3b60f2b diff --git a/.vim/bundle/supertab b/.vim/bundle/supertab index c8bfece..9f7da6d 160000 --- a/.vim/bundle/supertab +++ b/.vim/bundle/supertab @@ -1 +1 @@ -Subproject commit c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7 +Subproject commit 9f7da6d4988daf863ebc414f221bb12c2614f59e diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic index e1217a8..281b294 160000 --- a/.vim/bundle/syntastic +++ b/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit e1217a888a6d1f3266ca610b04d1752cea837438 +Subproject commit 281b29487fdcfa201411e0d1d5db3a0f6fc3b71e diff --git a/.vim/bundle/tagbar b/.vim/bundle/tagbar index c6b473f..7b36c46 160000 --- a/.vim/bundle/tagbar +++ b/.vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit c6b473f5593a1cb9e567bb1a9a897f196f1f720a +Subproject commit 7b36c46d17d57db34fdb0adac9ba6382d0bb5e66 diff --git a/.vim/bundle/tslime.vim b/.vim/bundle/tslime.vim index 71ec1cb..4a80919 160000 --- a/.vim/bundle/tslime.vim +++ b/.vim/bundle/tslime.vim @@ -1 +1 @@ -Subproject commit 71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7 +Subproject commit 4a8091956e331d7b1d4187a2883b720dfec7e9dd diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline index f45ecda..14d14cf 160000 --- a/.vim/bundle/vim-airline +++ b/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit f45ecdac15d99ed2354873a8b4d40432fd0a85a3 +Subproject commit 14d14cf951c08fc88ca6c3e6f28fe47b99421e23 diff --git a/.vim/bundle/vim-commentary b/.vim/bundle/vim-commentary index 9c68513..e0f4850 160000 --- a/.vim/bundle/vim-commentary +++ b/.vim/bundle/vim-commentary @@ -1 +1 @@ -Subproject commit 9c685131a5facfa0d643feca3a61b41c007d8170 +Subproject commit e0f4850d78137a35b9461c530078bd77f39e4dce diff --git a/.vim/bundle/vim-extradite b/.vim/bundle/vim-extradite index a1dc4b6..52326f6 160000 --- a/.vim/bundle/vim-extradite +++ b/.vim/bundle/vim-extradite @@ -1 +1 @@ -Subproject commit a1dc4b63befd5032e65a0c94e7257d4636aa6a3f +Subproject commit 52326f6d333cdbb9e9c6d6772af87f4f39c00526 diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive index 4cc201c..8851b8f 160000 --- a/.vim/bundle/vim-fugitive +++ b/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 4cc201cbe3a0c3faa4cde1b82ba941d410e5e81c +Subproject commit 8851b8fe643517af160f59dfc3d88a0c4eed1fa5 diff --git a/.vim/bundle/vim-haskellConcealPlus b/.vim/bundle/vim-haskellConcealPlus index 9c12f6d..fdd4e15 160000 --- a/.vim/bundle/vim-haskellConcealPlus +++ b/.vim/bundle/vim-haskellConcealPlus @@ -1 +1 @@ -Subproject commit 9c12f6d816fc73e1262683a5293daee79790623a +Subproject commit fdd4e15800121edcb72e050650b02537af2d64ce diff --git a/.vim/bundle/vim-indent-guides b/.vim/bundle/vim-indent-guides index 184e558..49bde6f 160000 --- a/.vim/bundle/vim-indent-guides +++ b/.vim/bundle/vim-indent-guides @@ -1 +1 @@ -Subproject commit 184e55848de2304cabc5c03d2afe9b8fd098c58c +Subproject commit 49bde6fa30648345ffabfe55b3a095a293568a2e diff --git a/.vim/bundle/vim-indent-object b/.vim/bundle/vim-indent-object index 78fffa6..1d3e4aa 160000 --- a/.vim/bundle/vim-indent-object +++ b/.vim/bundle/vim-indent-object @@ -1 +1 @@ -Subproject commit 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e +Subproject commit 1d3e4aac0117d57c3e1aaaa7e5a99f1d7553e01b diff --git a/.vim/bundle/vim-jade b/.vim/bundle/vim-jade index fb47bb8..f760e23 160000 --- a/.vim/bundle/vim-jade +++ b/.vim/bundle/vim-jade @@ -1 +1 @@ -Subproject commit fb47bb8303e81fc17b4340ccd01a462332f7d90a +Subproject commit f760e239386df055eb1892243624fdf7f7c58392 diff --git a/.vim/bundle/vim-tmux-navigator b/.vim/bundle/vim-tmux-navigator index 928a52f..1298b71 160000 --- a/.vim/bundle/vim-tmux-navigator +++ b/.vim/bundle/vim-tmux-navigator @@ -1 +1 @@ -Subproject commit 928a52fbda90ec70b2eb6edaf570654df4521af0 +Subproject commit 1298b71c420f1d0abceba3f35cc710131f84d73b diff --git a/.vim/bundle/vimproc.vim b/.vim/bundle/vimproc.vim index 0f68bcd..f96e476 160000 --- a/.vim/bundle/vimproc.vim +++ b/.vim/bundle/vimproc.vim @@ -1 +1 @@ -Subproject commit 0f68bcd93399ecbcde3eaa4efd09107314c9bdee +Subproject commit f96e476e41ab4cdb9c37242c8cf76f1e5aa5b91d diff --git a/.vim/bundle/vundle b/.vim/bundle/vundle index cfd3b2d..5f70ae6 160000 --- a/.vim/bundle/vundle +++ b/.vim/bundle/vundle @@ -1 +1 @@ -Subproject commit cfd3b2d388a8c2e9903d7a9d80a65539aabfe933 +Subproject commit 5f70ae6025e951f0154e3940d123138adffa4c88 diff --git a/Makefile b/Makefile index 359f8aa..f76b2dd 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ valgrind: cp valgrindrc ~/.valgrindrc vim: - cp vimrc ~/.vimrc.local + cp vimrc ~/.vimrc cp -r .vim ~/.vim zsh: diff --git a/cabal/config b/cabal/config index a8f8331..98f35fa 100644 --- a/cabal/config +++ b/cabal/config @@ -14,10 +14,10 @@ -- require-sandbox: False -- ignore-sandbox: False remote-repo: hackage.haskell.org:http://hackage.haskell.org/packages/archive -remote-repo-cache: /Users/sidharta/.cabal/packages +remote-repo-cache: /Users/veitheller/.cabal/packages -- local-repo: -- logs-dir: -world-file: /Users/sidharta/.cabal/world +world-file: /Users/veitheller/.cabal/world -- verbose: 1 -- compiler: ghc -- with-compiler: @@ -41,7 +41,7 @@ world-file: /Users/sidharta/.cabal/world -- flags: -- extra-include-dirs: -- extra-lib-dirs: -extra-prog-path: /Users/sidharta/.cabal/bin +extra-prog-path: /Users/veitheller/.cabal/bin -- instantiate-with: -- tests: False -- library-coverage: @@ -66,7 +66,7 @@ documentation: True -- upgrade-dependencies: False -- root-cmd: -- symlink-bindir: -build-summary: /Users/sidharta/.cabal/logs/build.log +build-summary: /Users/veitheller/.cabal/logs/build.log -- build-log: remote-build-reporting: anonymous -- report-planning-failure: False @@ -92,7 +92,7 @@ haddock -- contents-location: install-dirs user - -- prefix: /Users/sidharta/.cabal + -- prefix: /Users/veitheller/.cabal -- bindir: $prefix/bin -- libdir: $prefix/lib -- libsubdir: $abi/$pkgkey diff --git a/gitconfig b/gitconfig index 20bd48c..c328cc9 100644 --- a/gitconfig +++ b/gitconfig @@ -29,6 +29,10 @@ [apply] whitespace = fix +[branch] + autosetupmerge = always + autosetuprebase = always + [color] branch = auto diff = auto diff --git a/zshrc b/zshrc index a69324b..459347d 100644 --- a/zshrc +++ b/zshrc @@ -2,7 +2,7 @@ zstyle ':completion:*' completer _expand _complete _ignored _approximate zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'm:{[:lower:]}={[:upper:]}' 'r:|[._-_]=** r:|=**' '' -zstyle :compinstall filename '/Users/sidharta/.zshrc' +zstyle :compinstall filename '/Users/veitheller/.zshrc' autoload -Uz compinit -D && compinit autoload -U promptinit && promptinit @@ -20,7 +20,9 @@ bindkey -e export GOPATH=~/.go export GOBIN=$GOPATH/bin -export PATH=$PATH:/opt/local/bin:/usr/local/sbin:~/.cabal/bin:$GOBIN +export GHC_HOME=/usr/local/bin +export CABAL_HOME=$HOME/.cabal/ +export PATH=$GHC_HOME:$CABAL_HOME/bin:$PATH:/opt/local/bin:/usr/local/sbin:~/.cabal/bin:$GOBIN export MANPATH=$MANPATH:/opt/local/share/man:/usr/local/opt/erlang/lib/erlang/man export INFOPATH=$INFOPATH:/opt/local/share/info export PYTHONSTARTUP=~/.pythonrc