Permalink
Browse files

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

  • Loading branch information...
2 parents 08b66ac + 4da5c69 commit 7c082dd2f967f0304d01b50715e19d22509840bb @mattly committed Aug 16, 2012
Showing with 18 additions and 14 deletions.
  1. +15 −13 tmux.conf
  2. +3 −1 vimrc
View
@@ -35,10 +35,13 @@ set -g xterm-keys on
# Window (tab) Management and Navigation
# ======================================
+ bind-key -r C-w choose-window
bind-key -r C-h select-window -t :-
bind-key -r C-l select-window -t :+
bind-key -r z last-window
bind , command-prompt "rename-window '%%'"
+ bind [ set -w monitor-activity on; set -w monitor-silence 0
+ bind ] set -w monitor-activity off; set -w monitor-silence 5
# Pane Management and Navigation
# ================================
@@ -64,17 +67,18 @@ set -g xterm-keys on
set -g default-terminal "screen-256color"
# statusline
- set -g status-fg white
- set -g status-bg black
+ set -g status-fg black
+ set -g status-bg white
- setw -g window-status-fg white
+ setw -g window-status-fg black
setw -g window-status-bg default
setw -g window-status-attr bright
- setw -g window-status-current-fg yellow
+ setw -g window-status-current-fg blue
setw -g window-status-current-bg default
- setw -g window-status-current-attr bright
+ setw -g window-status-current-attr none
setw -g window-status-bell-bg default
setw -g window-status-bell-fg red
+ setw -g window-status-bell-attr none
# pane borders
set -g pane-border-fg blue
@@ -83,19 +87,17 @@ set -g xterm-keys on
set -g pane-active-border-bg default
# command line
- set -g message-fg white
- set -g message-bg black
+ set -g message-fg black
+ set -g message-bg white
set -g message-attr bright
# Status Line
# ===========
+ set -g status off
set -g status-utf8 on
- set -g status-left "#[fg=white]#S #[fg=white]#I #[fg=white]#P"
- set -g status-right "#[fg=white]%d %b %R"
- set -g status-justify centre
-
- setw -g monitor-activity on
- set -g visual-activity on
+ set -g status-left ""
+ set -g status-right ""
+ set -g status-justify right
# Copy Mode
# =========
View
4 vimrc
@@ -67,7 +67,7 @@
endif
endif
- let colors='tomorrow-night'
+ let colors='tomorrow'
if g:colors == 'solarized'
let g:solarized_contrast="high"
colorscheme solarized
@@ -87,6 +87,8 @@
hi StatusLineNC ctermbg=248 ctermfg=233
hi VertSplit ctermbg=248 ctermfg=248
hi StatusWarning ctermbg=160 ctermfg=254
+ elseif g:colors == 'tomorrow'
+ colorscheme Tomorrow
else
hi OverLength guifg=#ffffff guibg=#ff0000
hi OverLength ctermbg=red ctermfg=white

0 comments on commit 7c082dd

Please sign in to comment.