Merge branch 'master' of github.com:bixel/dotfiles

Xmodmap

@@ -2,3 +2,6 @@ clear lock
 keycode   9 = Caps_Lock NoSymbol Caps_Lock NoSymbol Caps_Lock
 keycode  66 = Escape NoSymbol Escape NoSymbol Escape
 add lock = Caps_Lock
+keycode  30 = u U u U U00FC U00DC
+keycode  32 = o O o O U00F6 U00D6 oslash Oslash
+keycode  38 = a A a A U00E4 U00C4

tmux.conf

@@ -42,5 +42,8 @@ bind c new-window -c "#{pane_current_path}"
 # Use vim keybindings in copy mode
 setw -g mode-keys vi
 
+# prevent delayed escape key
+set -s escape-time 0
+
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run '~/.dotfiles/external/tpm/tpm'

zshrc

@@ -84,7 +84,12 @@ mountremote () {
       mountpoint=$1-`echo $2 | sed -E "s/\///g"`
   fi
   mkdir -p $mountroot/$mountpoint
-  sshfs $1:$2 "$mountroot/$mountpoint" -o auto_cache,reconnect,volname=$mountpoint,no_readahead,noappledouble,nolocalcaches
+  if [[ $(uname -a) == *"Darwin"* ]]; then
+      # following line is apple-specific
+      sshfs $1:$2 "$mountroot/$mountpoint" -o auto_cache,reconnect,volname=$mountpoint,no_readahead,noappledouble,nolocalcaches
+  else
+      sshfs $1:$2 "$mountroot/$mountpoint" -o auto_cache,reconnect,no_readahead
+  fi
   unset mountroot
   unset mountpoint
 }