switching to papercolor

ninrod · Feb 20, 2016 · 5129e60 · 5129e60
1 parent 5d50ebf
commit 5129e60
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 40 deletions.
diff --git a/dot/.tmux.conf b/dot/.tmux.conf
@@ -93,32 +93,31 @@ setw -g window-status-current-format '[#I.#W]'
 
 # Theme Settings {{{
 
-# Solarized dark Theme
-
-# default statusbar colors
-set-option -g status-bg black #base02
-set-option -g status-fg yellow #yellow
+# #### THEME (PaperColor)
+# # default statusbar colors
+set-option -g status-bg "#DCDCDC"
+set-option -g status-fg colour238
 set-option -g status-attr default
 
-# default window title colors
-set-window-option -g window-status-fg brightblue #base0
+# # default window title colors
+set-window-option -g window-status-fg default
 set-window-option -g window-status-bg default
-#set-window-option -g window-status-attr dim
+set-window-option -g window-status-attr dim
 
-# active window title colors
-set-window-option -g window-status-current-fg brightred #orange
+# # active window title colors
 set-window-option -g window-status-current-bg default
-#set-window-option -g window-status-current-attr bright
+set-window-option -g window-status-current-fg colour160
+set-window-option -g window-status-current-attr bright
 
-# pane border
+# # pane border
 set-option -g pane-border-fg black #base02
-set-option -g pane-active-border-fg brightgreen #base01
+set-option -g pane-active-border-fg brightblue
 
-# message text
-set-option -g message-bg black #base02
-set-option -g message-fg brightred #orange
+# # message text
+set-option -g message-bg "#DCDCDC"
+set-option -g message-fg red
 
-# pane number display
+# # pane number display
 set-option -g display-panes-active-colour blue #blue
 set-option -g display-panes-colour brightred #orange
 

diff --git a/dot/.vimrc b/dot/.vimrc
@@ -167,13 +167,13 @@ Plug 'tpope/vim-unimpaired', {'commit': '23f471a'}
 
 " plugins: cosmetic {{{
 
-Plug 'altercation/vim-colors-solarized', {'commit': '528a59f'}
+" Plug 'altercation/vim-colors-solarized', {'commit': '528a59f'}
 Plug 'sjl/vitality.vim', {'commit': '4bb8c07'}
 Plug 'kshenoy/vim-signature', {'commit': '7cabfb5'}
 
 " Plug 'luochen1990/rainbow', {'commit': '18b7bc1'}
 " Plug 'Yggdroot/indentLine', {'commit': '9cb94e1'}
-" Plug 'NLKNguyen/papercolor-theme', {'commit': 'd3c8c8f'}
+Plug 'NLKNguyen/papercolor-theme', {'commit': 'd3c8c8f'}
 " Plug 'vim-airline/vim-airline', {'commit': '8af213d'} | Plug 'vim-airline/vim-airline-themes', {'commit': 'cf5b990'}
 
 " }}}
@@ -267,18 +267,18 @@ let g:signify_vcs_list = ['git']
 let g:bufExplorerDisableDefaultKeyMapping=1
 
 " Solarized Dark Theme
-set background=dark
-let g:solarized_bold=1
-let g:solarized_underline=0
-let g:solarized_visibility="high"
-let g:solarized_contrast="high"
-let g:solarized_diffmode="high"
-let g:solarized_termcolors=16
-colorscheme solarized
+" set background=dark
+" let g:solarized_bold=1
+" let g:solarized_underline=0
+" let g:solarized_visibility="high"
+" let g:solarized_contrast="high"
+" let g:solarized_diffmode="high"
+" let g:solarized_termcolors=16
+" colorscheme solarized
 
 " papercolor theme
-" set background=light
-" colorscheme PaperColor
+set background=light
+colorscheme PaperColor
 
 " vim-commentary: disabling double backslash
 let g:commentary_map_backslash=0

diff --git a/dot/.zshrc b/dot/.zshrc
@@ -43,18 +43,18 @@ WORDCHARS='*?_-.[]~=&;!#$%^(){}<>'
 # powerlevel9k {{{
 
 # main config
-# POWERLEVEL9K_DISABLE_RPROMPT=false
-# POWERLEVEL9K_SHORTEN_DIR_LENGTH=1
-# POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir vcs)
-# POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status vi_mode)
-# POWERLEVEL9K_STATUS_VERBOSE=false
+POWERLEVEL9K_DISABLE_RPROMPT=false
+POWERLEVEL9K_SHORTEN_DIR_LENGTH=1
+POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir vcs)
+POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status vi_mode)
+POWERLEVEL9K_STATUS_VERBOSE=false
 
 # make powerlevel9k compatible with papercolor theme
-# POWERLEVEL9K_COLOR_SCHEME='light'
-# POWERLEVEL9K_VI_MODE_INSERT_BACKGROUND='253' #green
-# POWERLEVEL9K_VI_MODE_INSERT_FOREGROUND='238' #almost black
-# POWERLEVEL9K_VI_MODE_NORMAL_BACKGROUND='253' #grey
-# POWERLEVEL9K_VI_MODE_NORMAL_FOREGROUND='160' #red
+POWERLEVEL9K_COLOR_SCHEME='light'
+POWERLEVEL9K_VI_MODE_INSERT_BACKGROUND='253' #green
+POWERLEVEL9K_VI_MODE_INSERT_FOREGROUND='238' #almost black
+POWERLEVEL9K_VI_MODE_NORMAL_BACKGROUND='253' #grey
+POWERLEVEL9K_VI_MODE_NORMAL_FOREGROUND='160' #red
 
 # }}}
 
@@ -87,12 +87,13 @@ source ~/.zplug/zplug
 
 zplug "zsh-users/zsh-completions"
 zplug "felixr/docker-zsh-completion", if:"which docker", of:_docker
+zplug "plugins/git", from:oh-my-zsh, if:"which git"
 
 # }}}
 
 # theme and appearance {{{
 
-# zplug "bhilburn/powerlevel9k", of:powerlevel9k.zsh-theme
+zplug "bhilburn/powerlevel9k", of:powerlevel9k.zsh-theme
 zplug "zsh-users/zsh-syntax-highlighting", nice:10
 zplug "ninrod/nin-vi-mode"