From 07d68ce1a6ba04a8da0039c739747964ea302f9d Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 1 Feb 2017 11:31:43 +0100
Subject: [PATCH 01/51] Update git info

---
 git/gitconfig.symlink | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 6d6606f..7d4c6aa 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -1,6 +1,6 @@
 [user]
 	name = Stefan Bunk
-	email = stefan.bunk@googlemail.com
+	email = stefan@merantix.com
 [alias]
 	count   = !git shortlog -sn
 [color]

From b3021a664b6e7f2c3a492bf0d0dd699abb1f7495 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 1 Feb 2017 11:31:51 +0100
Subject: [PATCH 02/51] Update tilda position

---
 tilda/tilda.symlink/config_0 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tilda/tilda.symlink/config_0 b/tilda/tilda.symlink/config_0
index defa1df..cff1f63 100644
--- a/tilda/tilda.symlink/config_0
+++ b/tilda/tilda.symlink/config_0
@@ -34,12 +34,12 @@ normalize_font_size_key="<Control>0"
 show_on_monitor="eDP1"
 word_chars="-A-Za-z0-9,./?%&#:_"
 lines=1000000
-max_width=1920
-max_height=421
+max_width=2560
+max_height=576
 min_width=1
 min_height=1
 x_pos=0
-y_pos=659
+y_pos=864
 tab_pos=0
 backspace_key=0
 delete_key=1

From d6de381cee5fc56b5f0bb3903968e7a4d8e38fe8 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 1 Feb 2017 11:41:16 +0100
Subject: [PATCH 03/51] Setup merantix specific stuff

---
 machine-based/merantix/homes-and-paths.zsh-run |  1 +
 machine-based/merantix/navigation.zsh-run      |  2 +-
 machine-based/thinkpad/homes-and-paths.zsh-run | 17 -----------------
 machine-based/thinkpad/navigation.zsh-run      | 14 --------------
 machine-based/thinkpad/project/coheel.zsh-run  | 12 ------------
 5 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 machine-based/thinkpad/homes-and-paths.zsh-run
 delete mode 100644 machine-based/thinkpad/navigation.zsh-run
 delete mode 100644 machine-based/thinkpad/project/coheel.zsh-run

diff --git a/machine-based/merantix/homes-and-paths.zsh-run b/machine-based/merantix/homes-and-paths.zsh-run
index 3de444a..2bb548d 100644
--- a/machine-based/merantix/homes-and-paths.zsh-run
+++ b/machine-based/merantix/homes-and-paths.zsh-run
@@ -1 +1,2 @@
 export PYTHONPATH="/home/knub/Repositories/merantix:"
+export PATH="/opt/anaconda2/bin:$PATH"
diff --git a/machine-based/merantix/navigation.zsh-run b/machine-based/merantix/navigation.zsh-run
index 8d05d39..3dc746a 100644
--- a/machine-based/merantix/navigation.zsh-run
+++ b/machine-based/merantix/navigation.zsh-run
@@ -1 +1 @@
-alias cdmerantix="cd ~/Repositories/merantix"
+alias cdcore="cd ~/merantix/core"
diff --git a/machine-based/thinkpad/homes-and-paths.zsh-run b/machine-based/thinkpad/homes-and-paths.zsh-run
deleted file mode 100644
index 45b240f..0000000
--- a/machine-based/thinkpad/homes-and-paths.zsh-run
+++ /dev/null
@@ -1,17 +0,0 @@
-## PATH
-# export PATH="$PATH:/opt/scala-2.11.5/bin"
-# export PATH="$PATH:/opt/idea-IU-143.1184.17/bin"
-# export PATH="$PATH:/home/knub/.cargo/bin"
-#export PATH="/opt/anaconda3/bin:$PATH"
-
-## JAVA HOME
-#export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-#export JAVA_HOME=/usr/lib/jvm/jdk1.8.0_31
-export JAVA_HOME=/etc/alternatives/java_sdk
-
-## HADOOP_HOME
-export HADOOP_HOME="/home/knub/Programme/hadoop-2.5.1"
-export HADOOP_COMMON_LIB_NATIVE_DIR=$HADOOP_HOME/lib/native
-
-## ANDROID
-export ANDROID_HOME="/opt/android-sdk"
diff --git a/machine-based/thinkpad/navigation.zsh-run b/machine-based/thinkpad/navigation.zsh-run
deleted file mode 100644
index 6643a87..0000000
--- a/machine-based/thinkpad/navigation.zsh-run
+++ /dev/null
@@ -1,14 +0,0 @@
-alias cdonehundredandeighty="cd ~/Repositories/onehundredandeighty"
-alias cdthesis='cd ~/Repositories/master-thesis/thesis'
-alias cddata='cd ~/Repositories/master-thesis/data'
-alias cdmodels='cd ~/Repositories/master-thesis/models'
-alias cdresults='cd ~/Repositories/master-thesis/results'
-alias cdmaster='cd ~/Repositories/master-thesis'
-alias cdscala='cd ~/Repositories/master-thesis/code/scala'
-alias cdpython='cd ~/Repositories/master-thesis/code/python/knub/thesis'
-alias cdword2vec='cd ~/Repositories/word2vec/trunk'
-alias cdlftm='cd ~/Repositories/LFTM'
-alias cdgaussian='cd ~/Repositories/Gaussian_LDA'
-alias cdtopicvec='cd ~/Repositories/topicvec'
-alias cdshdp='cd ~/Repositories/sHDP'
-alias vimthesis='vim /home/knub/Repositories/master-thesis/thesis/thesis.tex'
diff --git a/machine-based/thinkpad/project/coheel.zsh-run b/machine-based/thinkpad/project/coheel.zsh-run
deleted file mode 100644
index eadca53..0000000
--- a/machine-based/thinkpad/project/coheel.zsh-run
+++ /dev/null
@@ -1,12 +0,0 @@
-function tenem-cluster() {
-	cssh hadoop10@tenem11 \
-	hadoop10@tenem12 \
-	hadoop10@tenem13 \
-	hadoop10@tenem14 \
-	hadoop10@tenem15 \
-	hadoop10@tenem16 \
-	hadoop10@tenem17 \
-	hadoop10@tenem18 \
-	hadoop10@tenem19 \
-	hadoop10@tenem20
-}

From df051c6f7335dfc3ea4106973079c7243cf41b95 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Thu, 2 Feb 2017 14:11:55 +0100
Subject: [PATCH 04/51] Update installs

---
 setup_machine.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup_machine.sh b/setup_machine.sh
index 5c166e7..e838274 100755
--- a/setup_machine.sh
+++ b/setup_machine.sh
@@ -31,6 +31,7 @@ sudo $PACKAGE_MANAGER install \
 	inkscape \
 	meld \
 	nethogs \
+	ncdu \
 	rubygem-rake \
 	sl \
 	the_silver_searcher \
@@ -41,6 +42,7 @@ sudo $PACKAGE_MANAGER install \
 	tlp-rdw \
 	unison \
 	vim \
+	xclip \
 	zsh
 
 

From 7b8acc69d0aede5e274f798a7d43abee43f63b54 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Thu, 2 Feb 2017 14:12:54 +0100
Subject: [PATCH 05/51] Update zsh

---
 zsh/zshrc.symlink | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index cc2d5dd..72b0d5c 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -31,3 +31,13 @@ export SAVEHIST=100000
 # source "$HOME/.qfc/bin/qfc.sh"
 # qfc_quick_command 'cd' '\C-b' 'cd $0'
 # qfc_quick_command 'vim' '\C-p' 'vim $0'
+
+# The next line updates PATH for the Google Cloud SDK.
+if [ -f /opt/google-cloud-sdk/path.zsh.inc ]; then
+  source '/opt/google-cloud-sdk/path.zsh.inc'
+fi
+
+# The next line enables shell command completion for gcloud.
+if [ -f /opt/google-cloud-sdk/completion.zsh.inc ]; then
+  source '/opt/google-cloud-sdk/completion.zsh.inc'
+fi

From 956a7c67271c34a5998f01f95391ae0b7d8814e5 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Thu, 2 Feb 2017 14:13:09 +0100
Subject: [PATCH 06/51] Update paths

---
 machine-based/merantix/homes-and-paths.zsh-run | 5 ++++-
 machine-based/merantix/navigation.zsh-run      | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/machine-based/merantix/homes-and-paths.zsh-run b/machine-based/merantix/homes-and-paths.zsh-run
index 2bb548d..c5acea2 100644
--- a/machine-based/merantix/homes-and-paths.zsh-run
+++ b/machine-based/merantix/homes-and-paths.zsh-run
@@ -1,2 +1,5 @@
 export PYTHONPATH="/home/knub/Repositories/merantix:"
-export PATH="/opt/anaconda2/bin:$PATH"
+export PATH="/opt/miniconda2/bin:$PATH"
+
+source $HOME/merantix/core/developer_env/setup.sh
+unset DIR
diff --git a/machine-based/merantix/navigation.zsh-run b/machine-based/merantix/navigation.zsh-run
index 3dc746a..b6f0602 100644
--- a/machine-based/merantix/navigation.zsh-run
+++ b/machine-based/merantix/navigation.zsh-run
@@ -1 +1,3 @@
 alias cdcore="cd ~/merantix/core"
+alias cdbeamer="cd ~/merantix/core/beamer"
+alias cdoxfordflower="cd ~/merantix/core/bprojects/oxford_flower"

From c56dddc38ea63e74b4a9417868ed9bb944aaf353 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Mon, 6 Feb 2017 18:39:59 +0100
Subject: [PATCH 07/51] Add cdedison

---
 machine-based/merantix/navigation.zsh-run | 1 +
 1 file changed, 1 insertion(+)

diff --git a/machine-based/merantix/navigation.zsh-run b/machine-based/merantix/navigation.zsh-run
index b6f0602..d67f0e7 100644
--- a/machine-based/merantix/navigation.zsh-run
+++ b/machine-based/merantix/navigation.zsh-run
@@ -1,3 +1,4 @@
 alias cdcore="cd ~/merantix/core"
 alias cdbeamer="cd ~/merantix/core/beamer"
 alias cdoxfordflower="cd ~/merantix/core/bprojects/oxford_flower"
