fiddle around with vim colors a bit

5 files changed, 137 insertions, 10 deletions

diff --git a/config/alacritty/alacritty.yml.hush b/config/alacritty/alacritty.yml.hush
index 1155bfa..5f7a5b8 100644
--- a/config/alacritty/alacritty.yml.hush
+++ b/config/alacritty/alacritty.yml.hush
@@ -1,4 +1,7 @@
 ---
+env:
+  TERM: alacritty-direct
+
 window:
   dimensions:
     columns: 80
diff --git a/vim/colors/local.vim b/vim/colors/local.vim
new file mode 100644
index 0000000..682f0f3
--- /dev/null
+++ b/vim/colors/local.vim
@@ -0,0 +1,124 @@
+highlight clear
+syntax reset
+set background=dark
+let g:colors_name = expand('<sfile>:t:r')
+
+let s:g = {
+    \"black":         "#000000",
+    \"red":           "#ed5f74",
+    \"green":         "#1ea672",
+    \"yellow":        "#d97917",
+    \"blue":          "#688ef1",
+    \"magenta":       "#c96ed0",
+    \"cyan":          "#3a97d4",
+    \"white":         "#e3e8ee",
+    \"brightblack":   "#697386",
+    \"brightred":     "#fbb5b2",
+    \"brightgreen":   "#85d996",
+    \"brightyellow":  "#efc078",
+    \"brightblue":    "#9fcdff",
+    \"brightmagenta": "#f0b4e4",
+    \"brightcyan":    "#7fd3ed",
+    \"brightwhite":   "#ffffff",
+    \"darkblack":     "#000000",
+    \"darkred":       "#742833",
+    \"darkgreen":     "#00643c",
+    \"darkyellow":    "#6e3500",
+    \"darkblue":      "#2c4074",
+    \"darkmagenta":   "#602864",
+    \"darkcyan":      "#144c71",
+    \"darkwhite":     "#3e4043",
+    \"darkerblue":    "#000034",
+\}
+
+let s:c = {
+    \"black":         "0",
+    \"red":           "1",
+    \"green":         "2",
+    \"yellow":        "3",
+    \"blue":          "4",
+    \"magenta":       "5",
+    \"cyan":          "6",
+    \"white":         "7",
+    \"brightblack":   "8",
+    \"brightred":     "9",
+    \"brightgreen":   "10",
+    \"brightyellow":  "11",
+    \"brightblue":    "12",
+    \"brightmagenta": "13",
+    \"brightcyan":    "14",
+    \"brightwhite":   "15",
+\}
+
+function s:hi(name, fg, bg)
+    if a:fg == ""
+        let ctermfg = ""
+        let guifg = ""
+    elseif a:fg =~ "^#"
+        let ctermfg = ""
+        let guifg = "guifg=" . a:fg
+    else
+        let ctermfg = "ctermfg=" . s:c[a:fg]
+        let guifg = "guifg=" . s:g[a:fg]
+    endif
+
+    if a:bg == ""
+        let ctermbg = ""
+        let guibg = ""
+    elseif a:bg =~ "^#"
+        let ctermbg = ""
+        let guibg = "guibg=" . a:bg
+    else
+        let ctermbg = "ctermbg=" . s:c[a:bg]
+        let guibg = "guibg=" . s:g[a:bg]
+    endif
+
+    silent exe "highlight clear " . a:name
+    if a:fg != "" || a:bg != ""
+        silent exe "highlight " . a:name . " " . ctermfg . " " . ctermbg . " " . guifg . " " . guibg
+    endif
+endfunction
+
+" text
+call <sid>hi("Comment", "brightblack", "")
+call <sid>hi("Constant", "red", "")
+call <sid>hi("Delimiter", "blue", "")
+call <sid>hi("Error", "black", "brightmagenta")
+call <sid>hi("Function", "brightcyan", "")
+call <sid>hi("Identifier", "", "")
+call <sid>hi("Include", "blue", "")
+call <sid>hi("Operator", "", "")
+call <sid>hi("PreProc", "magenta", "")
+call <sid>hi("Special", "magenta", "")
+call <sid>hi("SpecialKey", "magenta", "")
+call <sid>hi("Statement", "yellow", "")
+call <sid>hi("Title", "magenta", "")
+call <sid>hi("Todo", "black", "brightyellow")
+call <sid>hi("Type", "green", "")
+
+autocmd FileType markdown call <sid>hi("mkdListItem", "yellow", "")
+autocmd FileType perl call <sid>hi("Identifier", "brightcyan", "")
+autocmd FileType puppet call <sid>hi("puppetStringDelimiter", "red", "")
+autocmd FileType ruby call <sid>hi("rubyInterpolationDelimiter", "magenta", "")
+autocmd FileType ruby call <sid>hi("rubyPercentStringDelimiter", "yellow", "")
+autocmd FileType ruby call <sid>hi("rubyStringDelimiter", "red", "")
+autocmd FileType ruby call <sid>hi("rubyRegexDelimiter", "red", "")
+autocmd FileType sh call <sid>hi("shQuote", "red", "")
+autocmd FileType vim call <sid>hi("vimBracket", "magenta", "")
+autocmd FileType vim call <sid>hi("vimMapMod", "magenta", "")
+
+" ui
+call <sid>hi("DiffAdd", "", s:g["darkgreen"])
+call <sid>hi("DiffChange", "", s:g["darkblue"])
+call <sid>hi("DiffDelete", "", s:g["darkred"])
+call <sid>hi("DiffText", "", s:g["darkmagenta"])
+call <sid>hi("Folded", "brightgreen", s:g["darkgreen"])
+call <sid>hi("MatchParen", "brightcyan", s:g["darkcyan"])
+call <sid>hi("MoreMsg", "green", s:g["darkgreen"])
+call <sid>hi("NonText", "brightblue", s:g["darkerblue"])
+call <sid>hi("Search", "", s:g["darkmagenta"])
+call <sid>hi("SpellBad", "", s:g["darkred"])
+call <sid>hi("SpellCap", "", s:g["darkblue"])
+call <sid>hi("SpellRare", "", s:g["darkgreen"])
+call <sid>hi("SpellLocal", "", s:g["darkmagenta"])
+call <sid>hi("Visual", "", s:g["darkwhite"])
diff --git a/vim/plugin/opinionated-defaults.vim b/vim/plugin/opinionated-defaults.vim
index 666eeea..87eaf57 100644
--- a/vim/plugin/opinionated-defaults.vim
+++ b/vim/plugin/opinionated-defaults.vim
@@ -141,9 +141,6 @@ set t_vb=
 set t_Co=256
 " globally highlight diff conflict markers
 match ErrorMsg '^\(<\||\|=\|>\)\{7\}\([^=].\+\)\?$'
