hellerve/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added ghc_home, cabal_home flags, branch config in git, sidharta->veitheller

Browse Source
This commit is contained in:
hellerve
2015-12-29 10:15:34 +01:00
parent 9a8e2a2cce
commit 7dba9df37f
24 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vim/bundle/ctrlp.vim

Submodule .vim/bundle/ctrlp.vim updated: b5d3fe66a5...564176f01d

2
.vim/bundle/ghcmod-vim

Submodule .vim/bundle/ghcmod-vim updated: 7e5f6102aa...1cab59653e

2
.vim/bundle/haskell-vim

Submodule .vim/bundle/haskell-vim updated: 890395d5f5...72900a16f7

2
.vim/bundle/neco-ghc

Submodule .vim/bundle/neco-ghc updated: 7d2c360736...53a3d63bc4

2
.vim/bundle/nerdtree

Submodule .vim/bundle/nerdtree updated: 3b98a7fcae...4ebbb533c3

2
.vim/bundle/supertab

Submodule .vim/bundle/supertab updated: c8bfeceb1f...9f7da6d498

2
.vim/bundle/syntastic

Submodule .vim/bundle/syntastic updated: e1217a888a...281b29487f

2
.vim/bundle/tagbar

Submodule .vim/bundle/tagbar updated: c6b473f559...7b36c46d17

2
.vim/bundle/tslime.vim

Submodule .vim/bundle/tslime.vim updated: 71ec1cbe8f...4a8091956e

2
.vim/bundle/vim-airline

Submodule .vim/bundle/vim-airline updated: f45ecdac15...14d14cf951

2
.vim/bundle/vim-commentary

Submodule .vim/bundle/vim-commentary updated: 9c685131a5...e0f4850d78

2
.vim/bundle/vim-extradite

Submodule .vim/bundle/vim-extradite updated: a1dc4b63be...52326f6d33

2
.vim/bundle/vim-fugitive

Submodule .vim/bundle/vim-fugitive updated: 4cc201cbe3...8851b8fe64

2
.vim/bundle/vim-haskellConcealPlus

Submodule .vim/bundle/vim-haskellConcealPlus updated: 9c12f6d816...fdd4e15800

2
.vim/bundle/vim-indent-guides

Submodule .vim/bundle/vim-indent-guides updated: 184e55848d...49bde6fa30

2
.vim/bundle/vim-indent-object

Submodule .vim/bundle/vim-indent-object updated: 78fffa609b...1d3e4aac01

2
.vim/bundle/vim-jade

Submodule .vim/bundle/vim-jade updated: fb47bb8303...f760e23938

2
.vim/bundle/vim-tmux-navigator

Submodule .vim/bundle/vim-tmux-navigator updated: 928a52fbda...1298b71c42

2
.vim/bundle/vimproc.vim

Submodule .vim/bundle/vimproc.vim updated: 0f68bcd933...f96e476e41

2
.vim/bundle/vundle

Submodule .vim/bundle/vundle updated: cfd3b2d388...5f70ae6025

2
Makefile
View File

@@ -28,7 +28,7 @@ valgrind:
cp valgrindrc ~/.valgrindrc cp valgrindrc ~/.valgrindrc
vim: vim:
cp vimrc ~/.vimrc.local cp vimrc ~/.vimrc
cp -r .vim ~/.vim cp -r .vim ~/.vim
zsh: zsh:

10
cabal/config
View File

@@ -14,10 +14,10 @@
-- require-sandbox: False -- require-sandbox: False
-- ignore-sandbox: False -- ignore-sandbox: False
remote-repo: hackage.haskell.org:http://hackage.haskell.org/packages/archive 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: -- local-repo:
-- logs-dir: -- logs-dir:
world-file: /Users/sidharta/.cabal/world world-file: /Users/veitheller/.cabal/world
-- verbose: 1 -- verbose: 1
-- compiler: ghc -- compiler: ghc
-- with-compiler: -- with-compiler:
@@ -41,7 +41,7 @@ world-file: /Users/sidharta/.cabal/world
-- flags: -- flags:
-- extra-include-dirs: -- extra-include-dirs:
-- extra-lib-dirs: -- extra-lib-dirs:
extra-prog-path: /Users/sidharta/.cabal/bin extra-prog-path: /Users/veitheller/.cabal/bin
-- instantiate-with: -- instantiate-with:
-- tests: False -- tests: False
-- library-coverage: -- library-coverage:
@@ -66,7 +66,7 @@ documentation: True
-- upgrade-dependencies: False -- upgrade-dependencies: False
-- root-cmd: -- root-cmd:
-- symlink-bindir: -- symlink-bindir:
build-summary: /Users/sidharta/.cabal/logs/build.log build-summary: /Users/veitheller/.cabal/logs/build.log
-- build-log: -- build-log:
remote-build-reporting: anonymous remote-build-reporting: anonymous
-- report-planning-failure: False -- report-planning-failure: False
@@ -92,7 +92,7 @@ haddock
-- contents-location: -- contents-location:
install-dirs user install-dirs user
-- prefix: /Users/sidharta/.cabal -- prefix: /Users/veitheller/.cabal
-- bindir: $prefix/bin -- bindir: $prefix/bin
-- libdir: $prefix/lib -- libdir: $prefix/lib
-- libsubdir: $abi/$pkgkey -- libsubdir: $abi/$pkgkey

4
gitconfig
View File

@@ -29,6 +29,10 @@
[apply] [apply]
whitespace = fix whitespace = fix
[branch]
autosetupmerge = always
autosetuprebase = always
[color] [color]
branch = auto branch = auto
diff = auto diff = auto

6
zshrc
View File

@@ -2,7 +2,7 @@
zstyle ':completion:*' completer _expand _complete _ignored _approximate zstyle ':completion:*' completer _expand _complete _ignored _approximate
zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'm:{[:lower:]}={[:upper:]}' 'r:|[._-_]=** r:|=**' '' 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 -Uz compinit -D && compinit
autoload -U promptinit && promptinit autoload -U promptinit && promptinit
@@ -20,7 +20,9 @@ bindkey -e
export GOPATH=~/.go export GOPATH=~/.go
export GOBIN=$GOPATH/bin 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 MANPATH=$MANPATH:/opt/local/share/man:/usr/local/opt/erlang/lib/erlang/man
export INFOPATH=$INFOPATH:/opt/local/share/info export INFOPATH=$INFOPATH:/opt/local/share/info
export PYTHONSTARTUP=~/.pythonrc export PYTHONSTARTUP=~/.pythonrc