+alias cdedison="cd ~/merantix/core/bprojects/edison"

From 4486c7e444568264f2fd25dd84245a45cb458ff7 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Mon, 6 Feb 2017 18:46:20 +0100
Subject: [PATCH 08/51] Git: push new branch via gpt

---
 git/aliases.zsh-run | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git/aliases.zsh-run b/git/aliases.zsh-run
index 6fa9213..c8031da 100644
--- a/git/aliases.zsh-run
+++ b/git/aliases.zsh-run
@@ -5,6 +5,7 @@ alias ga.="git add ."
 alias gam='git commit --amend'
 alias gp='git push origin HEAD -q'
 alias gpf='gp -f'
+alias gpt='git push -u -q origin $(git rev-parse --abbrev-ref HEAD)'
 alias gl='git --no-pager log --decorate=short --pretty="format:HEAD %C(yellow)%H%n%CresetAuthor: %an <%ae>%nDate:   %ai, %ar%nCommit: %ci %cr%n%n%s%n" -n1'
 alias glr='git pull --rebase --quiet && gl'
 alias grc='git rebase --continue'

From eda9d9b826184e93f7fb5ce6cbc929d2484100dd Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Mon, 6 Feb 2017 18:48:47 +0100
Subject: [PATCH 09/51] gpd deletes remote branches

---
 git/aliases.zsh-run | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git/aliases.zsh-run b/git/aliases.zsh-run
index c8031da..b4d5463 100644
--- a/git/aliases.zsh-run
+++ b/git/aliases.zsh-run
@@ -6,6 +6,7 @@ alias gam='git commit --amend'
 alias gp='git push origin HEAD -q'
 alias gpf='gp -f'
 alias gpt='git push -u -q origin $(git rev-parse --abbrev-ref HEAD)'
+alias gpd='git push origin --delete'
 alias gl='git --no-pager log --decorate=short --pretty="format:HEAD %C(yellow)%H%n%CresetAuthor: %an <%ae>%nDate:   %ai, %ar%nCommit: %ci %cr%n%n%s%n" -n1'
 alias glr='git pull --rebase --quiet && gl'
 alias grc='git rebase --continue'

From e32b2179b70e3b28032dbc8c24dcaf2a9d98af2e Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Tue, 7 Feb 2017 10:21:12 +0100
Subject: [PATCH 10/51] Update tilda

---
 tilda/tilda.symlink/config_0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tilda/tilda.symlink/config_0 b/tilda/tilda.symlink/config_0
index cff1f63..e77d52f 100644
--- a/tilda/tilda.symlink/config_0
+++ b/tilda/tilda.symlink/config_0
@@ -39,7 +39,7 @@ max_height=576
 min_width=1
 min_height=1
 x_pos=0
-y_pos=864
+y_pos=1319
 tab_pos=0
 backspace_key=0
 delete_key=1

From b02a27bc868188a80f5e4450afac92572ee6f234 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Tue, 7 Feb 2017 10:24:06 +0100
Subject: [PATCH 11/51] Remove merantix from pythonpath

---
 machine-based/merantix/homes-and-paths.zsh-run | 1 -
 1 file changed, 1 deletion(-)

diff --git a/machine-based/merantix/homes-and-paths.zsh-run b/machine-based/merantix/homes-and-paths.zsh-run
index c5acea2..c94c8da 100644
--- a/machine-based/merantix/homes-and-paths.zsh-run
+++ b/machine-based/merantix/homes-and-paths.zsh-run
@@ -1,4 +1,3 @@
-export PYTHONPATH="/home/knub/Repositories/merantix:"
 export PATH="/opt/miniconda2/bin:$PATH"
 
 source $HOME/merantix/core/developer_env/setup.sh

From 282663901c97b4f3b4b0779e43ce15dc36b73766 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Fri, 31 Mar 2017 10:22:36 +0200
Subject: [PATCH 12/51] Add more helper functions.

---
 git/aliases.zsh-run                            | 3 +++
 machine-based/merantix/homes-and-paths.zsh-run | 4 +---
 vim/aliases.zsh-run                            | 4 ++++
 vim/vimrc.symlink                              | 6 +++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/git/aliases.zsh-run b/git/aliases.zsh-run