-" override some obnoxious default color choices
-highlight Folded NONE ctermfg=darkgreen guifg=green
-highlight Search NONE ctermfg=red guifg=red
 
 
 """ MAPPINGS """
diff --git a/vim/plugin/rainbow_paren.vim b/vim/plugin/rainbow_paren.vim
index c104287..9c26134 100644
--- a/vim/plugin/rainbow_paren.vim
+++ b/vim/plugin/rainbow_paren.vim
@@ -20,13 +20,13 @@
 
 function! Rainbow()
   let s:basename = 'level'
-  exe 'hi '.s:basename.'1c ctermfg=darkcyan    guifg=cyan'
-  exe 'hi '.s:basename.'2c ctermfg=darkgreen   guifg=green'
-  exe 'hi '.s:basename.'3c ctermfg=darkyellow  guifg=yellow'
-  exe 'hi '.s:basename.'4c ctermfg=darkblue    guifg=blue'
-  exe 'hi '.s:basename.'5c ctermfg=darkmagenta guifg=magenta'
+  exe 'hi '.s:basename.'1c ctermfg=6 guifg=#1673b0'
+  exe 'hi '.s:basename.'2c ctermfg=2 guifg=#008551'
+  exe 'hi '.s:basename.'3c ctermfg=3 guifg=#b25200'
+  exe 'hi '.s:basename.'4c ctermfg=4 guifg=#4369cc'
+  exe 'hi '.s:basename.'5c ctermfg=5 guifg=#a045a7'
   " this color is never nested, it only appears on the outermost layer
-  exe 'hi '.s:basename.'6c ctermfg=darkred     guifg=red'
+  exe 'hi '.s:basename.'6c ctermfg=1 guifg=#c7394e'
 
   " helper function
   func s:DoSyn(cur, top, left, right, uniq)
diff --git a/vimrc b/vimrc
index a40078f..ad498e8 100644
--- a/vimrc
+++ b/vimrc
@@ -1,7 +1,10 @@
 " options {{{
 set shiftwidth=4
 set expandtab
-set background=light
+set termguicolors
+let &t_8f="\e[38;2;%lu;%lu;%lum"
+let &t_8b="\e[48;2;%lu;%lu;%lum"
+colorscheme local
 " }}}
 " hooks {{{
 augroup vimrc