diff --git a/.bashrc b/.bashrc
index ecc3214..c1b94e8 100644
--- a/.bashrc
+++ b/.bashrc
@@ -11,7 +11,7 @@ then
     PATH="$HOME/.local/bin:$HOME/bin:$PATH"
 fi
 
-export PATH=$PATH:/usr/local/go/bin:$HOME/protolint_0.44.0_Linux_x86_64/:$HOME/.cargo/bin:$HOME/go/bin
+export PATH=$PATH:/usr/local/go/bin:$HOME/protolint_0.44.0_Linux_x86_64/:$HOME/.cargo/bin:$HOME/go/bin:$HOME/.local/bin
 # Uncomment the following line if you don't like systemctl's auto-paging feature:
 # export SYSTEMD_PAGER=
 
diff --git a/.tmux.conf b/.tmux.conf
index 8971e5a..b999f5f 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1 +1,59 @@
+# 0 is too far from ` ;)
+set -g base-index 1
+
+# Automatically set window title
+set-window-option -g automatic-rename on
+set-option -g set-titles on
+
+#set -g default-terminal screen-256color
+set -g status-keys vi
+set -g history-limit 10000
+
+setw -g mode-keys vi
+setw -g mouse on
+setw -g monitor-activity on
+
+bind-key v split-window -h
+bind-key s split-window -v
+
+bind-key J resize-pane -D 15
+bind-key K resize-pane -U 15
+bind-key H resize-pane -L 15
+bind-key L resize-pane -R 15
+
+bind-key M-j resize-pane -D
+bind-key M-k resize-pane -U
+bind-key M-h resize-pane -L
+bind-key M-l resize-pane -R
+
+# Vim style pane selection
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# Use Alt-vim keys without prefix key to switch panes
+bind -n M-h select-pane -L
+bind -n M-j select-pane -D
+bind -n M-k select-pane -U
+bind -n M-l select-pane -R
+
+# Use Alt-arrow keys without prefix key to switch panes
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D
+
+# Shift arrow to switch windows
+bind -n S-Left  previous-window
+bind -n S-Right next-window
+
+# No delay for escape key press
+set -sg escape-time 0
+
+# Reload tmux config
+bind r source-file ~/.tmux.conf
+
+# bottom right status bar that highlights when prefix active
 set -g status-right ' #{?client_prefix,#[reverse]<Prefix>#[noreverse] ,}"#{=21:pane_title}" %H:%M %d-%b-%y'
+