diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 1746586..ccd54ea 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -117,9 +117,9 @@ Plug 'vim-airline/vim-airline-themes' Plug 'edkolev/tmuxline.vim' " Colorschemes -Plug 'morhetz/gruvbox' -Plug 'rakr/vim-one' +Plug 'rafi/awesome-vim-colorschemes' Plug 'reedes/vim-colors-pencil' +Plug 'rakr/vim-togglebg' call plug#end() endif @@ -424,7 +424,7 @@ let g:ale_linters = { " PLUGIN: AIRLINE " PLUGIN: TMUXLINE let g:airline_powerline_fonts=1 -let g:airline_theme='raven' +" let g:airline_theme='raven' " Enable italics for colorschemes that support them let g:gruvbox_italic=1 @@ -437,7 +437,7 @@ colorscheme one " disable automatically refreshing the mux statusbar since it breaks tmux " prefix highlighting. Instead, when changing vim statusbar just create " snapshot with :TmuxlineSnapshot file and stick it into tmux config manually -let g:airline#extensions#tmuxline#enabled = 0 +let g:airline#extensions#tmuxline#enabled = 1 " custom preset with left-justified window list let g:tmuxline_preset = { \'a' : '#S', @@ -445,7 +445,7 @@ let g:tmuxline_preset = { \'c' : '#I:#P', \'win' : '#I #W', \'cwin' : [' ', '#I #W'], - \'x' : '#{prefix_highlight} %H:%M:%S', + \'x' : '#{?client_prefix,#[fg=colour232]#[bg=brightblue],} %H:%M:%S', \'y' : '%d-%b-%y', \'z' : '#H', \'options' : {}} @@ -667,6 +667,11 @@ noremap N :NV! " FZF git diff noremap gd :FzfGFiles? +" FZF colorschemes +nnoremap :FzfColors +" Toggle background light/dark +call togglebg#map("") + " Mostly dealing with Prose writing from here on out " Format current Paragraph (esp useful in prose writing) nnoremap q gqap diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 4a06f67..66f1b37 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -51,7 +51,6 @@ set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q' set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'tmux-plugins/tmux-yank' -set -g @plugin 'tmux-plugins/tmux-prefix-highlight' set -g @plugin 'Morantron/tmux-fingers' set -g @plugin 'christoomey/vim-tmux-navigator' set -g @plugin 'tmux-plugins/tmux-resurrect' @@ -154,7 +153,7 @@ setw -g window-status-style fg="#c8c8c8",bg="#2e2e2e","none" setw -g window-status-activity-style bg="#2e2e2e",fg="#c8c8c8","underscore" setw -g window-status-separator "" set -g status-left "#[fg=#c8c8c8,bg=#2e2e2e] #S #[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics]#[fg=#c8c8c8,bg=#2e2e2e] #(whoami) #[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics]#[fg=#c8c8c8,bg=#2e2e2e] #I:#P #[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics]" -set -g status-right "#[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics]#{prefix_highlight} #[fg=#c8c8c8,bg=#2e2e2e] %H:%M:%S #[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics]#[fg=#c8c8c8,bg=#2e2e2e] %d-%b-%y #[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics]#[fg=#c8c8c8,bg=#2e2e2e] #H " +set -g status-right "#[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics] #[fg=#c8c8c8,bg=#2e2e2e] #{?client_prefix,#[fg=colour232]#[bg=brightblue],} %H:%M:%S #[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics]#[fg=#c8c8c8,bg=#2e2e2e] %d-%b-%y #[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics]#[fg=#c8c8c8,bg=#2e2e2e] #H " setw -g window-status-format "#[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics]#[default] #I #W #[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics]" setw -g window-status-current-format "#[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics]#[fg=#c8c8c8,bg=#2e2e2e]  #I #W #[fg=#2e2e2e,bg=#2e2e2e,nobold,nounderscore,noitalics]"