From c1fb0b3326f64d97ade3fe9c549eab51889b186d Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Sat, 3 Sep 2022 05:32:06 +0000 Subject: [PATCH] Update dotfiles/.vim/colors/themer.vim, dotfiles/.vimrc --- dotfiles/.vim/colors/themer.vim | 258 ++++++++++++++++++++++++++++++++ dotfiles/.vimrc | 50 +++++++ 2 files changed, 308 insertions(+) create mode 100644 dotfiles/.vim/colors/themer.vim create mode 100644 dotfiles/.vimrc diff --git a/dotfiles/.vim/colors/themer.vim b/dotfiles/.vim/colors/themer.vim new file mode 100644 index 00000000..cf3eb4fe --- /dev/null +++ b/dotfiles/.vim/colors/themer.vim @@ -0,0 +1,258 @@ + + + + if &background == 'dark' + + let s:guishade0 = "#222323" + let s:guishade1 = "#3d3e3e" + let s:guishade2 = "#575858" + let s:guishade3 = "#727373" + let s:guishade4 = "#8d8d8d" + let s:guishade5 = "#a8a8a8" + let s:guishade6 = "#c2c2c2" + let s:guishade7 = "#dddddd" + let s:guiaccent0 = "#ff5257" + let s:guiaccent1 = "#f7821c" + let s:guiaccent2 = "#fbb927" + let s:guiaccent3 = "#62ba46" + let s:guiaccent4 = "#00c7a3" + let s:guiaccent5 = "#007aff" + let s:guiaccent6 = "#a550a7" + let s:guiaccent7 = "#f74f9e" + let s:ctermshade0 = 235 + let s:ctermshade1 = 237 + let s:ctermshade2 = 240 + let s:ctermshade3 = 243 + let s:ctermshade4 = 245 + let s:ctermshade5 = 248 + let s:ctermshade6 = 251 + let s:ctermshade7 = 253 + let s:ctermaccent0 = 210 + let s:ctermaccent1 = 215 + let s:ctermaccent2 = 221 + let s:ctermaccent3 = 113 + let s:ctermaccent4 = 43 + let s:ctermaccent5 = 33 + let s:ctermaccent6 = 139 + let s:ctermaccent7 = 211 + + endif + + + + if &background == 'light' + + let s:guishade0 = "#ffffff" + let s:guishade1 = "#e0e0e0" + let s:guishade2 = "#c1c1c1" + let s:guishade3 = "#a2a2a2" + let s:guishade4 = "#848484" + let s:guishade5 = "#656565" + let s:guishade6 = "#464646" + let s:guishade7 = "#272727" + let s:guiaccent0 = "#e0383e" + let s:guiaccent1 = "#f7821c" + let s:guiaccent2 = "#fbb927" + let s:guiaccent3 = "#62ba46" + let s:guiaccent4 = "#10b9a6" + let s:guiaccent5 = "#007aff" + let s:guiaccent6 = "#953d96" + let s:guiaccent7 = "#f74f9e" + let s:ctermshade0 = 231 + let s:ctermshade1 = 254 + let s:ctermshade2 = 250 + let s:ctermshade3 = 247 + let s:ctermshade4 = 244 + let s:ctermshade5 = 102 + let s:ctermshade6 = 238 + let s:ctermshade7 = 235 + let s:ctermaccent0 = 167 + let s:ctermaccent1 = 215 + let s:ctermaccent2 = 221 + let s:ctermaccent3 = 113 + let s:ctermaccent4 = 43 + let s:ctermaccent5 = 33 + let s:ctermaccent6 = 133 + let s:ctermaccent7 = 211 + + endif + + + highlight clear + syntax reset + let g:colors_name = "ThemerVim" + + """""""""" + " Normal " + """""""""" + + exec "hi Normal guifg=".s:guishade6." guibg=".s:guishade0 + exec "hi Normal ctermfg=".s:ctermshade6." ctermbg=".s:ctermshade0 + + """"""""""""""""" + " Syntax groups " + """"""""""""""""" + + " Default + + exec "hi Comment guifg=".s:guishade2 + exec "hi Comment ctermfg=".s:ctermshade2 + exec "hi Constant guifg=".s:guiaccent3 + exec "hi Constant ctermfg=".s:ctermaccent3 + exec "hi Character guifg=".s:guiaccent4 + exec "hi Character ctermfg=".s:ctermaccent4 + exec "hi Identifier guifg=".s:guiaccent2." gui=none" + exec "hi Identifier ctermfg=".s:ctermaccent2." cterm=none" + exec "hi Statement guifg=".s:guiaccent5 + exec "hi Statement ctermfg=".s:ctermaccent5 + exec "hi PreProc guifg=".s:guiaccent6 + exec "hi PreProc ctermfg=".s:ctermaccent6 + exec "hi Type guifg=".s:guiaccent7 + exec "hi Type ctermfg=".s:ctermaccent7 + exec "hi Special guifg=".s:guiaccent4 + exec "hi Special ctermfg=".s:ctermaccent4 + exec "hi Underlined guifg=".s:guiaccent5 + exec "hi Underlined ctermfg=".s:ctermaccent5 + exec "hi Error guifg=".s:guiaccent0." guibg=".s:guishade1 + exec "hi Error ctermfg=".s:ctermaccent0." ctermbg=".s:ctermshade1 + exec "hi Todo guifg=".s:guiaccent0." guibg=".s:guishade1 + exec "hi Todo ctermfg=".s:ctermaccent0." ctermbg=".s:ctermshade1 + exec "hi Function guifg=".s:guiaccent1 + exec "hi Function ctermfg=".s:ctermaccent1 + + " GitGutter + + exec "hi GitGutterAdd guifg=".s:guiaccent3 + exec "hi GitGutterAdd ctermfg=".s:ctermaccent3 + exec "hi GitGutterChange guifg=".s:guiaccent2 + exec "hi GitGutterChange ctermfg=".s:ctermaccent2 + exec "hi GitGutterChangeDelete guifg=".s:guiaccent2 + exec "hi GitGutterChangeDelete ctermfg=".s:ctermaccent2 + exec "hi GitGutterDelete guifg=".s:guiaccent0 + exec "hi GitGutterDelete ctermfg=".s:ctermaccent0 + + " fugitive + + exec "hi gitcommitComment guifg=".s:guishade3 + exec "hi gitcommitComment ctermfg=".s:ctermshade3 + exec "hi gitcommitOnBranch guifg=".s:guishade3 + exec "hi gitcommitOnBranch ctermfg=".s:ctermshade3 + exec "hi gitcommitHeader guifg=".s:guishade5 + exec "hi gitcommitHeader ctermfg=".s:ctermshade5 + exec "hi gitcommitHead guifg=".s:guishade3 + exec "hi gitcommitHead ctermfg=".s:ctermshade3 + exec "hi gitcommitSelectedType guifg=".s:guiaccent3 + exec "hi gitcommitSelectedType ctermfg=".s:ctermaccent3 + exec "hi gitcommitSelectedFile guifg=".s:guiaccent3 + exec "hi gitcommitSelectedFile ctermfg=".s:ctermaccent3 + exec "hi gitcommitDiscardedType guifg=".s:guiaccent2 + exec "hi gitcommitDiscardedType ctermfg=".s:ctermaccent2 + exec "hi gitcommitDiscardedFile guifg=".s:guiaccent2 + exec "hi gitcommitDiscardedFile ctermfg=".s:ctermaccent2 + exec "hi gitcommitUntrackedFile guifg=".s:guiaccent0 + exec "hi gitcommitUntrackedFile ctermfg=".s:ctermaccent0 + + """"""""""""""""""""""" + " Highlighting Groups " + """"""""""""""""""""""" + + " Default + + exec "hi ColorColumn guibg=".s:guishade1 + exec "hi ColorColumn ctermbg=".s:ctermshade1 + exec "hi Conceal guifg=".s:guishade2 + exec "hi Conceal ctermfg=".s:ctermshade2 + exec "hi Cursor guifg=".s:guishade0 + exec "hi Cursor ctermfg=".s:ctermshade0 + exec "hi CursorColumn guibg=".s:guishade1 + exec "hi CursorColumn ctermbg=".s:ctermshade1 + exec "hi CursorLine guibg=".s:guishade1 + exec "hi CursorLine ctermbg=".s:ctermshade1." cterm=none" + exec "hi Directory guifg=".s:guiaccent5 + exec "hi Directory ctermfg=".s:ctermaccent5 + exec "hi DiffAdd guifg=".s:guiaccent3." guibg=".s:guishade1 + exec "hi DiffAdd ctermfg=".s:ctermaccent3." ctermbg=".s:ctermshade1 + exec "hi DiffChange guifg=".s:guiaccent2." guibg=".s:guishade1 + exec "hi DiffChange ctermfg=".s:ctermaccent2." ctermbg=".s:ctermshade1 + exec "hi DiffDelete guifg=".s:guiaccent0." guibg=".s:guishade1 + exec "hi DiffDelete ctermfg=".s:ctermaccent0." ctermbg=".s:ctermshade1 + exec "hi DiffText guifg=".s:guiaccent2." guibg=".s:guishade2 + exec "hi DiffText ctermfg=".s:ctermaccent2." ctermbg=".s:ctermshade2 + exec "hi ErrorMsg guifg=".s:guishade7." guibg=".s:guiaccent0 + exec "hi ErrorMsg ctermfg=".s:ctermshade7." ctermbg=".s:ctermaccent0 + exec "hi VertSplit guifg=".s:guishade0." guibg=".s:guishade3 + exec "hi VertSplit ctermfg=".s:ctermshade0." ctermbg=".s:ctermshade3 + exec "hi Folded guifg=".s:guishade4." guibg=".s:guishade1 + exec "hi Folded ctermfg=".s:ctermshade4." ctermbg=".s:ctermshade1 + exec "hi FoldColumn guifg=".s:guishade4." guibg=".s:guishade1 + exec "hi FoldColumn ctermfg=".s:ctermshade4." ctermbg=".s:ctermshade1 + exec "hi SignColumn guibg=".s:guishade0 + exec "hi SignColumn ctermbg=".s:ctermshade0 + exec "hi IncSearch guifg=".s:guishade0." guibg=".s:guiaccent2 + exec "hi IncSearch ctermfg=".s:ctermshade0." ctermbg=".s:ctermaccent2 + exec "hi LineNr guifg=".s:guishade2." guibg=".s:guishade0 + exec "hi LineNr ctermfg=".s:ctermshade2." ctermbg=".s:ctermshade0 + exec "hi CursorLineNr guifg=".s:guishade3." guibg=".s:guishade1 + exec "hi CursorLineNr ctermfg=".s:ctermshade3." ctermbg=".s:ctermshade1 + exec "hi MatchParen guibg=".s:guishade2 + exec "hi MatchParen ctermbg=".s:ctermshade2 + exec "hi MoreMsg guifg=".s:guishade0." guibg=".s:guiaccent4 + exec "hi MoreMsg ctermfg=".s:ctermshade0." ctermbg=".s:ctermaccent4 + exec "hi NonText guifg=".s:guishade2." guibg=".s:guishade0 + exec "hi NonText ctermfg=".s:ctermshade2." ctermbg=".s:ctermshade0 + exec "hi Pmenu guifg=".s:guishade6." guibg=".s:guishade1 + exec "hi Pmenu ctermfg=".s:ctermshade6." ctermbg=".s:ctermshade1 + exec "hi PmenuSel guifg=".s:guiaccent4." guibg=".s:guishade1 + exec "hi PmenuSel ctermfg=".s:ctermaccent4." ctermbg=".s:ctermshade1 + exec "hi PmenuSbar guifg=".s:guiaccent3." guibg=".s:guishade1 + exec "hi PmenuSbar ctermfg=".s:ctermaccent3." ctermbg=".s:ctermshade1 + exec "hi PmenuThumb guifg=".s:guiaccent0." guibg=".s:guishade2 + exec "hi PmenuThumb ctermfg=".s:ctermaccent0." ctermbg=".s:ctermshade2 + exec "hi Question guifg=".s:guishade7." guibg=".s:guishade1 + exec "hi Question ctermfg=".s:ctermshade7." ctermbg=".s:ctermshade1 + exec "hi Search guifg=".s:guishade0." guibg=".s:guiaccent2 + exec "hi Search ctermfg=".s:ctermshade0." ctermbg=".s:ctermaccent2 + exec "hi SpecialKey guifg=".s:guiaccent7." guibg=".s:guishade0 + exec "hi SpecialKey ctermfg=".s:ctermaccent7." ctermbg=".s:ctermshade0 + exec "hi SpellBad guifg=".s:guiaccent0 + exec "hi SpellBad ctermfg=".s:ctermaccent0." ctermbg=NONE cterm=undercurl" + exec "hi SpellCap guifg=".s:guiaccent2 + exec "hi SpellCap ctermfg=".s:ctermaccent2." ctermbg=NONE cterm=undercurl" + exec "hi SpellLocal guifg=".s:guiaccent4 + exec "hi SpellLocal ctermfg=".s:ctermaccent4 + exec "hi SpellRare guifg=".s:guiaccent1 + exec "hi SpellRare ctermfg=".s:ctermaccent1 + exec "hi StatusLine guifg=".s:guishade4." guibg=".s:guishade1." gui=none" + exec "hi StatusLine ctermfg=".s:ctermshade4." ctermbg=".s:ctermshade1." cterm=none" + exec "hi TabLine guifg=".s:guishade5." guibg=".s:guishade1 + exec "hi TabLine ctermfg=".s:ctermshade5." ctermbg=".s:ctermshade1 + exec "hi TabLineFill guibg=".s:guishade1 + exec "hi TabLineFill ctermbg=".s:ctermshade1 + exec "hi TabLineSel guifg=".s:guishade6." guibg=".s:guishade0 + exec "hi TabLineSel ctermfg=".s:ctermshade6." ctermbg=".s:ctermshade0 + exec "hi Title guifg=".s:guiaccent5 + exec "hi Title ctermfg=".s:ctermaccent5 + exec "hi Visual guibg=".s:guishade1 + exec "hi Visual ctermbg=".s:ctermshade1 + exec "hi VisualNOS guifg=".s:guiaccent0." guibg=".s:guishade1 + exec "hi VisualNOS ctermfg=".s:ctermaccent0." ctermbg=".s:ctermshade1 + exec "hi WarningMsg guifg=".s:guiaccent0 + exec "hi WarningMsg ctermfg=".s:ctermaccent0 + exec "hi WildMenu guifg=".s:guiaccent4." guibg=".s:guishade1 + exec "hi WildMenu ctermfg=".s:ctermaccent4." ctermbg=".s:ctermshade1 + + " NERDTree + + exec "hi NERDTreeExecFile guifg=".s:guiaccent4 + exec "hi NERDTreeExecFile ctermfg=".s:ctermaccent4 + exec "hi NERDTreeDirSlash guifg=".s:guiaccent5 + exec "hi NERDTreeDirSlash ctermfg=".s:ctermaccent5 + exec "hi NERDTreeCWD guifg=".s:guiaccent0 + exec "hi NERDTreeCWD ctermfg=".s:ctermaccent0 + + """""""""""" + " Clean up " + """""""""""" + + unlet s:guishade0 s:guishade1 s:guishade2 s:guishade3 s:guishade4 s:guishade5 s:guishade6 s:guishade7 s:guiaccent0 s:guiaccent1 s:guiaccent2 s:guiaccent3 s:guiaccent4 s:guiaccent5 s:guiaccent6 s:guiaccent7 + unlet s:ctermshade0 s:ctermshade1 s:ctermshade2 s:ctermshade3 s:ctermshade4 s:ctermshade5 s:ctermshade6 s:ctermshade7 s:ctermaccent0 s:ctermaccent1 s:ctermaccent2 s:ctermaccent3 s:ctermaccent4 s:ctermaccent5 s:ctermaccent6 s:ctermaccent7 diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc new file mode 100644 index 00000000..98388770 --- /dev/null +++ b/dotfiles/.vimrc @@ -0,0 +1,50 @@ +call plug#begin() +Plug 'https://github.com/leafgarland/typescript-vim.git' +Plug 'https://github.com/altercation/vim-colors-solarized.git' +Plug 'https://github.com/vim-airline/vim-airline.git' +Plug 'https://github.com/itchyny/lightline.vim.git' +Plug 'https://github.com/pangloss/vim-javascript.git' +Plug 'https://github.com/mxw/vim-jsx.git' +Plug 'https://github.com/plasticboy/vim-markdown.git' +Plug 'https://github.com/ekalinin/dockerfile.vim.git' +Plug 'https://github.com/stanangeloff/php.vim.git' +Plug 'https://github.com/hdima/python-syntax.git' +Plug 'https://github.com/scrooloose/nerdtree.git' +Plug 'https://github.com/tpope/vim-fugitive.git' +Plug 'https://github.com/prettier/vim-prettier.git' +Plug 'https://github.com/tpope/vim-sensible.git' +Plug 'https://github.com/editorconfig/editorconfig-vim.git' +Plug 'https://github.com/airblade/vim-gitgutter.git' +Plug 'https://github.com/tpope/vim-surround.git' +Plug 'https://github.com/kristijanhusak/vim-carbon-now-sh.git' +Plug 'https://github.com/terryma/vim-multiple-cursors.git' +Plug 'https://github.com/dense-analysis/ale.git' +Plug 'https://github.com/junegunn/fzf.git' +Plug 'https://github.com/junegunn/fzf.vim.git' +Plug 'https://github.com/neoclide/coc.nvim.git', {'branch': 'release'} +Plug 'https://github.com/vim-syntastic/syntastic.git' +Plug 'https://github.com/ryanoasis/vim-devicons.git' +Plug 'https://github.com/nanotee/zoxide.vim.git' +Plug 'https://github.com/fatih/vim-go.git' +Plug 'https://github.com/ycm-core/YouCompleteMe.git' +Plug 'https://github.com/pearofducks/ansible-vim.git', {'do': './UltiSnips/generate.sh'} + +" Settings for plugin https://github.com/altercation/vim-colors-solarized.git +syntax enable +set background=dark +colorscheme themer + +" Settings for plugin https://github.com/neoclide/coc.nvim.git +autocmd FileType json syntax match Comment +\/\/.\+$+ + +" Settings for plugin https://github.com/vim-syntastic/syntastic.git +set statusline+=%#warningmsg# +set statusline+=%{SyntasticStatuslineFlag()} +set statusline+=%* +let g:syntastic_always_populate_loc_list = 1 +let g:syntastic_auto_loc_list = 1 +let g:syntastic_check_on_open = 1 +let g:syntastic_check_on_wq = 0 + +" Settings for plugin https://github.com/ryanoasis/vim-devicons.git +set encoding=UTF-8