# HG changeset patch # User zegervdv # Date 1415722712 -3600 # Node ID 0c8211e1c67a86867468d510ad5f28b07f7d99d9 # Parent 6df73555c3a7787051031d7f58d967673ad9b0db Update look of tmux diff -r 6df73555c3a7 -r 0c8211e1c67a tmux.conf --- a/tmux.conf Sun Nov 09 16:47:01 2014 +0100 +++ b/tmux.conf Tue Nov 11 17:18:32 2014 +0100 @@ -47,6 +47,8 @@ # renumber windows sequentially after closing any of them set -g renumber-windows on +bind-key r source ~/.tmux.conf + # remove administrative debris (session name, hostname, time) in status bar diff -r 6df73555c3a7 -r 0c8211e1c67a tmux/statusline.conf --- a/tmux/statusline.conf Sun Nov 09 16:47:01 2014 +0100 +++ b/tmux/statusline.conf Tue Nov 11 17:18:32 2014 +0100 @@ -1,29 +1,29 @@ # This tmux statusbar config was created by tmuxline.vim -# on zo, 09 nov 2014 +# on ma, 10 nov 2014 -set -g status-bg "colour236" +set -g status-bg "colour235" set -g message-command-fg "colour250" set -g status-justify "centre" set -g status-left-length "100" set -g status "on" set -g pane-active-border-fg "colour109" -set -g message-bg "colour239" +set -g message-bg "colour235" set -g status-right-length "100" set -g status-right-attr "none" set -g message-fg "colour250" -set -g message-command-bg "colour239" +set -g message-command-bg "colour235" set -g status-attr "none" set -g status-utf8 "on" -set -g pane-border-fg "colour239" +set -g pane-border-fg "colour235" set -g status-left-attr "none" -setw -g window-status-fg "colour250" +setw -g window-status-fg "colour241" setw -g window-status-attr "none" -setw -g window-status-activity-bg "colour236" -setw -g window-status-activity-attr "none" -setw -g window-status-activity-fg "colour109" +setw -g window-status-activity-bg "colour235" +setw -g window-status-activity-attr "underscore" +setw -g window-status-activity-fg "colour241" setw -g window-status-separator "" -setw -g window-status-bg "colour236" -set -g status-left "#[fg=colour235,bg=colour109,bold] #S #[fg=colour109,bg=colour239,nobold,nounderscore,noitalics]#[fg=colour250,bg=colour239] #F #[fg=colour239,bg=colour236,nobold,nounderscore,noitalics]#[fg=colour250,bg=colour236] #W #[fg=colour236,bg=colour236,nobold,nounderscore,noitalics]" -set -g status-right "#[fg=colour239,bg=colour236,nobold,nounderscore,noitalics]#[fg=colour250,bg=colour239] %a %b %d | %R #[fg=colour109,bg=colour239,nobold,nounderscore,noitalics]#[fg=colour235,bg=colour109] #h " -setw -g window-status-format "#[fg=colour236,bg=colour236,nobold,nounderscore,noitalics]#[default] #I | #W #[fg=colour236,bg=colour236,nobold,nounderscore,noitalics]" -setw -g window-status-current-format "#[fg=colour236,bg=colour239,nobold,nounderscore,noitalics]#[fg=colour250,bg=colour239] #I | #W #[fg=colour239,bg=colour236,nobold,nounderscore,noitalics]" +setw -g window-status-bg "colour235" +set -g status-left "#[fg=colour109,bg=colour239,nobold,nounderscore,noitalics]#[fg=colour239,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]" +set -g status-right "#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]" +setw -g window-status-format "#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[default] #W #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]" +setw -g window-status-current-format "#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour250,bg=colour235] #W #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]" diff -r 6df73555c3a7 -r 0c8211e1c67a vim/colors/Tomorrow-Night.vim --- a/vim/colors/Tomorrow-Night.vim Sun Nov 09 16:47:01 2014 +0100 +++ b/vim/colors/Tomorrow-Night.vim Tue Nov 11 17:18:32 2014 +0100 @@ -272,7 +272,7 @@ " Standard Highlighting call X("Comment", s:comment, "", "") - call X("Todo", s:green, s:background, "") + call X("Todo", s:comment, s:background, "") call X("Title", s:comment, "", "") call X("Identifier", s:red, "", "none") call X("Statement", s:foreground, "", "") diff -r 6df73555c3a7 -r 0c8211e1c67a vimrc --- a/vimrc Sun Nov 09 16:47:01 2014 +0100 +++ b/vimrc Tue Nov 11 17:18:32 2014 +0100 @@ -98,9 +98,15 @@ set breakindent set lbr set tabstop=2 shiftwidth=2 + +" Layout +set t_Co=256 set background=dark color Tomorrow-Night set guifont=Inconsolata\ for\ Powerline:h12 +" Make background color same as terminal ("transparent") +" hi Normal ctermbg=none + set autowrite set hidden set hlsearch @@ -352,6 +358,7 @@ " Airline configuration {{{ let g:airline_inactive_collapse=0 let g:airline_powerline_fonts=1 +let g:airline#extensions#tmuxline#enabled = 0 let g:airline_left_sep = '' let g:airline_right_sep = '' @@ -550,13 +557,24 @@ " Tmuxline {{{ let g:tmuxline_powerline_separators=0 let g:tmuxline_preset = { - \ 'a': '#S', - \ 'b': '#F', - \ 'c': '#W', + \ 'a': '', + \ 'b': '', + \ 'c': '', \ 'win': ['#I', '#W'], \ 'cwin': ['#I', '#W'], - \ 'y': ['%a %b %d', '%R'], - \ 'z': '#h'} + \ 'y': '', + \ 'z': ''} +let g:tmuxline_theme = { + \ 'a' : [250, 109], + \ 'b': [250, 239], + \ 'c': [250, 235], + \ 'win': [241, 235], + \ 'cwin': [250, 235], + \ 'x' : [250, 235], + \ 'y': [250, 235], + \ 'z': [250, 235], + \ 'bg' : [250, 235], + \ } " }}} " After-objects {{{ autocmd VimEnter * call after_object#enable('=', ':', '-', '#', ' ')