More merantix specific stuff.

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"

machine-based/merantix/aliases.zsh-run

@@ -0,0 +1 @@
+alias sshtensorboard="gssh john-tensorboard"

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"

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

tilda/tilda.symlink/config_0

@@ -31,15 +31,15 @@ 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
 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

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