settings

.ackrc

@@ -1,31 +1,39 @@
-#--type-set=music=.mp3,.m4a,.flac,.ac3,.ogg,.aiff,.m4b,.aac,.wav,.wmv,.ape,.mka
-#--type-set=manga=.cbz,.cbr,.cba,cb7
---type-set=juck=.xcodeproj
---type-set=txt=.txt
---type-set=eprime=.eprime,
---type-set=essence=.essence
---type-set=e=.eprime,.essence,.solution
---type-set=gen-ess=.eprime,.logs,.minion,.log,.eprime.solution
---type-set=bak=.bak
---type-set=markdown=.md,.markdown,mdown
---type-add=java=.pde
---type-add=ruby=.haml,.rake,.rsel,.builder
+--color
+--follow
+--group
+--ignore-dir=.cabal
+--ignore-dir=.cabal-sandbox
+--ignore-dir=.git
+--ignore-dir=.hg
+--ignore-dir=.svn
+--ignore-dir=__
+--ignore-dir=__bugs
+--ignore-dir=_compiled
+--ignore-dir=_site
+--ignore-dir=bin
+--ignore-dir=coverage
+--ignore-dir=dist
+--ignore-dir=docs
+--ignore-dir=log
+--ignore-dir=tmp
+--ignore-dir=vendor
+--sort-files
+--type-add=css=.sass,.scss,.less
 --type-add=html=.html.erb,.html.haml
+--type-add=java=.pde
 --type-add=js=.js.erb
---type-add=css=.sass,.scss,.less
---type-set=jasmin=.j
+--type-add=ruby=.haml,.rake,.rsel,.builder
+--type-set=bak=.bak
 --type-set=cucumber=.feature
---type-set=tex-temp=.pdfsync,.log,.bbl,.aux,.blg,.synctex,.fdb,.out,.toc,.fdb_latexmk
+--type-set=e=.eprime,.essence,.solution
+--type-set=eprime=.eprime,
+--type-set=essence=.essence
+--type-set=gen_ess=.eprime,.logs,.minion,.log,.eprime.solution
+--type-set=ignoredd=.tags,.tmtags
+--type-set=jasmin=.j
+--type-set=markdown=.md,.markdown,mdown
+--type-set=solution=.solution
 --type-set=tex=.tex,.bib
---type-set=epub=.opf,.xhtml,.ncx,.css,.xml
---ignore-dir=vendor
---ignore-dir=log
---ignore-dir=tmp
---ignore-dir=docs
---ignore-dir=coverage
---ignore-dir=_site
---ignore-dir=_compiled
---sort-files
---color
---follow
---group
+--type-set=tex_temp=.pdfsync,.log,.bbl,.aux,.blg,.synctex,.fdb,.out,.toc,.fdb_latexmk
+--type-set=txt=.txt
+--ignore-file=is:codex.tags

.bash_profile

@@ -15,19 +15,19 @@ export LANG=en_GB.UTF-8
 export HISTFILESIZE=15000    # the bash history should save 15000 commands
 export HISTCONTROL=erasedups # remove duplicate from history
 
-# don't store history entries that match this pattern  
+# don't store history entries that match this pattern
 declare -x HISTIGNORE='cs:jr*:gitx:hista:aes*:srm*: *'
 
 alias hist='history | less '
 
-#allow colour in less 
+#allow colour in less
 export LESS='-R'
 
-### Bash options 
-shopt -s histappend          # all sessions are saved 
+### Bash options
+shopt -s histappend          # all sessions are saved
 shopt -s cdspell             # fix minor error in cd paths
 shopt -s histreedit          # allows re-edit on C-R
-export EDITOR='vim'          # default editor 
+export EDITOR='vim'          # default editor
 
 # Ignores files in tab completion
 export FIGNORE=$FIGNORE:.o:.out:.pyc:.pdfsync:.log:.bbl:.aux:.blg:.out:.toc:
@@ -55,13 +55,14 @@ export LESS_TERMCAP_us=$'\E[04;38;5;146m' # begin underline]
 # bashmarks
 export BASHMARKS_k=true
 export BASHMARKS_ITERM_SESSION="B ZSH"
