# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1478915537 -3600
# Node ID c228c63f1ba9042276002d6c4a69659107ee8db9
# Parent  b3ffe2fba3ac2995f7b472559d1ba6df68fc80d4# Parent  93f7be107f46b30bf70a4016a019136fe78ae25e
Automated merge with https://localhost/hg/zsh-env

diff -r 93f7be107f46 -r c228c63f1ba9 .gitconfig
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.gitconfig	Sat Nov 12 02:52:17 2016 +0100
@@ -0,0 +1,23 @@
+[alias]
+    brach = branch
+    branches = branch
+    co = checkout
+    comit = commit
+    lg = log --format=oneline --graph --abbrev-commit --decorate
+    rpo = remote prune origin    
+    st = status
+    wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
+
+[color]
+    ui = false
+
+[http]
+    sslVerify = false
+
+[push]
+    default = simple
+    
+[user]
+    name = Dirk Olmes
+    # do not set an email address here - it must be configured for different 
+    # repositories with different values
diff -r 93f7be107f46 -r c228c63f1ba9 .screenrc
--- a/.screenrc	Sat Nov 12 02:52:13 2016 +0100
+++ b/.screenrc	Sat Nov 12 02:52:17 2016 +0100
@@ -1,1 +1,9 @@
 escape ^bb
+
+vbell on
+defscrollback 10000
+shell -$SHELL                           
+
+# Display the list of active windows, the active one is highlighted. Date and 
+# clock on the far right side of the terminal.
+caption always " %-Lw%{= KW}%50>%n%f* %t%{-}%+Lw%< %-21=%{=kw}%D %d.%m.%Y %0c"
diff -r 93f7be107f46 -r c228c63f1ba9 completion/_ssh-add
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/completion/_ssh-add	Sat Nov 12 02:52:17 2016 +0100
@@ -0,0 +1,17 @@
+#compdef ssh-add
+
+_ssh-add() {
+	local -a keys
+	for key in $HOME/.ssh/*; do
+		# only accept files that do not end in .pub
+		if [[ ${key#*.pub} == "$key" ]]; then
+			# exclude files that are not ssh keys
+			if [[ ${key#*/config} == "$key" && ${key#*/known_hosts} == "$key" ]]; then
+				keys+=($key)
+			fi
+		fi
+	done
+	compadd "$@" $keys
+}
+
+_ssh-add "$@"
\ No newline at end of file
diff -r 93f7be107f46 -r c228c63f1ba9 zshrc
--- a/zshrc	Sat Nov 12 02:52:13 2016 +0100
+++ b/zshrc	Sat Nov 12 02:52:17 2016 +0100
@@ -22,6 +22,7 @@
 fi
 
 # enable zsh's fancy autocomplete
+fpath=(~/.zsh-env/completion $fpath)
 autoload -U compinit
 compinit
 
@@ -34,6 +35,9 @@
 psg() { ps auxww | grep -v grep | grep -i "$@" }
 alias pd=pushd
 alias history="history 1"
+alias sl='screen -ls'
+alias sn='screen -S'
+alias sr='screen -r'
 alias ta="tmux attach -t"
 alias tl="tmux list-sessions"
 alias tn="tmux new -s"
diff -r 93f7be107f46 -r c228c63f1ba9 zshrc-docker
--- a/zshrc-docker	Sat Nov 12 02:52:13 2016 +0100
+++ b/zshrc-docker	Sat Nov 12 02:52:17 2016 +0100
@@ -3,6 +3,7 @@
 #
 
 alias dim="docker images --format 'table {{.Repository}}\t{{.ID}}\t{{.Tag}}'"
+alias dlf="docker logs -f"
 alias doc="docker-compose"
 alias doker=docker
 alias dpa="docker ps -a --format 'table {{.ID}}\t{{.Image}}\t{{.Status}}\t{{.Names}}'"