# HG changeset patch # User zegervdv # Date 1421827919 -3600 # Node ID 1d9bec72b9b3740cdacc4cc447db3c14ea8f3720 # Parent 30eb5cded5213a7d77db8e493dc73636c6884cb9 Update colors and style diff -r 30eb5cded521 -r 1d9bec72b9b3 tmux.conf --- a/tmux.conf Tue Jan 13 18:57:47 2015 +0100 +++ b/tmux.conf Wed Jan 21 09:11:59 2015 +0100 @@ -83,7 +83,6 @@ # Plugin Manager set -g @tpm_plugins " \ tmux-plugins/tpm \ - tmux-plugins/tmux-sensible \ tmux-plugins/tmux-resurrect \ tmux-plugins/tmux-open \ tmux-plugins/tmux-copycat \ diff -r 30eb5cded521 -r 1d9bec72b9b3 tmux/statusline.conf --- a/tmux/statusline.conf Tue Jan 13 18:57:47 2015 +0100 +++ b/tmux/statusline.conf Wed Jan 21 09:11:59 2015 +0100 @@ -1,13 +1,13 @@ # This tmux statusbar config was created by tmuxline.vim # on ma, 10 nov 2014 -set -g status-bg "colour235" +set -g status-bg "default" 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 "colour235" +set -g message-bg "default" set -g status-right-length "100" set -g status-right-attr "none" set -g message-fg "colour250" @@ -18,12 +18,12 @@ set -g status-left-attr "none" setw -g window-status-fg "colour241" setw -g window-status-attr "none" -setw -g window-status-activity-bg "colour235" +setw -g window-status-activity-bg "default" setw -g window-status-activity-attr "underscore" setw -g window-status-activity-fg "colour241" setw -g window-status-separator "" -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]" +setw -g window-status-bg "default" +set -g status-left "#[fg=colour109,bg=default,nobold,nounderscore,noitalics]#[fg=colour239,bg=default,nobold,nounderscore,noitalics]#[fg=colour235,bg=default,nobold,nounderscore,noitalics]" +set -g status-right "#[fg=colour235,bg=default,nobold,nounderscore,noitalics]#[fg=colour235,bg=default,nobold,nounderscore,noitalics]" +setw -g window-status-format "#[fg=colour235,bg=default,nobold,nounderscore,noitalics]#[default] #W #[fg=colour235,bg=default,nobold,nounderscore,noitalics]" +setw -g window-status-current-format "#[fg=colour235,bg=default,nobold,nounderscore,noitalics]#[fg=colour250,bg=default] #W #[fg=colour235,bg=default,nobold,nounderscore,noitalics]" diff -r 30eb5cded521 -r 1d9bec72b9b3 vimrc --- a/vimrc Tue Jan 13 18:57:47 2015 +0100 +++ b/vimrc Wed Jan 21 09:11:59 2015 +0100 @@ -20,8 +20,7 @@ Plug 'wellle/targets.vim' Plug 'mtth/scratch.vim' Plug 'mrmargolis/dogmatic.vim' -Plug 'xolox/vim-misc' -Plug 'xolox/vim-notes' +Plug 'whatyouhide/vim-gotham' " Undo Plug 'sjl/gundo.vim', { 'on': 'GundoToggle' } @@ -31,7 +30,8 @@ Plug 'tpope/vim-dispatch' " Search and Complete -Plug 'Shougo/neocomplete' +" Plug 'Shougo/neocomplete' +Plug 'ajh17/VimCompletesMe' Plug 'Shougo/neosnippet' Plug 'Shougo/neosnippet-snippets' Plug 'Shougo/vimproc', { 'do': 'make' } @@ -99,7 +99,7 @@ " Layout set t_Co=256 set background=dark -color Tomorrow-Night +color gotham set guifont=Inconsolata\ for\ Powerline:h12 " Make background color same as terminal ("transparent") " hi Normal ctermbg=none