Merge branch 'work'

zsh/zprofile

@@ -9,7 +9,7 @@ _path=("$HOME/bin"
        "/usr/games")
 
 PATH=""
-for part in ${_path} ; do
+for part in ${_path[@]} ; do
     PATH="$PATH:${part}"
 done
 PATH="${PATH#:}"
@@ -17,9 +17,10 @@ export PATH
 
 export EDITOR="vim"
 export VISUAL="vim"
-export BROWSER="chromium"
+export BROWSER="firefox-trunk"
 
 export PAGER="less"
+export LESS="FRX"
 
 export VIMRC="$HOME/.vimrc"
 
@@ -34,6 +35,9 @@ export LANG=en_US.UTF-8
 export LC_TIME=de_DE.UTF-8
 export LC_COLLATE=C
 
+export DOTFILES=~/dotfiles
+
+
 # Start the gpg-agent if not already running
 if ! pgrep -x --uid "${USER}" gpg-agent >/dev/null 2>&1; then
     eval $(gpg-agent --daemon --sh)

zsh/zshrc.d/20_aliases.sh

@@ -1,7 +1,4 @@
 ### TRANSLATIONS
-alias vim="vim -u $VIMRC"
-
-alias urxvt="urxvt256c"
 
 ### COMMON OPERATIONS
 alias ll='ls -AlFh'
@@ -26,8 +23,6 @@ alias calc='python3 -ic "from math import *; import cmath"'
 alias le_haxxor_1='clear && dmesg | pv -qL 20'
 alias le_haxxor_2='clear && hexdump -C /dev/urandom | pv -qlL 2'
 
-alias b='cd $OLDPWD'
-
 alias root='sudo -sE'
 
 ### USEFUL DEFAULT OPTIONS
@@ -51,17 +46,15 @@ alias du='du -h'
 alias df='df -h'
 
 # show non-printable characters by default
-alias cat="cat -v"
+# alias cat="cat -v"
 
 ### SHORTENING COMMAND NAMES
 alias cs="cryptsetup"
 alias v="vim"
 alias g="git"
-alias t="tmux"
 alias c="cd"
 alias l="ls"
 alias s="sudo"
-alias t="tmux"
 alias cl="clear"
 
 alias nocolor="sed -r \"s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]//g\""

zsh/zshrc.d/40_functions.sh

@@ -143,3 +143,33 @@ man() {
 embiggen() {
     enscript --no-header --media=A4 --landscape --font="DejaVuSansMono30" -o - | ps2pdf - | zathura -
 }
+
+sshmux () { 
+    ssh -t $@ "tmux a || tmux";
+}
+
+t() {
+    if [[ "$1" ]] ; then
+        tmux new-session -A -s "$1"
+    else
+        tmux attach-session
+    fi
+}
+
+b() {
+    bookmarks=${DOTFILES}/bookmarks
+    bookmark="$1"
+    if ! [[ "${bookmark}" ]] ; then
+        printf 'Need a bookmark' >&2
+        return 1
+    fi
+    if ! [[ -r "${bookmark}" ]] ; then
+        printf 'Invalid bookmark %s' "${bookmark}" >&2
+        return 1
+    fi
+    target="$(head -1 ${bookmark})"
+    if ! [[ -e "${target}" ]] ; then
+        printf 'Traget not found: %s' "${target}" >&2
+    fi
+    cd "$(eval ${target})"
+}