init on 10.9

Bilalh · May 26, 2014 · b0a4c74 · b0a4c74
1 parent 72f3e0a
commit b0a4c74
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 110 deletions.
diff --git a/.bash_profile b/.bash_profile
@@ -1,15 +1,13 @@
 # \u is username
-#export PS1="\u: $ "              # bash prompt
-export PS1='Bilalh$(__git_ps1 "@%s") \$ '  # Shows Git branch
-export GIT_PS1_SHOWDIRTYSTATE=true
-export GIT_PS1_SHOWUNTRACKEDFILES=true
-export GIT_PS1_SHOWSTASHSTATE=true
+export PS1="\u: $ "              # bash prompt
+#export PS1='Bilalh$(__git_ps1 "@%s") \$ '  # Shows Git branch
+#export GIT_PS1_SHOWDIRTYSTATE=true
+#export GIT_PS1_SHOWUNTRACKEDFILES=true
+#export GIT_PS1_SHOWSTASHSTATE=true
 
 export LC_CTYPE=en_GB.UTF-8;
 export LANG=en_GB.UTF-8
 
-#for gnu parallel
-export PARALLEL="-j7"
 
 # bilalh@8afbf821: [develop]      full colour + commit id + branch
 #export PS1='\[$(tput setaf 3)\]\u@\h:\[$(tput sgr0)$(tput setaf 5)\]\[$(tput sgr0)$(tput setaf 2)\] $(__git_ps1 "[%s]") \[$(tput sgr0)\]$ '
@@ -20,7 +18,6 @@ export HISTCONTROL=erasedups # remove duplicate from history
 # don't store history entries that match this pattern  
 declare -x HISTIGNORE='cs:jr*:gitx:hista:aes*:srm*: *'
 
-alias hg='history | grep '
 alias hist='history | less '
 
 #allow colour in less 
@@ -37,10 +34,13 @@ export FIGNORE=$FIGNORE:.o:.out:.pyc:.pdfsync:.log:.bbl:.aux:.blg:.out:.toc:
 
 # Colorize the prompt and commands such as ls
 export CLICOLOR=1
+
 # light colours
 #export LSCOLORS=ExFxCxDxbxegedabagacad
+
 # dark colours
 export LSCOLORS=gxBxhxDxfxhxhxhxhxcxcx
+
 export LESS_TERMCAP_mb=$'\E[01;31m'       # begin blinking
 export LESS_TERMCAP_md=$'\E[01;38;5;74m'  # begin bold
 export LESS_TERMCAP_me=$'\E[0m'           # end mode
@@ -61,45 +61,7 @@ if [ -f ~/CS/instancegen/scripts/misc/convenience.sh ]; then
     source ~/CS/instancegen/scripts/misc/convenience.sh 
 fi
 
