diff --git a/tmux.conf b/tmux.conf index b4798ba..25861de 100644 --- a/tmux.conf +++ b/tmux.conf @@ -29,7 +29,7 @@ set -g escape-time "0" set -g history-limit "10000" set -g status-left-length "20" set -g status-right-length "40" -set -g default-terminal "screen" +set -g default-terminal "tmux-256color" set -g status-position "bottom" set -g status-justify "left" set -g status-left-length "100" @@ -48,6 +48,3 @@ setw -g window-status-bg "colour7" setw -g window-status-current-format "#[fg=colour8,bg=colour7,underscore]#I #W#[default] " set -g status-left "#[fg=colour15,bg=colour4,bold] #h #[fg=colour4,bg=colour12,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour12] #S #[fg=colour12,bg=colour7,nobold,nounderscore,noitalics]#[default] " set -g status-right " #[fg=colour12,bg=colour7,nobold,nounderscore,noitalics]#[fg=colour15,bg=colour12] %a %e #[fg=colour10,bg=colour12,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour10] %k:%M " -new-session -s "0-default" -new-session -s "1-vim&git" -new-session -s "2-ssh" diff --git a/vimplugins b/vimplugins index ace24db..6cc44a9 100644 --- a/vimplugins +++ b/vimplugins @@ -16,10 +16,12 @@ Plug 'vdrandom/vim-tru-typewriter' Plug 'vim-scripts/directionalWindowResizer' " colorschemes +Plug 'jonathanfilip/vim-lucius' Plug 'lifepillar/vim-solarized8' Plug 'lifepillar/vim-gruvbox8' Plug 'lifepillar/vim-wwdc17-theme' Plug 'nanotech/jellybeans.vim' +Plug 'tomasr/molokai' Plug 'whatyouhide/vim-gotham' " syntax highlight plugins @@ -38,3 +40,16 @@ let g:signify_sign_change = '~' " easy-align options xmap a (EasyAlign) nmap a (EasyAlign) + +" we have themes installed, so we use them! +if &term =~ '^[tmux|st]' && v:version >= 800 + let &t_8f = "\[38;2;%lu;%lu;%lum" + let &t_8b = "\[48;2;%lu;%lu;%lum" + set termguicolors bg=dark + colorscheme gruvbox8 +else + set bg=light + let g:solarized_use16 = 1 + let g:solarized_term_italics = 0 + colorscheme solarized8 +endif diff --git a/vimrc b/vimrc index 13fa345..e1c0e94 100644 --- a/vimrc +++ b/vimrc @@ -1,6 +1,5 @@ " various settings -set nobackup nomodeline backspace=indent,eol,start foldmethod=marker mouse= -set cursorline bg=light +set nobackup nomodeline backspace=indent,eol,start foldmethod=marker mouse= cursorline " hidden characters set list listchars=tab:\|_,nbsp:x,trail:* " search @@ -23,8 +22,6 @@ if v:version >= 703 set colorcolumn=80 relativenumber formatoptions+=j ttymouse=sgr endif if v:version >= 800 - let &t_8f = "\[38;2;%lu;%lu;%lum" - let &t_8b = "\[48;2;%lu;%lu;%lum" set breakindent endif @@ -75,14 +72,13 @@ fun! s:ToggleMouse() endfunction noremap m :call ToggleMouse() +colorscheme default + " plugins let plugins = expand("$HOME/.vimplugins") if filereadable(plugins) && v:version >= 703 execute 'source ' . fnameescape(plugins) endif -let g:solarized_use16 = 1 -let g:solarized_term_italics = 0 -colorscheme solarized8 syntax on filetype plugin on