From 4e988d741c3067c5c167940c8222af2c4234f0e2 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Tue, 5 Apr 2016 19:57:14 +0200
Subject: [PATCH] added updates from ryx

---
 home/.bashrc               |  3 +++
 home/.gitconfig            |  6 +++---
 home/.gnupg/gpg-agent.conf |  2 +-
 home/.ssh/config           | 12 ++++++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 home/.ssh/config

diff --git a/home/.bashrc b/home/.bashrc
index fee8826..abf0738 100644
--- a/home/.bashrc
+++ b/home/.bashrc
@@ -61,3 +61,6 @@ fi
 
 source ~/.homesick/repos/homeshick/homeshick.sh
 source ~/.homesick/repos/homeshick/completions/homeshick-completion.bash
+
+# added by travis gem
+[ -f /home/stv0g/.travis/travis.sh ] && source /home/stv0g/.travis/travis.sh
diff --git a/home/.gitconfig b/home/.gitconfig
index 5a22fbe..f463e05 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -18,10 +18,10 @@
 	ignorecase = false
 
 [merge]
-	tool = vimdiff
+	tool = meld
 
 [diff]
-	tool = vimdiff
+	tool = meld
 
 [rerere]
 	# Store and re-use manual conflict resolution changes.
@@ -40,7 +40,7 @@
 
 [difftool "sourcetree"]
 	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-	path = 
+	path =
 [mergetool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true
diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf
index 6ef4639..54e7be7 100644
--- a/home/.gnupg/gpg-agent.conf
+++ b/home/.gnupg/gpg-agent.conf
@@ -1,4 +1,4 @@
-pinentry-program ${HOME}/.homesick/repos/dotfiles/pinentry.sh
+pinentry-program /home/stv0g/.homesick/repos/dotfiles/pinentry.sh
 write-env-file
 enable-ssh-support
 default-cache-ttl 600
diff --git a/home/.ssh/config b/home/.ssh/config
new file mode 100644
index 0000000..9ffe348
--- /dev/null
+++ b/home/.ssh/config
@@ -0,0 +1,12 @@
+Host *.rz.rwth-aachen.de
+	User sv111090
+
+Host zerberus.rwth-aachen.de
+	User vogel
+
+Host acs.0l.dn42
+	User acs-admin
+
+Host *
+	ControlMaster auto
+	ControlPath ~/.ssh/master-%r@%h:%p