-### Path Settings 
-# Path settings(bin before current $PATH to override default version)
-PATH=$HOME/bin:$HOME/bin/haskell_stuff:/usr/local/bin:$PATH
-PATH=$PATH:/usr/local/sbin:$HOME/bin/mplayer_osx
-PATH=$HOME/.cabal/bin:$PATH:$HOME/Library/Haskell/bin:$PATH
-
-# Scripts for PATH 
-[ -d ~/.pscripts/  ] && PATH=$PATH:~/.pscripts
-[ -d ~/.Utilities/ ] && for i in ~/.Utilities/*; do PATH=$PATH:$i; done
-PATH=$PATH:/Users/bilalh/Projects/Shell-Tunes/extra
-PATH=$PATH:~/.rvm/gems/ruby-1.9.3-p286/bin
-PATH=$PATH:/Library/Frameworks/Python.framework/Versions/3.3/bin
-#PATH=$PATH:$HOME/Programming/Java/android-sdk-mac_x86/platform-tools
-
-#cs PATH
-#PATH=$PATH:/Users/bilalh/CS/conjure/scripts/other
-#PATH=$PATH:/Applications/Comet
-PATH=$PATH:/Users/bilalh/CS/minion-build
-PATH=$PATH:/Users/bilalh/CS/savilerow
-PATH=$PATH:/Users/bilalh/CS/conjure/test/solving
-PATH=$PATH:/Users/bilalh/CS/conjure/scripts/other
-PATH:$PATH:/Applications/Mkvtoolnix.app/Contents/MacOS
-export PATH
-
-#Other Stuff
-#export PYTHONPATH=/usr/local/lib/python2.7/site-packages:$PYTHONPATH
-#export ANDROID_SDK=$HOME/Programming/Java/android-sdk-mac_x86
-export RUBY_PLATFORM="darwin"
-export R_HOME=/Library/Frameworks/R.framework/Resources
+source ~/.settings/paths.sh
 
 ### aliases and other functions
 [ -f ~/.bashrc ] && source ~/.bashrc
-
-alias comp='. `brew --prefix`/etc/bash_completion'
-
-export CONJURE_REPO="~/CS/conjure"
-
-# Setting PATH for Python 3.3
-# The orginal version is saved in .bash_profile.pysave
-PATH="/Library/Frameworks/Python.framework/Versions/3.3/bin:${PATH}"
-export PATH
-
diff --git a/.bashrc b/.bashrc
@@ -2,5 +2,3 @@
 [ -d ~/.bash/ ] &&  for i in ~/.bash/*.sh; do source $i; done
 
 [ -d ~/.pbash/ ] &&  for i in ~/.pbash/*.sh; do source $i; done
-
-PATH=$HOME/.rvm/bin:$PATH # Add RVM to PATH for scripting
diff --git a/.gitconfig b/.gitconfig
@@ -20,6 +20,8 @@
 	pom = push origin master
 	ldiff = difftool -t latex
 
+    rmdel = !git ls-files -dz | xargs -0 git rm
+
 	# Logs
 	lg = log --graph --pretty=format:'%Cred%an%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --date=relative
 	ld = log --graph --pretty=format:'%Cred%an%Creset -%C(yellow)%d%Creset %s %Cgreen(%ai)%Creset'
@@ -84,3 +86,5 @@
 	trustExitCode = true
 [credential]
 	helper = osxkeychain
+[push]
+	default = simple
diff --git a/.hgignore_conjure b/.hgignore_conjure
diff --git a/.hgrc b/.hgrc
@@ -16,12 +16,9 @@ sourcetreemerge.executable=/Applications/SourceTree.app/Contents/Resources/opend
 sourcetreebulkmerge.premerge=False
 sourcetreebulkmerge.binary=True
 [alias]
-s = status
 c = commit
 
 [extensions]
 hgext.bookmarks =
-hggit =
 hgext.extdiff =
 hgext.purge=
-prompt = /Users/bilalh/Programming/prog/hg-prompt/prompt.py 
diff --git a/.zshrc b/.zshrc
@@ -55,51 +55,21 @@ export LESS='-R'             # Less colour
 export FIGNORE=$FIGNORE:.o:.out:.pyc:.pdfsync:.log:.bbl:.aux:.blg:.out:.toc:
 
 
-#
+
 # light colours
 #export LSCOLORS=ExFxCxDxbxegedabagacad
+
 # dark colours
 export LSCOLORS=gxBxhxDxfxhxhxhxhxcxcx
 
-# Path settings(bin before current $PATH to override default version)
-PATH=$HOME/bin:$HOME/bin/haskell_stuff:/usr/local/bin:$PATH
-PATH=$PATH:/usr/local/sbin:$HOME/bin/mplayer_osx
-PATH=$HOME/.cabal/bin:$PATH:$HOME/Library/Haskell/bin:
-
-PATH=$PATH:/Users/bilalh/Projects/Shell-Tunes/extra
-PATH=$PATH:~/.rvm/gems/ruby-1.9.3-p286/bin
-PATH=$PATH:/Library/Frameworks/Python.framework/Versions/3.3/bin
-#PATH=$PATH:$HOME/Programming/Java/android-sdk-mac_x86/platform-tools
-
-
-#PATH=$PATH:/Users/bilalh/CS/conjure/scripts/other
-[ -d ~/.pscripts/  ] && PATH=$PATH:~/.pscripts
-[ -d ~/.Utilities/ ] && for i in ~/.Utilities/*; do PATH=$PATH:$i; done
-PATH=$PATH:/Users/bilalh/CS/minion/bin
-PATH=$PATH:/Users/bilalh/CS/savilerow
-PATH=$PATH:/Users/bilalh/CS/conjure/test/solving
-PATH=$PATH:/Users/bilalh/CS/conjure/scripts/other
-
-PATH=$PATH:/Applications/Mkvtoolnix.app/Contents/MacOS
-PATH=$PATH:/Users/bilalh/Projects/media2/.cabal-sandbox/bin
-#PATH=~/.local/anaconda/bin:$PATH;
-export PATH
-
-#export PYTHONPATH=/usr/local/lib/python2.7/site-packages:$PYTHONPATH
-#export ANDROID_SDK=$HOME/Programming/Java/android-sdk-mac_x86
-export RUBY_PLATFORM="darwin"
-export R_HOME=/Library/Frameworks/R.framework/Resources
-
-export CONJURE_REPO="~/CS/conjure"
 
+source ~/.settings/paths.sh
 
 #Adds all files in .bash at lanuch
 [ -d ~/.bash/ ] &&  for i in ~/.bash/*.sh; do source $i; done
 
 [ -d ~/.pbash/ ] &&  for i in ~/.pbash/*.sh; do source $i; done
-
-PATH=$HOME/.rvm/bin:$PATH # Add RVM to PATH for scripting
-
+#
 #Alias and functions
 alias tl='todo list'
 
@@ -115,6 +85,9 @@ autoload -U zrecompile
 autoload bashcompinit
 bashcompinit
 
+[ -d ~/.bash/_completion ] &&  for i in ~/.bash/_completion/*; do source $i; done
+
+
 export BASHMARKS_k=true
 export BASHMARKS_ITERM_SESSION="B ZSH"
 [ -f  ~/Projects/_forks/bashmarks/bashmarks.sh ]  && source ~/Projects/_forks/bashmarks/bashmarks.sh 
@@ -240,3 +213,11 @@ function exportf (){
     export $(echo $1)="`whence -f $1 | sed -e "s/$1 //" `"
 }
 
+
+function gt(){
+osascript -e '#!/usr/bin/env osascript' \
+    -e 'tell application "TextMate"' \
+    -e 'set p to path of document 1'\
+    -e 'end tell'
+}
+
diff --git a/paths.sh b/paths.sh
@@ -0,0 +1,20 @@
+# Path settings(bin before current $PATH to override default version)
+
+PATH=$HOME/bin:$HOME/bin/haskell_stuff:$PATH
+PATH=$PATH:$HOME/.cabal/bin
+PATH=$PATH:/Users/bilalh/Projects/Shell-Tunes/extra
+
+
+[ -d ~/.pscripts/  ] && PATH=$PATH:~/.pscripts
+[ -d ~/.Utilities/ ] && for i in ~/.Utilities/*; do PATH=$PATH:$i; done
+PATH=$PATH:/Users/bilalh/CS/minion/build
+PATH=$PATH:/Users/bilalh/CS/savilerow
+#PATH=$PATH:/Applications/Mkvtoolnix.app/Contents/MacOS
+PATH=$PATH:/Users/bilalh/Projects/media2/.cabal-sandbox/bin
+export PATH
+
+#export ANDROID_SDK=$HOME/Programming/Java/android-sdk-mac_x86
+export RUBY_PLATFORM="darwin"
+export R_HOME=/Library/Frameworks/R.framework/Resources
+
+export CONJURE_REPO="/Users/bilalh/CS/conjure/"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,5 +2,3 @@
		[ -d ~/.bash/ ] && for i in ~/.bash/*.sh; do source $i; done

		[ -d ~/.pbash/ ] && for i in ~/.pbash/*.sh; do source $i; done

		PATH=$HOME/.rvm/bin:$PATH # Add RVM to PATH for scripting