From cc233fa5c5645a21ed25b5a95c499fb079c585e6 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sun, 15 Feb 2015 23:52:47 +0100 Subject: [PATCH] use lightline --- tmux.conf | 33 ++++++++++++++++----------------- vimrc | 22 +++++++++++++++------- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/tmux.conf b/tmux.conf index 4cce47f..da6f6d4 100644 --- a/tmux.conf +++ b/tmux.conf @@ -59,32 +59,31 @@ set -g mouse-select-pane on set -g mouse-select-window on # This tmux statusbar config was created by tmuxline.vim -# on Mon, 15 Dec 2014 +# on Sun, 15 Feb 2015 -set -g status-bg "colour234" -set -g message-command-fg "colour231" +set -g status-bg "colour235" +set -g message-command-fg "colour230" set -g status-justify "left" set -g status-left-length "100" set -g status "on" -set -g pane-active-border-fg "colour254" -set -g message-bg "colour31" +set -g pane-active-border-fg "colour33" +set -g message-bg "colour239" set -g status-right-length "100" set -g status-right-attr "none" -set -g message-fg "colour231" -set -g message-command-bg "colour31" +set -g message-fg "colour230" +set -g message-command-bg "colour239" set -g status-attr "none" set -g status-utf8 "on" -set -g pane-border-fg "colour240" +set -g pane-border-fg "colour239" set -g status-left-attr "none" -setw -g window-status-fg "colour250" +setw -g window-status-fg "colour245" setw -g window-status-attr "none" -setw -g window-status-activity-bg "colour234" +setw -g window-status-activity-bg "colour235" setw -g window-status-activity-attr "none" -setw -g window-status-activity-fg "colour250" +setw -g window-status-activity-fg "colour33" setw -g window-status-separator "" -setw -g window-status-bg "colour234" -set -g status-left "#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour234,nobold,nounderscore,noitalics]>" -set -g status-right "#[fg=colour236,bg=colour234,nobold,nounderscore,noitalics]<#[fg=colour247,bg=colour236] %Y-%m-%d < %H:%M #[fg=colour252,bg=colour236,nobold,nounderscore,noitalics]<#[fg=colour235,bg=colour252] #h " -setw -g window-status-format "#[fg=colour244,bg=colour234] #I <#[fg=colour250,bg=colour234] #W " -setw -g window-status-current-format "#[fg=colour234,bg=colour31,nobold,nounderscore,noitalics]>#[fg=colour117,bg=colour31] #I >#[fg=colour231,bg=colour31,bold] #W #[fg=colour31,bg=colour234,nobold,nounderscore,noitalics]>" - +setw -g window-status-bg "colour235" +set -g status-left "#[fg=colour230,bg=colour33] #S " +set -g status-right "#[fg=colour245,bg=colour239] %Y-%m-%d %H:%M #[fg=colour235,bg=colour244] #h " +setw -g window-status-format "#[fg=colour245,bg=colour235] #I #[fg=colour245,bg=colour235] #W " +setw -g window-status-current-format "#[fg=colour230,bg=colour239] #I #[fg=colour230,bg=colour239] #W " diff --git a/vimrc b/vimrc index df330ca..5cef276 100644 --- a/vimrc +++ b/vimrc @@ -42,7 +42,7 @@ NeoBundle 'rking/ag.vim' NeoBundle 'christoomey/vim-tmux-navigator' -NeoBundle 'vim-airline' +NeoBundle 'itchyny/lightline.vim' NeoBundle 'chriskempson/base16-vim' NeoBundle 'scrooloose/syntastic.git' @@ -247,12 +247,20 @@ endif let g:syntastic_javascript_checkers = ['jshint','jscs'] let g:syntastic_check_on_open = 1 -"" ariline -let g:airline_theme = 'bubblegum' -let g:airline_left_sep = '»' -let g:airline_right_sep = '«' -let g:airline_enable_syntastic = 1 -let g:airline#extensions#tabline#enabled = 1 +"" lightline +let g:lightline = { +\ 'colorscheme': 'solarized', +\ 'active': { +\ 'left': [ [ 'mode', 'paste' ], +\ [ 'fugitive', 'readonly', 'filename', 'modified' ] ] +\ }, +\ 'component': { +\ 'fugitive': '%{exists("*fugitive#head")?fugitive#head():""}' +\ }, +\ 'component_visible_condition': { +\ 'fugitive': '(exists("*fugitive#head") && ""!=fugitive#head())' +\ } +\} "" NERDTree configuration nmap n :NERDTreeToggle