michael/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow vim theme value to be set in a private vimrc

Browse Source
This commit is contained in:
Michael Campagnaro 2020-06-10 11:40:12 -04:00
parent 0f25624066
commit e215b5ffdb
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
vimrc
View File

@ -16,10 +16,6 @@
" "
"################################################################################################### "###################################################################################################
" Remove Menubar and Toolbar from gvim
"set guioptions -=m
"set guioptions -=T
scriptencoding utf-8 scriptencoding utf-8
set encoding=utf-8 fileencoding=utf-8 fileencodings=ucs-bom,utf8,prc set encoding=utf-8 fileencoding=utf-8 fileencodings=ucs-bom,utf8,prc
set nocompatible set nocompatible
@ -29,6 +25,7 @@ filetype off
" different platforms " different platforms
let s:uname = system("echo -n \"$(uname)\"") let s:uname = system("echo -n \"$(uname)\"")
let s:vim_dir = $HOME . "/.vim" let s:vim_dir = $HOME . "/.vim"
let mapleader=","
function! IsWindows() function! IsWindows()
if s:uname =~ "mingw" || s:uname =~ "msys" if s:uname =~ "mingw" || s:uname =~ "msys"
@ -37,8 +34,22 @@ function! IsWindows()
return 0 return 0
endfunction endfunction
let mapleader="," "--------------------------------------------
" Colors
"--------------------------------------------
let g:campo_dark_theme = 'campo-simple-dark'
"let g:campo_dark_theme = 'campo-dark-blue'
"let g:campo_dark_theme = 'campo-dark-grey-blue'
"let g:campo_dark_theme = 'campo-dark-greyscale'
let g:campo_light_theme = 'campo-simple-light'
"let g:campo_light_theme = 'campo-light'
let g:campo_theme_use_rainbow_parens = 1
"--------------------------------------------
" You can further customize things in a private vimrc. I use this
" for things that I don't want included in my public dotfiles repo.
source ~/.vimrc.private source ~/.vimrc.private
"################################################################ "################################################################
@ -52,7 +63,7 @@ source ~/.vimrc.private
let s:max_line_length = 100 let s:max_line_length = 100
let g:quickfix_window_height = 16 " in rows let g:quickfix_window_height = 16 " in rows
" Start vim with the dark theme. Set to 'light' for the light theme. " Start vim with the dark theme. Set to 'light' for the light theme.
" To change the themes see `s:dark_theme` and `s:light_theme`. " To change the themes see `g:campo_dark_theme` and `g:campo_light_theme`.
let s:default_bg = 'dark' let s:default_bg = 'dark'
let s:rainbow_theme = s:default_bg let s:rainbow_theme = s:default_bg
@ -221,6 +232,10 @@ set numberwidth=5
set showtabline=2 set showtabline=2
set winwidth=79 set winwidth=79
" Remove gvim Menubar and Toolbar
"set guioptions -=m
"set guioptions -=T
" @warning: This must come AFTER `set ignorecase smartcase` otherwise vim spews out a ton of errors. No idea why! " @warning: This must come AFTER `set ignorecase smartcase` otherwise vim spews out a ton of errors. No idea why!
if IsWindows() if IsWindows()
" Just assume we don't have a zsh shell " Just assume we don't have a zsh shell
@ -320,7 +335,7 @@ augroup campoCmds
" Auto reload VIM when settings changed. " Auto reload VIM when settings changed.
autocmd BufWritePost .vimrc so $MYVIMRC autocmd BufWritePost .vimrc so $MYVIMRC
autocmd BufWritePost *.vim so $MYVIMRC autocmd BufWritePost *.vim so $MYVIMRC
autocmd BufWritePost vimrc.symlink so $MYVIMRC autocmd BufWritePost ~/.vimrc.private so $MYVIMRC
function! s:RunCtags() function! s:RunCtags()
" The ampersand at the end is to make this run in the background. I had to " The ampersand at the end is to make this run in the background. I had to
@ -381,6 +396,7 @@ nmap <leader>z <c-z>
" Open the vimrc file for editing / reload vimrc file. " Open the vimrc file for editing / reload vimrc file.
nmap <silent> <leader>ev :vsp $MYVIMRC<cr> nmap <silent> <leader>ev :vsp $MYVIMRC<cr>
nmap <silent> <leader>pv :vsp ~/.vimrc.private<cr>
nmap <silent> <leader>rv :so $MYVIMRC<cr> nmap <silent> <leader>rv :so $MYVIMRC<cr>
" Type %/ in the command bar to have it replaced with the current buffer's " Type %/ in the command bar to have it replaced with the current buffer's
@ -729,17 +745,8 @@ set statusline=%<%f\ (%{&ft})\ %-4(%m%)%=%-19(%3l,%02c%03V%)
" COLORS " COLORS
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
let g:campo_theme_use_rainbow_parens = 1 execute "autocmd ColorScheme " . g:campo_dark_theme . " call ReloadRainbow()"
"let s:dark_theme = 'campo-dark-blue' execute "autocmd ColorScheme " . g:campo_light_theme . " call ReloadRainbow()"
"let s:dark_theme = 'campo-dark-grey-blue'
"let s:dark_theme = 'campo-dark-greyscale'
let s:dark_theme = 'campo-simple-dark'
"let s:light_theme = 'campo-light'
let s:light_theme = 'campo-simple-light'
execute "autocmd ColorScheme " . s:dark_theme . " call ReloadRainbow()"
execute "autocmd ColorScheme " . s:light_theme . " call ReloadRainbow()"
" Switch between light and dark themes. " Switch between light and dark themes.
map <leader>l :call ChangeBgTheme('light', 0)<cr> map <leader>l :call ChangeBgTheme('light', 0)<cr>
@ -748,12 +755,12 @@ map <leader>ll :call ChangeBgTheme('dark', 0)<cr>
function! ChangeBgTheme(bg, onlySetTheme) function! ChangeBgTheme(bg, onlySetTheme)
if a:bg =~ 'light' if a:bg =~ 'light'
let s:rainbow_theme = 'light' let s:rainbow_theme = 'light'
let s:theme = s:light_theme let s:theme = g:campo_light_theme
exe 'colorscheme ' . s:theme exe 'colorscheme ' . s:theme
set background=light set background=light
else else
let s:rainbow_theme = 'dark' let s:rainbow_theme = 'dark'
let s:theme = s:dark_theme let s:theme = g:campo_dark_theme
" We have to set the theme twice in order to get its correct dark-theme colors. " We have to set the theme twice in order to get its correct dark-theme colors.
" Weird stuff. " Weird stuff.
exe 'colorscheme ' . s:theme exe 'colorscheme ' . s:theme