index b4d5463..7c12574 100644
--- a/git/aliases.zsh-run
+++ b/git/aliases.zsh-run
@@ -35,3 +35,6 @@ function vimgitexclude() {
 function vimgitignore() {
     vim + $(git rev-parse --show-toplevel)/.gitignore
 }
+function vimgitconfig() {
+    vim + $(git rev-parse --show-toplevel)/.git/config
+}
diff --git a/machine-based/merantix/homes-and-paths.zsh-run b/machine-based/merantix/homes-and-paths.zsh-run
index c94c8da..7526dcf 100644
--- a/machine-based/merantix/homes-and-paths.zsh-run
+++ b/machine-based/merantix/homes-and-paths.zsh-run
@@ -1,4 +1,2 @@
 export PATH="/opt/miniconda2/bin:$PATH"
-
-source $HOME/merantix/core/developer_env/setup.sh
-unset DIR
+export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-1.b14.fc25.x86_64
diff --git a/vim/aliases.zsh-run b/vim/aliases.zsh-run
index 984ff78..28dd137 100644
--- a/vim/aliases.zsh-run
+++ b/vim/aliases.zsh-run
@@ -1 +1,5 @@
 alias vim='gvim -p -v'
+
+function vimpy() {
+	gvim -p -v "$1" && python "$1"
+}
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index 7149dab..335f817 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -114,7 +114,6 @@ nmap . .`[
 " Set terminal title
 set title
 
-
 " ==================================================
 " Editing
 " ==================================================
@@ -167,6 +166,11 @@ set splitbelow
 set wildmenu
 
 
+autocmd BufRead,BufNewFile *.tsv set filetype=tsv
+autocmd FileType tsv setlocal tabstop=32 noexpandtab
+au FileType tsv let Comment="#" | let EndComment=""
+
+
 " ==================================================
 " Search
 " ==================================================

From fa759f252118e53153038244bbf7c7548440e89a Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Fri, 31 Mar 2017 10:22:44 +0200
Subject: [PATCH 13/51] More merantix specific stuff.

---
 git/aliases.zsh-run                       | 5 +++--
 machine-based/merantix/aliases.zsh-run    | 1 +
 machine-based/merantix/navigation.zsh-run | 6 ++++++
 navigation/aliases.zsh-run                | 4 ++--
 tilda/tilda.symlink/config_0              | 4 ++--
 zsh/zshrc.symlink                         | 3 +++
 6 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 machine-based/merantix/aliases.zsh-run

diff --git a/git/aliases.zsh-run b/git/aliases.zsh-run
index 7c12574..79ad637 100644
--- a/git/aliases.zsh-run
+++ b/git/aliases.zsh-run
@@ -3,7 +3,7 @@ alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C
 alias ga="git add"
 alias ga.="git add ."
 alias gam='git commit --amend'
-alias gp='git push origin HEAD -q'
+alias gp='git push -u origin HEAD -q'
 alias gpf='gp -f'
 alias gpt='git push -u -q origin $(git rev-parse --abbrev-ref HEAD)'
 alias gpd='git push origin --delete'
@@ -22,9 +22,10 @@ alias gcom='git checkout master'
 alias gcod='git checkout develop'
 alias gb='git branch'
 alias gs='git status -sb'
+alias grpo='git remote prune origin'
 alias gt='git stash'
 alias gtlrt='git stash -q && git pull --rebase --quiet && gl && git stash pop -q'
-alias gcaap='git add . && git-amend && gp -f' # git commit all amend push
+alias gcaapf='git add . && git-amend && gp -f' # git commit all amend push force
 alias gassumeunchanged='git ls-files -v | grep "^[[:lower:]]"'
 function gri() {
     git rebase -i "HEAD~$1"
diff --git a/machine-based/merantix/aliases.zsh-run b/machine-based/merantix/aliases.zsh-run
new file mode 100644
index 0000000..2089e85
--- /dev/null
+++ b/machine-based/merantix/aliases.zsh-run
@@ -0,0 +1 @@
+alias sshtensorboard="gssh john-tensorboard"
diff --git a/machine-based/merantix/navigation.zsh-run b/machine-based/merantix/navigation.zsh-run
index d67f0e7..771e879 100644
--- a/machine-based/merantix/navigation.zsh-run
+++ b/machine-based/merantix/navigation.zsh-run
@@ -2,3 +2,9 @@ alias cdcore="cd ~/merantix/core"
 alias cdbeamer="cd ~/merantix/core/beamer"
 alias cdoxfordflower="cd ~/merantix/core/bprojects/oxford_flower"
 alias cdedison="cd ~/merantix/core/bprojects/edison"
+alias cdreports="cd ~/merantix/core/bprojects/edison/reports"
+alias cdmoscow="cd ~/merantix/core/bprojects/moscow_hft"
+alias cdmoscowtest="cd ~/merantix/core/data/moscow_test"
+alias cddata="cd ~/merantix/core/data"
+alias cdmoscowpreprocessing="cd ~/merantix/core/bprojects/moscow_hft/preprocessing"
+alias cdexperimental="cd ~/merantix/core/experimental/knub"
diff --git a/navigation/aliases.zsh-run b/navigation/aliases.zsh-run
index 1786f80..ad408db 100644
--- a/navigation/aliases.zsh-run
+++ b/navigation/aliases.zsh-run
@@ -6,14 +6,14 @@ alias cddotfiles='cd ~/dotfiles'
 
 function rl() {
 	if hash xclip 2>/dev/null; then
-		readlink -n -f $1 | xclip -selection c
+		readlink -n -f $1 | sed 's:/run/media/knub/Media:/merantix_core:g' | xclip -selection c
 	else
 		readlink -f $1
 	fi
 }
 function rl.() {
 	if hash xclip 2>/dev/null; then
-		readlink -n -f . | xclip -selection c
+		readlink -n -f . | sed 's:/run/media/knub/Media:/merantix_core:g' | xclip -selection c
 	else
 		readlink -f .
 	fi
diff --git a/tilda/tilda.symlink/config_0 b/tilda/tilda.symlink/config_0
index e77d52f..345abd5 100644
--- a/tilda/tilda.symlink/config_0
+++ b/tilda/tilda.symlink/config_0
@@ -31,7 +31,7 @@ web_browser="google-chrome"
 increase_font_size_key="<Control>equal"
 decrease_font_size_key="<Control>minus"
 normalize_font_size_key="<Control>0"
-show_on_monitor="eDP1"
+show_on_monitor="eDP-1"
 word_chars="-A-Za-z0-9,./?%&#:_"
 lines=1000000
 max_width=2560
@@ -39,7 +39,7 @@ max_height=576
 min_width=1
 min_height=1
 x_pos=0
-y_pos=1319
+y_pos=1290
 tab_pos=0
 backspace_key=0
 delete_key=1
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 72b0d5c..691835d 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -41,3 +41,6 @@ fi
 if [ -f /opt/google-cloud-sdk/completion.zsh.inc ]; then
   source '/opt/google-cloud-sdk/completion.zsh.inc'
 fi
+
+source $HOME/merantix/core/developer_env/setup.sh
+unset DIR

From 487ab7d4259c8ed0d23fa23bd5d9dbf35f35b78e Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Mon, 6 Nov 2017 14:30:30 +0100
Subject: [PATCH 14/51] Add new git aliases.

---
 git/aliases.zsh-run | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/git/aliases.zsh-run b/git/aliases.zsh-run
index 79ad637..c7ad928 100644
--- a/git/aliases.zsh-run
+++ b/git/aliases.zsh-run
@@ -23,10 +23,20 @@ alias gcod='git checkout develop'
 alias gb='git branch'
 alias gs='git status -sb'
 alias grpo='git remote prune origin'
+alias grh='git reset HEAD'
 alias gt='git stash'
+alias gbd='git branch -D'
 alias gtlrt='git stash -q && git pull --rebase --quiet && gl && git stash pop -q'
 alias gcaapf='git add . && git-amend && gp -f' # git commit all amend push force
 alias gassumeunchanged='git ls-files -v | grep "^[[:lower:]]"'
+
+function gpm() {
+    # git post merge cleanup
+    gcom
+    glr
+    gbd $1
+    grpo
+}
 function gri() {
     git rebase -i "HEAD~$1"
 }

From 2fd26f3a99b3d205391d66670f6dfcdea54aecba Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Mon, 6 Nov 2017 14:31:03 +0100
Subject: [PATCH 15/51] Add new Moscow TB alias.

---
 machine-based/merantix/aliases.zsh-run | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/machine-based/merantix/aliases.zsh-run b/machine-based/merantix/aliases.zsh-run
index 2089e85..27fdb72 100644
--- a/machine-based/merantix/aliases.zsh-run
+++ b/machine-based/merantix/aliases.zsh-run
@@ -1 +1,5 @@
 alias sshtensorboard="gssh john-tensorboard"
+
+function start_tb_moscow() {
+	python /home/knub/merantix/core/developer_env/tensorboard_deploy.py --instance-name mscw-tensorboard --logdir gs://merantix-dev-moscow-hft-derived/experiments_classification/$1 --port $2
+}

From 71cc213d2a4eec35dedbf04044fbdb9e1e541b44 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Tue, 16 Jan 2018 14:22:35 +0100
Subject: [PATCH 16/51] Fix ls colors.

---
 dircolors/dircolors.symlink | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dircolors/dircolors.symlink b/dircolors/dircolors.symlink
index 5469fc4..e2d29f2 100644
--- a/dircolors/dircolors.symlink
+++ b/dircolors/dircolors.symlink
@@ -138,6 +138,7 @@ EIGHTBIT 1
 
 ### By file type
 
+OTHER_WRITABLE 00
 # global default
 NORMAL 00
 # normal file

From c0b6cc19504440a23bd7e45cf673e098bdcf23a2 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Tue, 16 Jan 2018 14:22:48 +0100
Subject: [PATCH 17/51] Fix gpm command.

---
 git/aliases.zsh-run | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git/aliases.zsh-run b/git/aliases.zsh-run
index c7ad928..5b46d6e 100644
--- a/git/aliases.zsh-run
+++ b/git/aliases.zsh-run
@@ -32,9 +32,10 @@ alias gassumeunchanged='git ls-files -v | grep "^[[:lower:]]"'
 
 function gpm() {
     # git post merge cleanup
+    BRANCH=$(git rev-parse --abbrev-ref HEAD)
     gcom
     glr
-    gbd $1
+    gbd $BRANCH
     grpo
 }
 function gri() {

From 79b7bacafbc4a1130132166fcc6de48dea1b21ad Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Tue, 16 Jan 2018 14:23:00 +0100
Subject: [PATCH 18/51] Add new merantix commands.

---
 machine-based/merantix/aliases.zsh-run | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/machine-based/merantix/aliases.zsh-run b/machine-based/merantix/aliases.zsh-run
index 27fdb72..84f2ad4 100644
--- a/machine-based/merantix/aliases.zsh-run
+++ b/machine-based/merantix/aliases.zsh-run
@@ -1,5 +1,11 @@
-alias sshtensorboard="gssh john-tensorboard"
-
 function start_tb_moscow() {
-	python /home/knub/merantix/core/developer_env/tensorboard_deploy.py --instance-name mscw-tensorboard --logdir gs://merantix-dev-moscow-hft-derived/experiments_classification/$1 --port $2
+	python /home/knub/merantix/core/developer_env/tensorboard_deploy.py --instance-name mscw-tensorboard --logdir gs://merantix-dev-moscow-hft-derived/experiments_classification_$1/$2 --port $3
+}
+alias tbs='gcloud compute ssh mscw-tensorboard --command="grep 1 /tmp/tensorboards/*"'
+
+alias cil="gcloud compute instances list"
+# alias cid="gcloud compute instances delete"
+
+function cid() {
+	gcloud compute instances list | grep $1 | awk '{print $1}' | xargs -I {} -P 100  gcloud compute instances delete {} --quiet
 }

From 17790fecb662661db038016521684f7895f9bf85 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Tue, 16 Jan 2018 14:23:13 +0100
Subject: [PATCH 19/51] Update tilda.

---
 tilda/tilda.symlink/config_0 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tilda/tilda.symlink/config_0 b/tilda/tilda.symlink/config_0
index 345abd5..aba326d 100644
--- a/tilda/tilda.symlink/config_0
+++ b/tilda/tilda.symlink/config_0
@@ -51,12 +51,12 @@ animation_orientation=1
 timer_resolution=200
 auto_hide_time=2000
 on_last_terminal_exit=0
-palette_scheme=0
+palette_scheme=2
 non_focus_pull_up_behaviour=0
 cursor_shape=0
 # show_on_monitor_number=0
 title_max_length=25
-palette = {11822, 13364, 13878, 52428, 0, 0, 20046, 39578, 1542, 50372, 41120, 0, 13364, 25957, 42148, 30069, 20560, 31611, 1542, 38944, 39578, 54227, 55255, 53199, 21845, 22359, 21331, 61423, 10537, 10537, 35466, 58082, 13364, 64764, 59881, 20303, 29298, 40863, 53199, 44461, 32639, 43176, 13364, 58082, 58082, 61166, 61166, 60652}
+palette = {0, 0, 0, 43690, 0, 0, 0, 43690, 0, 43690, 21845, 0, 0, 0, 43690, 43690, 0, 43690, 0, 43690, 43690, 43690, 43690, 43690, 21845, 21845, 21845, 65535, 21845, 21845, 21845, 65535, 21845, 65535, 65535, 21845, 21845, 21845, 65535, 65535, 21845, 65535, 21845, 65535, 65535, 65535, 65535, 65535}
 scrollbar_pos=1
 back_red=65535
 back_green=65535
@@ -86,7 +86,7 @@ hidden=true
 set_as_desktop=false
 centered_horizontally=false
 centered_vertically=false
-enable_transparency=true
+enable_transparency=false
 double_buffer=true
 auto_hide_on_focus_lost=false
 auto_hide_on_mouse_leave=false

From 5ceaeabe039afea456d2b6970223d5d581196da6 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Tue, 16 Jan 2018 14:23:22 +0100
Subject: [PATCH 20/51] Turn off vim's Python mode.

---
 vim/vimrc.symlink | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index 335f817..34ad711 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -64,7 +64,7 @@ let g:hugefile_trigger_size = '10000' " files over x MB are considered as large,
 " Visible git undo tree
 Plugin 'sjl/gundo.vim'
 " Python
-Plugin 'klen/python-mode'
+" Plugin 'klen/python-mode'
 " Gitignore
 Plugin 'rdolgushin/gitignore.vim'
 " Time tracking

From f0776bdb568c0972c16880350394ba7880d3bc92 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 24 Jan 2018 16:32:07 +0100
Subject: [PATCH 21/51] TBs to function.

---
 machine-based/merantix/aliases.zsh-run | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/machine-based/merantix/aliases.zsh-run b/machine-based/merantix/aliases.zsh-run
index 84f2ad4..8252c44 100644
--- a/machine-based/merantix/aliases.zsh-run
+++ b/machine-based/merantix/aliases.zsh-run
@@ -1,7 +1,10 @@
 function start_tb_moscow() {
 	python /home/knub/merantix/core/developer_env/tensorboard_deploy.py --instance-name mscw-tensorboard --logdir gs://merantix-dev-moscow-hft-derived/experiments_classification_$1/$2 --port $3
 }
-alias tbs='gcloud compute ssh mscw-tensorboard --command="grep 1 /tmp/tensorboards/*"'
+
+function tbs() {
+	gcloud compute ssh $1 --command="grep 1 /tmp/tensorboards/*"
+}
 
 alias cil="gcloud compute instances list"
 # alias cid="gcloud compute instances delete"

From 8a17901d7a8cc12c5ca20e655178e5ba11f186b5 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Fri, 23 Mar 2018 16:54:55 +0100
Subject: [PATCH 22/51] More and updated aliases.

---
 machine-based/merantix/aliases.zsh-run    |  6 +++++-
 machine-based/merantix/navigation.zsh-run | 10 +++++-----
 zsh/zshrc.symlink                         |  2 ++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/machine-based/merantix/aliases.zsh-run b/machine-based/merantix/aliases.zsh-run
index 8252c44..83bcced 100644
--- a/machine-based/merantix/aliases.zsh-run
+++ b/machine-based/merantix/aliases.zsh-run
@@ -7,8 +7,12 @@ function tbs() {
 }
 
 alias cil="gcloud compute instances list"
-# alias cid="gcloud compute instances delete"
+alias cid="gcloud compute instances delete"
+alias cista="gcloud compute instances start"
+alias cisto="gcloud compute instances stop"
 
 function cid() {
 	gcloud compute instances list | grep $1 | awk '{print $1}' | xargs -I {} -P 100  gcloud compute instances delete {} --quiet
 }
+
+alias dipython="drun ipython -i /merantix_core/developer_env/ipython_setup.py"
diff --git a/machine-based/merantix/navigation.zsh-run b/machine-based/merantix/navigation.zsh-run
index 771e879..ddbcd18 100644
--- a/machine-based/merantix/navigation.zsh-run
+++ b/machine-based/merantix/navigation.zsh-run
@@ -1,10 +1,10 @@
 alias cdcore="cd ~/merantix/core"
 alias cdbeamer="cd ~/merantix/core/beamer"
-alias cdoxfordflower="cd ~/merantix/core/bprojects/oxford_flower"
-alias cdedison="cd ~/merantix/core/bprojects/edison"
-alias cdreports="cd ~/merantix/core/bprojects/edison/reports"
-alias cdmoscow="cd ~/merantix/core/bprojects/moscow_hft"
+alias cdoxfordflower="cd ~/merantix/core/projects/oxford_flower"
+alias cdedison="cd ~/merantix/core/projects/edison"
+alias cdreports="cd ~/merantix/core/projects/edison/reports"
+alias cdmoscow="cd ~/merantix/core/projects/moscow_hft"
 alias cdmoscowtest="cd ~/merantix/core/data/moscow_test"
 alias cddata="cd ~/merantix/core/data"
-alias cdmoscowpreprocessing="cd ~/merantix/core/bprojects/moscow_hft/preprocessing"
+alias cdmoscowpreprocessing="cd ~/merantix/core/projects/moscow_hft/preprocessing"
 alias cdexperimental="cd ~/merantix/core/experimental/knub"
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 691835d..39aec9c 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -42,5 +42,7 @@ if [ -f /opt/google-cloud-sdk/completion.zsh.inc ]; then
   source '/opt/google-cloud-sdk/completion.zsh.inc'
 fi
 
+
+export ADDITIONAL_DRUN_PARAMS='-v "/run/media/knub/Media/data:/merantix_core/data"'
 source $HOME/merantix/core/developer_env/setup.sh
 unset DIR

From 2548af6aea36164caf55b3fb85fb834ff0d6b423 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Fri, 23 Mar 2018 17:55:04 +0100
Subject: [PATCH 23/51] Useful git aliases.

---
 git/aliases.zsh-run                    | 6 ++++++
 machine-based/merantix/aliases.zsh-run | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/git/aliases.zsh-run b/git/aliases.zsh-run
index 5b46d6e..5b5dd9d 100644
--- a/git/aliases.zsh-run
+++ b/git/aliases.zsh-run
@@ -38,6 +38,12 @@ function gpm() {
     gbd $BRANCH
     grpo
 }
+function gbackup() {
+    # creates backup branch
+    BRANCH=$(git rev-parse --abbrev-ref HEAD)
+    git checkout -b $BRANCH-backup
+    git checkout $BRANCH
+}
 function gri() {
     git rebase -i "HEAD~$1"
 }
diff --git a/machine-based/merantix/aliases.zsh-run b/machine-based/merantix/aliases.zsh-run
index 83bcced..0ac17f3 100644
--- a/machine-based/merantix/aliases.zsh-run
+++ b/machine-based/merantix/aliases.zsh-run
@@ -16,3 +16,7 @@ function cid() {
 }
 
 alias dipython="drun ipython -i /merantix_core/developer_env/ipython_setup.py"
+
+function vimgithook() {
+    vim + $(git rev-parse --show-toplevel)/.git/hooks/pre-commit
+}

From be9de1e584197115c25704e6053010e414e3fa7d Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 23 May 2018 11:52:23 +0200
Subject: [PATCH 24/51] Fix tbs function.

---
 machine-based/merantix/aliases.zsh-run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/machine-based/merantix/aliases.zsh-run b/machine-based/merantix/aliases.zsh-run
index 0ac17f3..a45255a 100644
--- a/machine-based/merantix/aliases.zsh-run
+++ b/machine-based/merantix/aliases.zsh-run
@@ -3,7 +3,7 @@ function start_tb_moscow() {
 }
 
 function tbs() {
-	gcloud compute ssh $1 --command="grep 1 /tmp/tensorboards/*"
+	gcloud compute ssh $1 --command='sudo docker ps --format "{{.Names}}" | xargs -I "{}" grep -H merantix /tmp/tensorboards/{} | sort'
 }
 
 alias cil="gcloud compute instances list"

From 5c851c6e7bccfe8bfaa8de520c2cf9aaeb4a15d6 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Thu, 24 May 2018 21:40:47 +0200
Subject: [PATCH 25/51] New aliases managing download directory.

---
 system/util.zsh-run | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/system/util.zsh-run b/system/util.zsh-run
index f5dab06..dddd418 100644
--- a/system/util.zsh-run
+++ b/system/util.zsh-run
@@ -46,3 +46,10 @@ function byobustart() {
 }
 
 alias sum='awk "{ sum += \$1 } END { print sum }"'
+
+function lsdownloads() {
+	ls ~/Downloads
+}
+function rmdownloads() {
+	rm ~/Downloads/*
+}

From 9594e0338e6a20ea9dbdf4aab048865bf594eb90 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Mon, 24 Dec 2018 01:23:05 +0100
Subject: [PATCH 26/51] Move to ubuntu again.

---
 setup_machine.sh | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/setup_machine.sh b/setup_machine.sh
index e838274..7e5d059 100755
--- a/setup_machine.sh
+++ b/setup_machine.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PACKAGE_MANAGER=dnf
+PACKAGE_MANAGER=apt
 
 set -o xtrace
 
@@ -9,12 +9,9 @@ if ! test -f zsh/antigen/Makefile ; then
 	git submodule update
 fi
 
-if ! grep -q "defaultyes" /etc/dnf/dnf.conf ; then
-	echo "defaultyes=True" | sudo tee -a /etc/dnf/dnf.conf
-fi
-
 sudo $PACKAGE_MANAGER upgrade
 sudo $PACKAGE_MANAGER install \
+	acpi-call-dkms \
 	alacarte \
 	autokey-gtk \
 	curl \
@@ -25,18 +22,18 @@ sudo $PACKAGE_MANAGER install \
 	gitg \
 	gnome-tweak-tool \
 	gparted \
-	gvim \
+	vim-gtk3 \
 	iotop \
-	ImageMagick \
+	imagemagick \
 	inkscape \
 	meld \
 	nethogs \
 	ncdu \
-	rubygem-rake \
+	rake \
+	smartmontools \
 	sl \
-	the_silver_searcher \
+	silversearcher-ag \
 	tree \
-	texlive \
 	tilda \
 	tlp \
 	tlp-rdw \
@@ -50,19 +47,15 @@ if ! grep -q "knub:/bin/zsh" /etc/passwd ; then
 	chsh -s /bin/zsh
 fi
 
-if ! dnf repolist | grep -q "home_snwh_paper" ; then
-	sudo dnf config-manager --add-repo http://download.opensuse.org/repositories/home:snwh:paper/Fedora_25/home:snwh:paper.repo
-	sudo dnf install paper-gtk-theme paper-icon-theme
-fi
 
 if ! test -L ~/.zshrc ; then
 	rake install
 fi
 
-###
-### Post installation steps
-###
-# * Install Hack font: http://sourcefoundry.org/hack/
+
+# Vim: run `:BundleInstall`
+# open `powertop`
+
 
 ###
 ### Gnome Shell Extensions

From d36b243f4974297d469237c8a3dacd3ff130d27f Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 26 Dec 2018 18:04:18 +0100
Subject: [PATCH 27/51] Adapt media file path.

---
 zsh/zshrc.symlink | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 39aec9c..07b6563 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -43,6 +43,6 @@ if [ -f /opt/google-cloud-sdk/completion.zsh.inc ]; then
 fi
 
 
-export ADDITIONAL_DRUN_PARAMS='-v "/run/media/knub/Media/data:/merantix_core/data"'
+export ADDITIONAL_DRUN_PARAMS='-v "/media/knub/Media/data:/merantix_core/data"'
 source $HOME/merantix/core/developer_env/setup.sh
 unset DIR

From e296aeb3562a2a7b01feaa42c321d94ad5328688 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 26 Dec 2018 18:05:37 +0100
Subject: [PATCH 28/51] Start commit editor always on first line.

---
 vim/vimrc.symlink | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index 34ad711..7eff30a 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -114,6 +114,13 @@ nmap . .`[
 " Set terminal title
 set title
 
+" ==================================================
+" Git
+" ==================================================
+" Always start on first line of git commit message, from http://vim.wikia.com/wiki/Always_start_on_first_line_of_git_commit_message
+autocmd FileType gitcommit call setpos('.', [0, 1, 1, 0])
+
+
 " ==================================================
 " Editing
 " ==================================================

From 25034df84924f77094d20e1f45a7de265f861361 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Thu, 27 Dec 2018 10:52:34 +0100
Subject: [PATCH 29/51] New alias for deleting branches.

---
 machine-based/merantix/aliases.zsh-run | 11 +++++++++++
 zsh/zshrc.symlink                      |  1 -
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/machine-based/merantix/aliases.zsh-run b/machine-based/merantix/aliases.zsh-run
index a45255a..719f0a5 100644
--- a/machine-based/merantix/aliases.zsh-run
+++ b/machine-based/merantix/aliases.zsh-run
@@ -20,3 +20,14 @@ alias dipython="drun ipython -i /merantix_core/developer_env/ipython_setup.py"
 function vimgithook() {
     vim + $(git rev-parse --show-toplevel)/.git/hooks/pre-commit
 }
+
+function delete_branches() {
+    git branch --list 'markus-*' | xargs -r git branch -D
+    git branch --list 'thijs-*' | xargs -r git branch -D
+    git branch --list 'benjamin-*' | xargs -r git branch -D
+    git branch --list 'christian-*' | xargs -r git branch -D
+    git branch --list 'john-*' | xargs -r git branch -D
+    git branch --list 'john_*' | xargs -r git branch -D
+    git branch --list 'jack-*' | xargs -r git branch -D
+    git branch --list 'jacek-*' | xargs -r git branch -D
+}
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 07b6563..39c6413 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -42,7 +42,6 @@ if [ -f /opt/google-cloud-sdk/completion.zsh.inc ]; then
   source '/opt/google-cloud-sdk/completion.zsh.inc'
 fi
 
-
 export ADDITIONAL_DRUN_PARAMS='-v "/media/knub/Media/data:/merantix_core/data"'
 source $HOME/merantix/core/developer_env/setup.sh
 unset DIR

From 7a35bdd7025124f301a493e822766b7757d753c2 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 2 Jan 2019 10:55:25 +0100
Subject: [PATCH 30/51] Remove old paths.

---
 machine-based/merantix/homes-and-paths.zsh-run | 2 --
 1 file changed, 2 deletions(-)

diff --git a/machine-based/merantix/homes-and-paths.zsh-run b/machine-based/merantix/homes-and-paths.zsh-run
index 7526dcf..e69de29 100644
--- a/machine-based/merantix/homes-and-paths.zsh-run
+++ b/machine-based/merantix/homes-and-paths.zsh-run
@@ -1,2 +0,0 @@
-export PATH="/opt/miniconda2/bin:$PATH"
-export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-1.b14.fc25.x86_64

From ed1958dc5fb1237ad123d62a72be4d5e20c03c5a Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Fri, 26 Apr 2019 14:34:05 +0200
Subject: [PATCH 31/51] Adapt stuff.

---
 bin/git-amend                             |  2 +-
 machine-based/merantix/navigation.zsh-run | 10 +++++++++-
 navigation/aliases.zsh-run                |  4 ++--
 zsh/zshrc.symlink                         |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/bin/git-amend b/bin/git-amend
index f5a7e87..b12b9bc 100755
--- a/bin/git-amend
+++ b/bin/git-amend
@@ -2,4 +2,4 @@
 #
 # Use the last commit message and amend your stuffs.
 
-git commit --amend -C HEAD
+git commit --amend --no-verify -C HEAD
diff --git a/machine-based/merantix/navigation.zsh-run b/machine-based/merantix/navigation.zsh-run
index ddbcd18..18f4b21 100644
--- a/machine-based/merantix/navigation.zsh-run
+++ b/machine-based/merantix/navigation.zsh-run
@@ -5,6 +5,14 @@ alias cdedison="cd ~/merantix/core/projects/edison"
 alias cdreports="cd ~/merantix/core/projects/edison/reports"
 alias cdmoscow="cd ~/merantix/core/projects/moscow_hft"
 alias cdmoscowtest="cd ~/merantix/core/data/moscow_test"
-alias cddata="cd ~/merantix/core/data"
+
+function cddata() {
+	if [ "$#" -eq 0 ]
+	then
+		cd ~/merantix/core/data
+	else
+		cd ~/merantix/core/data/$1
+	fi
+}
 alias cdmoscowpreprocessing="cd ~/merantix/core/projects/moscow_hft/preprocessing"
 alias cdexperimental="cd ~/merantix/core/experimental/knub"
diff --git a/navigation/aliases.zsh-run b/navigation/aliases.zsh-run
index ad408db..ddad18a 100644
--- a/navigation/aliases.zsh-run
+++ b/navigation/aliases.zsh-run
@@ -6,14 +6,14 @@ alias cddotfiles='cd ~/dotfiles'
 
 function rl() {
 	if hash xclip 2>/dev/null; then
-		readlink -n -f $1 | sed 's:/run/media/knub/Media:/merantix_core:g' | xclip -selection c
+		readlink -n -f $1 | sed 's:/media/knub/Media:/merantix_core:g' | xclip -selection c
 	else
 		readlink -f $1
 	fi
 }
 function rl.() {
 	if hash xclip 2>/dev/null; then
-		readlink -n -f . | sed 's:/run/media/knub/Media:/merantix_core:g' | xclip -selection c
+		readlink -n -f . | sed 's:/media/knub/Media:/merantix_core:g' | xclip -selection c
 	else
 		readlink -f .
 	fi
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 39c6413..1170a97 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -43,5 +43,5 @@ if [ -f /opt/google-cloud-sdk/completion.zsh.inc ]; then
 fi
 
 export ADDITIONAL_DRUN_PARAMS='-v "/media/knub/Media/data:/merantix_core/data"'
-source $HOME/merantix/core/developer_env/setup.sh
+source $HOME/merantix/core/developer_env/setup.sh EDISON
 unset DIR

From 15b936de0532e129bd44176448799aa227860f49 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 22 May 2019 13:41:01 +0200
Subject: [PATCH 32/51] Update Merantix scripts.

---
 git/aliases.zsh-run                    | 2 ++
 machine-based/merantix/aliases.zsh-run | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/git/aliases.zsh-run b/git/aliases.zsh-run
index 5b5dd9d..996e9ad 100644
--- a/git/aliases.zsh-run
+++ b/git/aliases.zsh-run
@@ -25,6 +25,8 @@ alias gs='git status -sb'
 alias grpo='git remote prune origin'
 alias grh='git reset HEAD'
 alias gt='git stash'
+alias gtl='git stash list'
+alias gtd='git stash drop'
 alias gbd='git branch -D'
 alias gtlrt='git stash -q && git pull --rebase --quiet && gl && git stash pop -q'
 alias gcaapf='git add . && git-amend && gp -f' # git commit all amend push force
diff --git a/machine-based/merantix/aliases.zsh-run b/machine-based/merantix/aliases.zsh-run
index 719f0a5..79becb5 100644
--- a/machine-based/merantix/aliases.zsh-run
+++ b/machine-based/merantix/aliases.zsh-run
@@ -3,7 +3,7 @@ function start_tb_moscow() {
 }
 
 function tbs() {
-	gcloud compute ssh $1 --command='sudo docker ps --format "{{.Names}}" | xargs -I "{}" grep -H merantix /tmp/tensorboards/{} | sort'
+	gcloud compute ssh $1 --command='sudo docker ps --format "{{.Names}}" | xargs -I "{}" grep -H . /tmp/tensorboards/{} | sort'
 }
 
 alias cil="gcloud compute instances list"
@@ -26,8 +26,10 @@ function delete_branches() {
     git branch --list 'thijs-*' | xargs -r git branch -D
     git branch --list 'benjamin-*' | xargs -r git branch -D
     git branch --list 'christian-*' | xargs -r git branch -D
+    git branch --list 'filippo-*' | xargs -r git branch -D
     git branch --list 'john-*' | xargs -r git branch -D
     git branch --list 'john_*' | xargs -r git branch -D
     git branch --list 'jack-*' | xargs -r git branch -D
     git branch --list 'jacek-*' | xargs -r git branch -D
+    git branch --list 'robert-*' | xargs -r git branch -D
 }

From 1e384b20a13b32ae8e9267cf4f14aa89bdb49448 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 29 May 2019 18:33:54 +0200
Subject: [PATCH 33/51] Merantix updates.

---
 machine-based/merantix/navigation.zsh-run | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/machine-based/merantix/navigation.zsh-run b/machine-based/merantix/navigation.zsh-run
index 18f4b21..9cb9627 100644
--- a/machine-based/merantix/navigation.zsh-run
+++ b/machine-based/merantix/navigation.zsh-run
@@ -1,10 +1,6 @@
 alias cdcore="cd ~/merantix/core"
-alias cdbeamer="cd ~/merantix/core/beamer"
-alias cdoxfordflower="cd ~/merantix/core/projects/oxford_flower"
-alias cdedison="cd ~/merantix/core/projects/edison"
-alias cdreports="cd ~/merantix/core/projects/edison/reports"
-alias cdmoscow="cd ~/merantix/core/projects/moscow_hft"
-alias cdmoscowtest="cd ~/merantix/core/data/moscow_test"
+alias cdpp="cd /merantix_core/data/mx-healthcare-derived/preprocessed"
+alias cdexperiments="cd /merantix_core/data/mx-healthcare-derived/experiments"
 
 function cddata() {
 	if [ "$#" -eq 0 ]
@@ -14,5 +10,3 @@ function cddata() {
 		cd ~/merantix/core/data/$1
 	fi
 }
-alias cdmoscowpreprocessing="cd ~/merantix/core/projects/moscow_hft/preprocessing"
-alias cdexperimental="cd ~/merantix/core/experimental/knub"

From a5059e3984f5fdc79452c6555ef48908b8b9a2eb Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Mon, 3 Jun 2019 14:07:28 +0200
Subject: [PATCH 34/51] Extend gpm to handle arbitrary 'master' branches.

---
 git/aliases.zsh-run | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/git/aliases.zsh-run b/git/aliases.zsh-run
index 996e9ad..7362fad 100644
--- a/git/aliases.zsh-run
+++ b/git/aliases.zsh-run
@@ -35,7 +35,13 @@ alias gassumeunchanged='git ls-files -v | grep "^[[:lower:]]"'
 function gpm() {
     # git post merge cleanup
     BRANCH=$(git rev-parse --abbrev-ref HEAD)
-    gcom
+
+    if [[ $# -ne 0 ]]
+    then
+        gco $1
+    else
+        gcom
+    fi
     glr
     gbd $BRANCH
     grpo

From d47233d92c9e4bad5c04b31930361c10e8cf4bb0 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Tue, 11 Jun 2019 18:48:47 +0200
Subject: [PATCH 35/51] Add guasetup.

---
 machine-based/merantix/util.zsh-run | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 machine-based/merantix/util.zsh-run

diff --git a/machine-based/merantix/util.zsh-run b/machine-based/merantix/util.zsh-run
new file mode 100644
index 0000000..4b2b1d8
--- /dev/null
+++ b/machine-based/merantix/util.zsh-run
@@ -0,0 +1,21 @@
+function guasetup {
+	cd /media/knub/Media/data/mx-healthcare-derived/preprocessed
+	guake --rename-current-tab "pp" --execute-command="cls"
+	sleep 0.3
+	guake --new-tab=2 --execute-command="cd /media/knub/Media/data/mx-healthcare-derived/experiments && cls" &
+	sleep 0.3
+	guake --new-tab=3 --execute-command="cd /home/knub/merantix/core && cls && djupyter" &
+	sleep 0.3
+	guake --new-tab=4 --execute-command="cd /home/knub/merantix/edison-product && cls" &
+	sleep 0.3
+	guake --new-tab=5 --execute-command="cd /home/knub/merantix/core && cls" &
+	sleep 0.3
+	guake --select-tab=1
+	guake --rename-current-tab="train"
+	guake --select-tab=2
+	guake --rename-current-tab="jupyter"
+	guake --select-tab=3
+	guake --rename-current-tab="ml-product"
+	guake --select-tab=4
+	guake --rename-current-tab="core"
+}

From d1a4dffde51935689d4696d50fd5187fc2412def Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Sat, 27 Jul 2019 20:29:02 +0200
Subject: [PATCH 36/51] Update what to install.

---
 setup_machine.sh  | 5 -----
 zsh/zshrc.symlink | 8 --------
 2 files changed, 13 deletions(-)

diff --git a/setup_machine.sh b/setup_machine.sh
index 7e5d059..cae5563 100755
--- a/setup_machine.sh
+++ b/setup_machine.sh
@@ -12,13 +12,10 @@ fi
 sudo $PACKAGE_MANAGER upgrade
 sudo $PACKAGE_MANAGER install \
 	acpi-call-dkms \
-	alacarte \
 	autokey-gtk \
 	curl \
-	dconf-editor \
 	htop \
 	powertop \
-	gimp \
 	gitg \
 	gnome-tweak-tool \
 	gparted \
@@ -27,11 +24,9 @@ sudo $PACKAGE_MANAGER install \
 	imagemagick \
 	inkscape \
 	meld \
-	nethogs \
 	ncdu \
 	rake \
 	smartmontools \
-	sl \
 	silversearcher-ag \
 	tree \
 	tilda \
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 1170a97..36ca3ed 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -4,14 +4,10 @@ source $DOTFILES/zsh/antigen/antigen.zsh
 antigen use oh-my-zsh
 antigen bundle arzzen/calc.plugin.zsh
 antigen bundle dirhistory
-#antigen bundle djui/alias-tips
 antigen bundle extract
 antigen bundle mvn
 antigen bundle vagrant
 antigen bundle web-search
-#antigen theme kafeitu
-#antigen-bundle arialdomartini/oh-my-git
-#antigen theme arialdomartini/oh-my-git-themes oppa-lana-style
 antigen apply
 
 # Replace known paths with their variable short form
@@ -28,10 +24,6 @@ for config_file ($DOTFILES/**/*.zsh-run) source $config_file
 export HISTSIZE=100000
 export SAVEHIST=100000
 
-# source "$HOME/.qfc/bin/qfc.sh"
-# qfc_quick_command 'cd' '\C-b' 'cd $0'
-# qfc_quick_command 'vim' '\C-p' 'vim $0'
-
 # The next line updates PATH for the Google Cloud SDK.
 if [ -f /opt/google-cloud-sdk/path.zsh.inc ]; then
   source '/opt/google-cloud-sdk/path.zsh.inc'

From 03a6fa94dead426b7f9dc2345a18d404432de7ac Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Sat, 27 Jul 2019 20:29:05 +0200
Subject: [PATCH 37/51] Update antigen.

---
 zsh/antigen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zsh/antigen b/zsh/antigen
index 1359b99..74aa897 160000
--- a/zsh/antigen
+++ b/zsh/antigen
@@ -1 +1 @@
-Subproject commit 1359b9966689e5afb666c2c31f5ca177006ce710
+Subproject commit 74aa89757038e42d472db22cb5b5bc6cbd4edb93

From c8711c4975802520f491d868a00b0a5a3f266492 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 25 Nov 2020 17:17:51 +0100
Subject: [PATCH 38/51] Fix git alias.

---
 git/aliases.zsh-run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/aliases.zsh-run b/git/aliases.zsh-run
index 7362fad..d26d846 100644
--- a/git/aliases.zsh-run
+++ b/git/aliases.zsh-run
@@ -10,7 +10,7 @@ alias gpd='git push origin --delete'
 alias gl='git --no-pager log --decorate=short --pretty="format:HEAD %C(yellow)%H%n%CresetAuthor: %an <%ae>%nDate:   %ai, %ar%nCommit: %ci %cr%n%n%s%n" -n1'
 alias glr='git pull --rebase --quiet && gl'
 alias grc='git rebase --continue'
-alias gfro='git fetch -q && git reset --hard origin/$(git name-rev --name-only HEAD) && gl'
+alias gfro='git fetch -q && git reset --hard origin/$(git branch --show-current) && gl'
 alias gd='git diff'
 alias gds='git diff --staged'
 alias gc='git commit'

From 9cdedf8fb241d0a6b28d8d6c48ab59b143b890a6 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 25 Nov 2020 17:17:57 +0100
Subject: [PATCH 39/51] Add kitty.

---
 system/kitty.zsh-run | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 system/kitty.zsh-run

diff --git a/system/kitty.zsh-run b/system/kitty.zsh-run
new file mode 100644
index 0000000..76e62d4
--- /dev/null
+++ b/system/kitty.zsh-run
@@ -0,0 +1,14 @@
+alias icat="kitty +kitten icat --align left"
+
+function show_rocs() {
+	for d in $(gsutil ls "gs://mx-healthcare-derived/experiments/smart_elimination/image/$1/**/roc_curve_screen_detected_cancers.png"); do
+		dataset=${d/*$1\//};
+		dataset=${dataset/\/cancer_detection_task*/};
+		dataset=${dataset:19}
+		echo $dataset | tr a-z A-Z;
+		gsutil cp $d . 2> /dev/null
+		icat roc_curve_screen_detected_cancers.png
+		rm roc_curve_screen_detected_cancers.png
+	done;
+}
+

From f0e4fb05c656c2493fdf3ffbfd5a3bd868d81196 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 25 Nov 2020 17:18:11 +0100
Subject: [PATCH 40/51] Fix delete branches.

---
 machine-based/merantix/aliases.zsh-run | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/machine-based/merantix/aliases.zsh-run b/machine-based/merantix/aliases.zsh-run
index 79becb5..f18553a 100644
--- a/machine-based/merantix/aliases.zsh-run
+++ b/machine-based/merantix/aliases.zsh-run
@@ -22,14 +22,16 @@ function vimgithook() {
 }
 
 function delete_branches() {
-    git branch --list 'markus-*' | xargs -r git branch -D
-    git branch --list 'thijs-*' | xargs -r git branch -D
     git branch --list 'benjamin-*' | xargs -r git branch -D
     git branch --list 'christian-*' | xargs -r git branch -D
+    git branch --list 'dominik_*' | xargs -r git branch -D
     git branch --list 'filippo-*' | xargs -r git branch -D
+    git branch --list 'gunnar-*' | xargs -r git branch -D
     git branch --list 'john-*' | xargs -r git branch -D
     git branch --list 'john_*' | xargs -r git branch -D
     git branch --list 'jack-*' | xargs -r git branch -D
     git branch --list 'jacek-*' | xargs -r git branch -D
+    git branch --list 'markus-*' | xargs -r git branch -D
     git branch --list 'robert-*' | xargs -r git branch -D
+    git branch --list 'thijs-*' | xargs -r git branch -D
 }

From f4a526d7b110abd0bbdad1b41bcb0ccf984290bb Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 25 Nov 2020 17:18:26 +0100
Subject: [PATCH 41/51] Guake setup.

---
 machine-based/merantix/util.zsh-run | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/machine-based/merantix/util.zsh-run b/machine-based/merantix/util.zsh-run
index 4b2b1d8..04eedaa 100644
--- a/machine-based/merantix/util.zsh-run
+++ b/machine-based/merantix/util.zsh-run
@@ -1,15 +1,17 @@
 function guasetup {
-	cd /media/knub/Media/data/mx-healthcare-derived/preprocessed
+	cd /home/knub/merantix/core/data/mx-healthcare-derived/preprocessed
 	guake --rename-current-tab "pp" --execute-command="cls"
-	sleep 0.3
-	guake --new-tab=2 --execute-command="cd /media/knub/Media/data/mx-healthcare-derived/experiments && cls" &
-	sleep 0.3
+	sleep 0.5
+	guake --new-tab=2 --execute-command="cd /home/knub/merantix/core/data/mx-healthcare-derived/experiments && cls" &
+	sleep 0.5
 	guake --new-tab=3 --execute-command="cd /home/knub/merantix/core && cls && djupyter" &
-	sleep 0.3
+	sleep 0.5
 	guake --new-tab=4 --execute-command="cd /home/knub/merantix/edison-product && cls" &
-	sleep 0.3
-	guake --new-tab=5 --execute-command="cd /home/knub/merantix/core && cls" &
-	sleep 0.3
+	sleep 0.5
+	guake --new-tab=5 --execute-command="cd /home/knub/merantix/core && INSTANCES=$EDISON_DB_INSTANCE dsqlproxy" &
+	sleep 0.5
+	guake --new-tab=6 --execute-command="cd /home/knub/merantix/core && cls" &
+	sleep 0.5
 	guake --select-tab=1
 	guake --rename-current-tab="train"
 	guake --select-tab=2
@@ -17,5 +19,7 @@ function guasetup {
 	guake --select-tab=3
 	guake --rename-current-tab="ml-product"
 	guake --select-tab=4
+	guake --rename-current-tab="db"
+	guake --select-tab=5
 	guake --rename-current-tab="core"
 }

From 043d0a7eb9f7e68cf55c9d8f7bc6b47467b18469 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 25 Nov 2020 17:18:32 +0100
Subject: [PATCH 42/51] Local setup.

---
 machine-based/merantix/homes-and-paths.zsh-run | 1 +
 zsh/zshrc.symlink                              | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/machine-based/merantix/homes-and-paths.zsh-run b/machine-based/merantix/homes-and-paths.zsh-run
index e69de29..11e902f 100644
--- a/machine-based/merantix/homes-and-paths.zsh-run
+++ b/machine-based/merantix/homes-and-paths.zsh-run
@@ -0,0 +1 @@
+export CLOUDSDK_PYTHON=python3
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 36ca3ed..fd3709b 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -34,6 +34,5 @@ if [ -f /opt/google-cloud-sdk/completion.zsh.inc ]; then
   source '/opt/google-cloud-sdk/completion.zsh.inc'
 fi
 
-export ADDITIONAL_DRUN_PARAMS='-v "/media/knub/Media/data:/merantix_core/data"'
 source $HOME/merantix/core/developer_env/setup.sh EDISON
 unset DIR

From 8e249e311dfe44049247a2b7d454b5bfcc39d65e Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Sun, 26 Dec 2021 10:59:21 +0100
Subject: [PATCH 43/51] Remove guasetup.

---
 machine-based/merantix/util.zsh-run | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 machine-based/merantix/util.zsh-run

diff --git a/machine-based/merantix/util.zsh-run b/machine-based/merantix/util.zsh-run
deleted file mode 100644
index 04eedaa..0000000
--- a/machine-based/merantix/util.zsh-run
+++ /dev/null
@@ -1,25 +0,0 @@
-function guasetup {
-	cd /home/knub/merantix/core/data/mx-healthcare-derived/preprocessed
-	guake --rename-current-tab "pp" --execute-command="cls"
-	sleep 0.5
-	guake --new-tab=2 --execute-command="cd /home/knub/merantix/core/data/mx-healthcare-derived/experiments && cls" &
-	sleep 0.5
-	guake --new-tab=3 --execute-command="cd /home/knub/merantix/core && cls && djupyter" &
-	sleep 0.5
-	guake --new-tab=4 --execute-command="cd /home/knub/merantix/edison-product && cls" &
-	sleep 0.5
-	guake --new-tab=5 --execute-command="cd /home/knub/merantix/core && INSTANCES=$EDISON_DB_INSTANCE dsqlproxy" &
-	sleep 0.5
-	guake --new-tab=6 --execute-command="cd /home/knub/merantix/core && cls" &
-	sleep 0.5
-	guake --select-tab=1
-	guake --rename-current-tab="train"
-	guake --select-tab=2
-	guake --rename-current-tab="jupyter"
-	guake --select-tab=3
-	guake --rename-current-tab="ml-product"
-	guake --select-tab=4
-	guake --rename-current-tab="db"
-	guake --select-tab=5
-	guake --rename-current-tab="core"
-}

From cabd15433056e793624ccc0bf62a48150a7129e2 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Sun, 26 Dec 2021 10:59:31 +0100
Subject: [PATCH 44/51] Improve ff.

---
 system/util.zsh-run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/util.zsh-run b/system/util.zsh-run
index dddd418..040f6fc 100644
--- a/system/util.zsh-run
+++ b/system/util.zsh-run
@@ -6,7 +6,7 @@ function watchdir() {
 
 # find file, ignore gitignored files
 function ff() {
-	ag -l --nocolor --hidden -g "$1"
+	ag --skip-vcs-ignores -l --nocolor --hidden -g "$1"
 }
 # find file, do not ignore gitignored files
 function ffa() {

From e539ab71c299d14b62a28ad8091b48dbe7d521b9 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 5 Jan 2022 18:03:13 +0100
Subject: [PATCH 45/51] Remove meld.

---
 bin/meld | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 bin/meld

diff --git a/bin/meld b/bin/meld
deleted file mode 120000
index 3a6e292..0000000
--- a/bin/meld
+++ /dev/null
@@ -1 +0,0 @@
-/home/knub/Programme/meld-3.14.2/bin/meld
\ No newline at end of file

From 98cd0a848a4f5733b50dc1927ab0c16833b1c4c4 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Wed, 5 Jan 2022 18:03:21 +0100
Subject: [PATCH 46/51] Add exif helpers.

---
 bin/exif_rename    |  8 ++++++++
 bin/exif_set_title | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100755 bin/exif_rename
 create mode 100755 bin/exif_set_title

diff --git a/bin/exif_rename b/bin/exif_rename
new file mode 100755
index 0000000..5f432de
--- /dev/null
+++ b/bin/exif_rename
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+exiftool \
+    -P \
+    -d '%Y-%m-%d-%H-%M' \
+    '-filename<$DateTimeOriginal%-03c.%e' \
+    '-filename<$DateTimeOriginal $Title%-03c.%e' \
+    "$@"
diff --git a/bin/exif_set_title b/bin/exif_set_title
new file mode 100755
index 0000000..a2ac0b3
--- /dev/null
+++ b/bin/exif_set_title
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+for VIDEO_FNAME in "$@"
+do
+	TITLE=$(exiftool -s -s -s -XMP:Title "$VIDEO_FNAME")
+
+	echo "$VIDEO_FNAME"
+
+	# Play video
+	totem "$VIDEO_FNAME" 2> /dev/null
+
+	# Ask user for new values
+	read -e -p "Title [$TITLE]: " TITLE
+
+	# Update EXIF if result wasn't blank
+	if [ -n "${TITLE}" ]; then
+		exiftool -overwrite_original \
+			-XMP:Title="$TITLE" \
+			"$VIDEO_FNAME"
+	fi
+done

From d48e7080025b18812163d6437a2abb5401473aa4 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Sat, 12 Feb 2022 22:15:37 +0100
Subject: [PATCH 47/51] Add mediainfo.

---
 installs                              | 2 ++
 machine-based/merantix/helper.zsh-run | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 machine-based/merantix/helper.zsh-run

diff --git a/installs b/installs
index 007e486..363dada 100644
--- a/installs
+++ b/installs
@@ -42,3 +42,5 @@ Unison
 
 # Fedora font rendering
 infinality
+
+mediainfo
diff --git a/machine-based/merantix/helper.zsh-run b/machine-based/merantix/helper.zsh-run
new file mode 100644
index 0000000..a306b0c
--- /dev/null
+++ b/machine-based/merantix/helper.zsh-run
@@ -0,0 +1,4 @@
+function merantix_data_sync_with_nautilus() {
+	merantix_data_sync $1
+	nautilus ~/merantix/core/data/$1
+}

From 5b8b59e6ac3ffa634598e862adf208ac294a111d Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan.bunk@googlemail.com>
Date: Wed, 16 Feb 2022 20:58:49 +0100
Subject: [PATCH 48/51] Sync with master.

---
 bin/run.zsh-run                               |   1 +
 machine-based/merantix/aliases.zsh-run        |   7 --
 .../thinkpad/homes-and-paths.zsh-run          |   0
 machine-based/thinkpad/navigation.zsh-run     |   0
 navigation/aliases.zsh-run                    |   4 +-
 setup_machine.sh                              |  19 ++--
 tilda/tilda.symlink/config_0                  | 101 ------------------
 zsh/zshrc.symlink                             |   1 +
 8 files changed, 14 insertions(+), 119 deletions(-)
 create mode 100644 machine-based/thinkpad/homes-and-paths.zsh-run
 create mode 100644 machine-based/thinkpad/navigation.zsh-run
 delete mode 100644 tilda/tilda.symlink/config_0

diff --git a/bin/run.zsh-run b/bin/run.zsh-run
index 8fe9adc..6cabcee 100644
--- a/bin/run.zsh-run
+++ b/bin/run.zsh-run
@@ -1 +1,2 @@
 export PATH="$PATH:$DOTFILES/bin"
+export PATH="$PATH:/home/knub/.local/bin"
diff --git a/machine-based/merantix/aliases.zsh-run b/machine-based/merantix/aliases.zsh-run
index f18553a..de7a926 100644
--- a/machine-based/merantix/aliases.zsh-run
+++ b/machine-based/merantix/aliases.zsh-run
@@ -1,10 +1,3 @@
-function start_tb_moscow() {
-	python /home/knub/merantix/core/developer_env/tensorboard_deploy.py --instance-name mscw-tensorboard --logdir gs://merantix-dev-moscow-hft-derived/experiments_classification_$1/$2 --port $3
-}
-
-function tbs() {
-	gcloud compute ssh $1 --command='sudo docker ps --format "{{.Names}}" | xargs -I "{}" grep -H . /tmp/tensorboards/{} | sort'
-}
 
 alias cil="gcloud compute instances list"
 alias cid="gcloud compute instances delete"
diff --git a/machine-based/thinkpad/homes-and-paths.zsh-run b/machine-based/thinkpad/homes-and-paths.zsh-run
new file mode 100644
index 0000000..e69de29
diff --git a/machine-based/thinkpad/navigation.zsh-run b/machine-based/thinkpad/navigation.zsh-run
new file mode 100644
index 0000000..e69de29
diff --git a/navigation/aliases.zsh-run b/navigation/aliases.zsh-run
index ddad18a..1786f80 100644
--- a/navigation/aliases.zsh-run
+++ b/navigation/aliases.zsh-run
@@ -6,14 +6,14 @@ alias cddotfiles='cd ~/dotfiles'
 
 function rl() {
 	if hash xclip 2>/dev/null; then
-		readlink -n -f $1 | sed 's:/media/knub/Media:/merantix_core:g' | xclip -selection c
+		readlink -n -f $1 | xclip -selection c
 	else
 		readlink -f $1
 	fi
 }
 function rl.() {
 	if hash xclip 2>/dev/null; then
-		readlink -n -f . | sed 's:/media/knub/Media:/merantix_core:g' | xclip -selection c
+		readlink -n -f . | xclip -selection c
 	else
 		readlink -f .
 	fi
diff --git a/setup_machine.sh b/setup_machine.sh
index cae5563..1ed6519 100755
--- a/setup_machine.sh
+++ b/setup_machine.sh
@@ -11,13 +11,12 @@ fi
 
 sudo $PACKAGE_MANAGER upgrade
 sudo $PACKAGE_MANAGER install \
-	acpi-call-dkms \
-	autokey-gtk \
 	curl \
+	dconf-editor \
 	htop \
 	powertop \
 	gitg \
-	gnome-tweak-tool \
+	gnome-tweaks \
 	gparted \
 	vim-gtk3 \
 	iotop \
@@ -25,14 +24,16 @@ sudo $PACKAGE_MANAGER install \
 	inkscape \
 	meld \
 	ncdu \
+	nethogs \
 	rake \
-	smartmontools \
 	silversearcher-ag \
 	tree \
 	tilda \
 	tlp \
 	tlp-rdw \
-	unison \
+	ubuntu-restricted-extras \
+	ubuntu-restricted-addons \
+	unison-gtk \
 	vim \
 	xclip \
 	zsh
@@ -47,10 +48,10 @@ if ! test -L ~/.zshrc ; then
 	rake install
 fi
 
-
-# Vim: run `:BundleInstall`
-# open `powertop`
-
+###
+### Post installation steps
+###
+# * Install Hack font: http://sourcefoundry.org/hack/
 
 ###
 ### Gnome Shell Extensions
diff --git a/tilda/tilda.symlink/config_0 b/tilda/tilda.symlink/config_0
deleted file mode 100644
index aba326d..0000000
--- a/tilda/tilda.symlink/config_0
+++ /dev/null
@@ -1,101 +0,0 @@
-tilda_config_version="0.9.6"
-# command=""
-font="Hack 12"
-key="F1"
-addtab_key="<Shift><Control>t"
-fullscreen_key="F11"
-toggle_transparency_key="F12"
-toggle_searchbar_key="<Shift><Control>f"
-closetab_key="<Shift><Control>w"
-nexttab_key="<Primary>Page_Down"
-prevtab_key="<Primary>Page_Up"
-movetableft_key="<Shift><Control>Page_Up"
-movetabright_key="<Shift><Control>Page_Down"
-gototab_1_key="<Alt>1"
-gototab_2_key="<Alt>2"
-gototab_3_key="<Alt>3"
-gototab_4_key="<Alt>4"
-gototab_5_key="<Alt>5"
-gototab_6_key="<Alt>6"
-gototab_7_key="<Alt>7"
-gototab_8_key="<Alt>8"
-gototab_9_key="<Alt>9"
-gototab_10_key="<Alt>0"
-copy_key="<Shift><Control>c"
-paste_key="<Shift><Control>v"
-quit_key="<Shift><Control>q"
-title="Tilda"
-background_color="white"
-# working_dir=""
-web_browser="google-chrome"
-increase_font_size_key="<Control>equal"
-decrease_font_size_key="<Control>minus"
-normalize_font_size_key="<Control>0"
-show_on_monitor="eDP-1"
-word_chars="-A-Za-z0-9,./?%&#:_"
-lines=1000000
-max_width=2560
-max_height=576
-min_width=1
-min_height=1
-x_pos=0
-y_pos=1290
-tab_pos=0
-backspace_key=0
-delete_key=1
-d_set_title=3
-command_exit=2
-scheme=0
-slide_sleep_usec=500
-animation_orientation=1
-timer_resolution=200
-auto_hide_time=2000
-on_last_terminal_exit=0
-palette_scheme=2
-non_focus_pull_up_behaviour=0
-cursor_shape=0
-# show_on_monitor_number=0
-title_max_length=25
-palette = {0, 0, 0, 43690, 0, 0, 0, 43690, 0, 43690, 21845, 0, 0, 0, 43690, 43690, 0, 43690, 0, 43690, 43690, 43690, 43690, 43690, 21845, 21845, 21845, 65535, 21845, 21845, 21845, 65535, 21845, 65535, 65535, 21845, 21845, 21845, 65535, 65535, 21845, 65535, 21845, 65535, 65535, 65535, 65535, 65535}
-scrollbar_pos=1
-back_red=65535
-back_green=65535
-back_blue=65535
-text_red=0
-text_green=0
-text_blue=0
-cursor_red=0
-cursor_green=0
-cursor_blue=0
-scroll_history_infinite=true
-scroll_on_output=false
-notebook_border=true
-antialias=true
-scrollbar=false
-grab_focus=true
-above=false
-notaskbar=true
-bold=true
-blinks=true
-scroll_on_key=true
-bell=false
-run_command=false
-pinned=false
-animation=false
-hidden=true
-set_as_desktop=false
-centered_horizontally=false
-centered_vertically=false
-enable_transparency=false
-double_buffer=true
-auto_hide_on_focus_lost=false
-auto_hide_on_mouse_leave=false
-title_max_length_flag=true
-inherit_working_dir=true
-command_login_shell=false
-start_fullscreen=false
-# image=""
-# scroll_background=false
-# use_image=false
-transparency=0
-back_alpha=65535
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index fd3709b..e9a539f 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -1,5 +1,6 @@
 export DOTFILES=$HOME/dotfiles
 ### Antigen
+setopt INTERACTIVE_COMMENTS
 source $DOTFILES/zsh/antigen/antigen.zsh
 antigen use oh-my-zsh
 antigen bundle arzzen/calc.plugin.zsh

From 775d460a87cfcae6ccd17bc6208a0891ba76bd80 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Thu, 17 Feb 2022 16:59:06 +0100
Subject: [PATCH 49/51] Lynx setup.

---
 machine-based/merantix/homes-and-paths.zsh-run | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/machine-based/merantix/homes-and-paths.zsh-run b/machine-based/merantix/homes-and-paths.zsh-run
index 11e902f..5e5f961 100644
--- a/machine-based/merantix/homes-and-paths.zsh-run
+++ b/machine-based/merantix/homes-and-paths.zsh-run
@@ -1 +1,4 @@
 export CLOUDSDK_PYTHON=python3
+
+LYNX_DB_URL=postgresql://read_only:UO%EH^P%t4nkRd%W@localhost:5433/lynx
+LYNX_DB_ENV="local"

From 8523c2a9e77d218d66cb3cf4d73c403579819dc0 Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Fri, 3 Mar 2023 17:57:27 +0100
Subject: [PATCH 50/51] Lynx settings.

---
 machine-based/merantix/homes-and-paths.zsh-run | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/machine-based/merantix/homes-and-paths.zsh-run b/machine-based/merantix/homes-and-paths.zsh-run
index 5e5f961..0e5948d 100644
--- a/machine-based/merantix/homes-and-paths.zsh-run
+++ b/machine-based/merantix/homes-and-paths.zsh-run
@@ -1,4 +1,8 @@
 export CLOUDSDK_PYTHON=python3
 
-LYNX_DB_URL=postgresql://read_only:UO%EH^P%t4nkRd%W@localhost:5433/lynx
+LYNX_DB_URL=postgresql://read_only:UO%EH^P%t4nkRd%W@cloudproxy:5433/lynx
 LYNX_DB_ENV="local"
+
+LYNX_DB_HOST="10.0.0.251"
+LYNX_DB_PROXY_USER="ml_access"
+LYNX_DB_PROXY_HOST="80.158.88.8"

From bf891c21caf16d1dba2bb27a9cd70f76f03ff68a Mon Sep 17 00:00:00 2001
From: Stefan Bunk <stefan@merantix.com>
Date: Tue, 10 Jun 2025 21:42:32 +0200
Subject: [PATCH 51/51] smarter git checkout

---
 git/aliases.zsh-run                            | 10 +++++++++-
 machine-based/merantix/homes-and-paths.zsh-run |  2 +-
 zsh/zshrc.symlink                              |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/git/aliases.zsh-run b/git/aliases.zsh-run
index d26d846..19c3c28 100644
--- a/git/aliases.zsh-run
+++ b/git/aliases.zsh-run
@@ -18,7 +18,15 @@ alias gcempty='git commit -m "" --allow-empty-message'
 alias gca='git commit -a'
 alias gco='git checkout'
 alias gco.='git checkout .'
-alias gcom='git checkout master'
+
+git_checkout_main_or_master() {
+    if git rev-parse --verify master &>/dev/null; then
+        git checkout master
+    else
+        git checkout main
+    fi
+}
+alias gcom='git_checkout_main_or_master'
 alias gcod='git checkout develop'
 alias gb='git branch'
 alias gs='git status -sb'
diff --git a/machine-based/merantix/homes-and-paths.zsh-run b/machine-based/merantix/homes-and-paths.zsh-run
index 0e5948d..81fc336 100644
--- a/machine-based/merantix/homes-and-paths.zsh-run
+++ b/machine-based/merantix/homes-and-paths.zsh-run
@@ -5,4 +5,4 @@ LYNX_DB_ENV="local"
 
 LYNX_DB_HOST="10.0.0.251"
 LYNX_DB_PROXY_USER="ml_access"
-LYNX_DB_PROXY_HOST="80.158.88.8"
+LYNX_DB_PROXY_HOST="80.158.3.226"
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index e9a539f..ada0de1 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -37,3 +37,4 @@ fi
 
 source $HOME/merantix/core/developer_env/setup.sh EDISON
 unset DIR
+