-[ -f  ~/Projects/_forks/bashmarks/bashmarks.sh ]  && source ~/Projects/_forks/bashmarks/bashmarks.sh 
+[ -f  ~/Projects/_forks/bashmarks/bashmarks.sh ]  && source ~/Projects/_forks/bashmarks/bashmarks.sh
 
 if [ -f ~/CS/instancegen/scripts/misc/convenience.sh ]; then
-    source ~/CS/instancegen/scripts/misc/convenience.sh 
+    source ~/CS/instancegen/scripts/misc/convenience.sh
 fi
 
 source ~/.settings/paths.sh
 
 ### aliases and other functions
 [ -f ~/.bashrc ] && source ~/.bashrc
+

.bashrc

@@ -2,3 +2,5 @@
 [ -d ~/.bash/ ] &&  for i in ~/.bash/*.sh; do source $i; done
 
 [ -d ~/.pbash/ ] &&  for i in ~/.pbash/*.sh; do source $i; done
+
+

.gitconfig

@@ -1,48 +1,53 @@
 [user]
 	name = Bilal Syed Hussain
-	semail = [email protected]
-	email = [email protected]
+    semail = [email protected]
+    bemail = [email protected]
+	email = [email protected]
+
 [color]
-	ui = auto
+    ui = auto
+
 [core]
 	excludesfile = /Users/bilalh/.gitignore
+
 [alias]
-	b = branch
-	c = commit 
-	d = describe
-	p = push
-	s = status
-	st = status
-	w = whatchanged
-	ca = commit -am
-	cam = commit --amend -am
-	ch = checkout
-	pom = push origin master
-	ldiff = difftool -t latex
+    b = branch
+    c = commit
+    d = describe
+    p = push
+    st = status
+    ca = commit -am
+    cam = commit --amend -am
+    ch = checkout
+    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'
-	lo = log --graph --pretty=format:'%Cred%h%Creset - %Cgreen(%cr) %C(bold blue)<%an>%Creset %s %C(yellow)%d%Creset ' --abbrev-commit --date=relative
-
-	# One line per commit
-	loa = log --graph --decorate --pretty=oneline --abbrev-commit --all
-
-	# commits not pushed to $1
+  snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
+  snapshots = !git stash list --grep snapshot
+
+    # 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'
+    lo = log --graph --pretty=format:'%Cred%h%Creset - %Cgreen(%cr) %C(bold blue)<%an>%Creset %s %C(yellow)%d%Creset ' --abbrev-commit --date=relative
+
+    # One line per commit
+    loa = log --graph --decorate --pretty=oneline --abbrev-commit --all
+
+    # commits not pushed to $1
     unpushed = cherry -v
 
     # what tag contains the sha
     tag = name-rev --name-only
 
     # what branch contains the sha
     contains = branch --contains
-	
-	# lost commits
-	lost = !"git fsck | awk '/dangling commit/ {print $3}' | git show --format='SHA1: %C(yellow)%h%Creset %f' --stdin | awk '/SHA1/ {sub(\"SHA1: \", \"\"); print}'"
-	
-	# show a list of branches sorted by time of last commit
+
+    # lost commits
+    lost = !"git fsck | awk '/dangling commit/ {print $3}' | git show --format='SHA1: %C(yellow)%h%Creset %f' --stdin | awk '/SHA1/ {sub(\"SHA1: \", \"\"); print}'"
+
+    # show a list of branches sorted by time of last commit
     brage = "!f() { git for-each-ref --sort=committerdate refs/heads $1 --format=\"%(refname:short)\" ; }; g() { for C in $(f $1) ; do git show -s --pretty=format:\"%Cgreen%ci %Cblue%cr%Creset $C\" \"$C\" -- ; done; }; g "
 
     # show remote branches as well
@@ -52,39 +57,54 @@
     tagage = "!sh -c 'git for-each-ref --sort=taggerdate refs/tags --format=\"%(refname:short)\"'"
 
     # show a list of every branch and show there latests commit, sorted by last commit
-    brlog = "!sh -c 'for C in $(git for-each-ref --sort=committerdate refs/heads --format=\"%(refname:short)\") ; do git show -s --pretty=format:\"%Cgreen%ci %Cblue%cr%Creset $C\" \"$C\" -- ; git show -s $C ; echo; done'"	
-	# url of origin, about 99% of what I use git config --list for
+    brlog = "!sh -c 'for C in $(git for-each-ref --sort=committerdate refs/heads --format=\"%(refname:short)\") ; do git show -s --pretty=format:\"%Cgreen%ci %Cblue%cr%Creset $C\" \"$C\" -- ; git show -s $C ; echo; done'"
+    # url of origin, about 99% of what I use git config --list for
     cloneurl = config --get remote.origin.url
-
-	shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
+
+    shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
+	create-gitignore = "!gi() { curl http://www.gitignore.io/api/$@ ;}; gi"
 
 [core]
-	pager = less -FRSX
-	quotepath = false
+    pager = less -FRSX
+    quotepath = false
+	editor = /Users/bilalh/bin/vim
+
 [apply]
-	whitespace = fix
+    whitespace = fix
+
 [gist]
-	private = yes
-	browse  = yes
-
+    private = yes
+    browse  = yes
+
+[diff]
+    tool   = icdiff
+
+[difftool]
+    prompt = no
+
 [difftool.latex]
-	cmd = latexdiff  \"$LOCAL\" \"$REMOTE\"
+    cmd = latexdiff  \"$LOCAL\" \"$REMOTE\"
+
+[difftool.icdiff]
+    cmd = icdiff --line-numbers  \"$LOCAL\" \"$REMOTE\"
+
 [difftool "Kaleidoscope"]
-	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
-[difftool]
-	prompt = false
-[diff]
-	tool = Kaleidoscope
+    cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+
 [difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge --nosplash \"$LOCAL\" \"$REMOTE\"
 	path = 
+
 [mergetool "sourcetree"]
-	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
 	trustExitCode = true
+
 [mergetool "Kaleidoscope"]
-	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
-	trustExitCode = true
+    cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+    trustExitCode = true
+
 [credential]
-	helper = osxkeychain
+    helper = osxkeychain
+
 [push]
-	default = simple
+    default = simple

.hgrc

@@ -2,8 +2,10 @@
 username=Bilal Syed Hussain <[email protected]>
 
 ignore=/Users/bilalh/.hgignore_global
+
 [web]
-cacerts =/Users/bilalh/CS/its.crt  
+cacerts =/Users/bilalh/CS/its.crt
+
 [merge-tools]
 sourcetreemerge.gui=False
 sourcetreebulkmerge.gui=False
@@ -15,10 +17,16 @@ sourcetreemerge.premerge=True
 sourcetreemerge.executable=/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh
 sourcetreebulkmerge.premerge=False
 sourcetreebulkmerge.binary=True
+
 [alias]
 c = commit
 
 [extensions]
+color =
 hgext.bookmarks =
 hgext.extdiff =
 hgext.purge=
+
+[extdiff]
+cmd.icdiff =  /Users/bilalh/bin/icdiff-hg-wrapper.sh
+

.screenrc

@@ -5,7 +5,7 @@
 # Turn off start message:
 startup_message off
 
-# Set messages timeout to one second: 
+# Set messages timeout to one second:
 msgwait 1
 hardstatus alwayslastline "%{=b}%{G} %{b}%w"
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #
@@ -26,11 +26,8 @@ hardstatus alwayslastline "%{=b}%{G} %{b}%w"
 #bindkey -k F1 prev
 #bindkey -k k3 next
 
-bindkey -k k13 prev
-bindkey -k k14 next
-
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #
-defscrollback 1000
+defscrollback 10000
 # Make the output buffer large for (fast) xterms.
 termcapinfo xterm* OL=1000
-shell bash
+shell zsh

.slate

@@ -32,7 +32,6 @@ bind g:${hyper} grid padding:5 0:8,8 1:8,5
 
 # To Resize windows
 bind 1:${hyper} ${lefthalf}
-bind 1:${hyper} ${lefthalf}
 bind 2:${hyper} ${righthalf}
 
 bind 3:${hyper} ${topleft}
@@ -64,6 +63,7 @@ bind h:${hyper} focus left
 bind k:${hyper} focus up
 bind j:${hyper} focus down
 
+
 bind b:${hyper} focus behind
 
 # Other bindings
@@ -78,4 +78,3 @@ bind m:${hyper} throw right
 
 
 #bind i:${hyper} hint afqrplzvm
-