Merge branch 'master' of ssh://github.com/pks/dotfiles

3 files changed, 80 insertions, 6 deletions

diff --git a/tmux/.tmux.default.conf b/tmux/.tmux.default.conf
new file mode 100644
index 0000000..23141ed
--- /dev/null
+++ b/tmux/.tmux.default.conf
@@ -0,0 +1,36 @@
+# act like vim
+setw -g mode-keys vi
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+bind-key -r C-h select-window -t :-
+bind-key -r C-l select-window -t :+
+
+# act like GNU screen
+unbind C-b
+set -g prefix C-a
+
+# look good
+set -g default-terminal "screen-256color"
+
+# status
+set -g status-left-length 32
+set -g status-right-length 150
+set -g status-fg white
+set -g status-bg colour234
+set -g window-status-activity-attr bold
+set -g pane-border-fg colour245
+set -g pane-active-border-fg white
+set -g message-fg colour16
+set -g message-bg colour221
+set -g message-attr bold
+set -g status-left ''
+set -g status-right '#[fg=black,bg=white]   #H:#[bold]#S   '
+set-option -g set-titles on
+set -g set-titles-string '#T -- #W'
+set-window-option -g automatic-rename on
+set-option -g status-interval 1
+set-option -g status-utf8 on
+set-window-option -g utf8 on
+
diff --git a/tmux/.tmux.uberspace.conf b/tmux/.tmux.uberspace.conf
new file mode 100644
index 0000000..ac7d751
--- /dev/null
+++ b/tmux/.tmux.uberspace.conf
@@ -0,0 +1,36 @@
+# act like vim
+setw -g mode-keys vi
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+bind-key -r C-h select-window -t :-
+bind-key -r C-l select-window -t :+
+
+# act like GNU screen
+unbind C-b
+set -g prefix C-a
+
+# look good
+set -g default-terminal "screen-256color"
+
+# status
+set -g status-left-length 32
+set -g status-right-length 150
+set -g status-fg white
+set -g status-bg colour234
+set -g window-status-activity-attr bold
+set -g pane-border-fg colour245
+set -g pane-active-border-fg green
+set -g message-fg colour16
+set -g message-bg colour221
+set -g message-attr bold
+set -g status-left ''
+set -g status-right '#[fg=black,bg=green]   #H:#[bold]#S   '
+set-option -g set-titles on
+set -g set-titles-string '#T -- #W'
+set-window-option -g automatic-rename on
+set-option -g status-interval 1
+set-option -g status-utf8 on
+set-window-option -g utf8 on
+
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 98bf926..3911f50 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -227,11 +227,13 @@ case `hostname` in
   ;;
   *.uberspace.de)
     HOSTCOLOR_BG=green
-    HOSTCOLOR_FG=white
+    HOSTCOLOR_FG=black
+    alias tmux="tmux -f ~/.tmux.uberspace.conf"
   ;;
   *)
     HOSTCOLOR_BG=black
     HOSTCOLOR_FG=white
+    alias tmux="tmux -f ~/.tmux.default.conf"
   ;;
 esac
 
@@ -243,11 +245,11 @@ if [[ $(on_gcloud) == "yes" ]]; then
 fi
 
 # aws
-#if [[ $(on_aws) == "yes" ]]; then
-#  HOSTCOLOR_BG=yellow
-#  HOSTCOLOR_FG=black
-#  alias tmux="tmux -f ~/.tmux.aws.conf"
-#fi
+if [[ $(on_aws) == "yes" ]]; then
+  HOSTCOLOR_BG=yellow
+  HOSTCOLOR_FG=black
+  alias tmux="tmux -f ~/.tmux.aws.conf"
+fi
 
 function chpwd
 {