From 3810359e1ba1da28632f159bcc67b0e7de110ffe Mon Sep 17 00:00:00 2001 From: Bill Niblock Date: Sun, 29 Dec 2024 12:22:09 -0500 Subject: [PATCH] Vim Update Complete --- vim/colors/catppuccin_frappe.vim | 163 +++ vim/colors/catppuccin_latte.vim | 163 +++ vim/colors/catppuccin_macchiato.vim | 163 +++ vim/colors/catppuccin_mocha.vim | 163 +++ vim/vim/pack/colors/start/minimalist.vim | 227 ----- vim/vim/pack/colors/start/solarized.vim | 1117 --------------------- vim/vim/pack/plugins/start/vim-commentary | 1 - vim/vim/pack/plugins/start/vim-fugitive | 1 - vim/vim/pack/plugins/start/vim-polyglot | 1 - vim/vim/pack/plugins/start/vim-unimpaired | 1 - vim/vim/templates/journal | 7 - vim/vimrc | 173 +--- 12 files changed, 682 insertions(+), 1498 deletions(-) create mode 100644 vim/colors/catppuccin_frappe.vim create mode 100644 vim/colors/catppuccin_latte.vim create mode 100644 vim/colors/catppuccin_macchiato.vim create mode 100644 vim/colors/catppuccin_mocha.vim delete mode 100644 vim/vim/pack/colors/start/minimalist.vim delete mode 100644 vim/vim/pack/colors/start/solarized.vim delete mode 160000 vim/vim/pack/plugins/start/vim-commentary delete mode 160000 vim/vim/pack/plugins/start/vim-fugitive delete mode 160000 vim/vim/pack/plugins/start/vim-polyglot delete mode 160000 vim/vim/pack/plugins/start/vim-unimpaired delete mode 100644 vim/vim/templates/journal diff --git a/vim/colors/catppuccin_frappe.vim b/vim/colors/catppuccin_frappe.vim new file mode 100644 index 0000000..92c02c2 --- /dev/null +++ b/vim/colors/catppuccin_frappe.vim @@ -0,0 +1,163 @@ +" Name: catppuccin_frappe.vim + +set background=dark +hi clear + +if exists('syntax on') + syntax reset +endif + +let g:colors_name='catppuccin_frappe' +set t_Co=256 + +let s:rosewater = "#F2D5CF" +let s:flamingo = "#EEBEBE" +let s:pink = "#F4B8E4" +let s:mauve = "#CA9EE6" +let s:red = "#E78284" +let s:maroon = "#EA999C" +let s:peach = "#EF9F76" +let s:yellow = "#E5C890" +let s:green = "#A6D189" +let s:teal = "#81C8BE" +let s:sky = "#99D1DB" +let s:sapphire = "#85C1DC" +let s:blue = "#8CAAEE" +let s:lavender = "#BABBF1" + +let s:text = "#C6D0F5" +let s:subtext1 = "#B5BFE2" +let s:subtext0 = "#A5ADCE" +let s:overlay2 = "#949CBB" +let s:overlay1 = "#838BA7" +let s:overlay0 = "#737994" +let s:surface2 = "#626880" +let s:surface1 = "#51576D" +let s:surface0 = "#414559" + +let s:base = "#303446" +let s:mantle = "#292C3C" +let s:crust = "#232634" + +function! s:hi(group, guisp, guifg, guibg, gui, cterm) + let cmd = "" + if a:guisp != "" + let cmd = cmd . " guisp=" . a:guisp + endif + if a:guifg != "" + let cmd = cmd . " guifg=" . a:guifg + endif + if a:guibg != "" + let cmd = cmd . " guibg=" . a:guibg + endif + if a:gui != "" + let cmd = cmd . " gui=" . a:gui + endif + if a:cterm != "" + let cmd = cmd . " cterm=" . a:cterm + endif + if cmd != "" + exec "hi " . a:group . cmd + endif +endfunction + + + +call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE") +call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold") +call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE") +call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Cursor", "NONE", s:base, s:text, "NONE", "NONE") +call s:hi("lCursor", "NONE", s:base, s:text, "NONE", "NONE") +call s:hi("CursorIM", "NONE", s:base, s:text, "NONE", "NONE") +call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE") +call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic" , "bold,italic") +call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE") +call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE") +call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE") +call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE") +call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE") +call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE") +call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE") +call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold") +call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold") +call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE") +call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold") +call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE") +call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold") +call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE") +call s:hi("SpellBad", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("SpellCap", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("SpellLocal", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("SpellRare", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTerm", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTermNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE") +call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold") +call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Comment", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE") +call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE") +call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline") +call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Todo", "NONE", s:base, s:flamingo, "bold", "bold") + +call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE") +call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE") +call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE") +call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE") +call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE") + +hi link Define PreProc +hi link Macro PreProc +hi link PreCondit PreProc +hi link SpecialChar Special +hi link Tag Special +hi link Delimiter Special +hi link SpecialComment Special +hi link Debug Special +hi link Exception Error +hi link StatusLineTerm StatusLine +hi link StatusLineTermNC StatusLineNC +hi link Terminal Normal +hi link Ignore Comment + +" Set terminal colors for playing well with plugins like fzf +let g:terminal_ansi_colors = [ + \ s:surface1, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext1, + \ s:surface2, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext0 +\ ] diff --git a/vim/colors/catppuccin_latte.vim b/vim/colors/catppuccin_latte.vim new file mode 100644 index 0000000..1eb3620 --- /dev/null +++ b/vim/colors/catppuccin_latte.vim @@ -0,0 +1,163 @@ +" Name: catppuccin_latte.vim + +set background=dark +hi clear + +if exists('syntax on') + syntax reset +endif + +let g:colors_name='catppuccin_latte' +set t_Co=256 + +let s:rosewater = "#DC8A78" +let s:flamingo = "#DD7878" +let s:pink = "#EA76CB" +let s:mauve = "#8839EF" +let s:red = "#D20F39" +let s:maroon = "#E64553" +let s:peach = "#FE640B" +let s:yellow = "#DF8E1D" +let s:green = "#40A02B" +let s:teal = "#179299" +let s:sky = "#04A5E5" +let s:sapphire = "#209FB5" +let s:blue = "#1E66F5" +let s:lavender = "#7287FD" + +let s:text = "#4C4F69" +let s:subtext1 = "#5C5F77" +let s:subtext0 = "#6C6F85" +let s:overlay2 = "#7C7F93" +let s:overlay1 = "#8C8FA1" +let s:overlay0 = "#9CA0B0" +let s:surface2 = "#ACB0BE" +let s:surface1 = "#BCC0CC" +let s:surface0 = "#CCD0DA" + +let s:base = "#EFF1F5" +let s:mantle = "#E6E9EF" +let s:crust = "#DCE0E8" + +function! s:hi(group, guisp, guifg, guibg, gui, cterm) + let cmd = "" + if a:guisp != "" + let cmd = cmd . " guisp=" . a:guisp + endif + if a:guifg != "" + let cmd = cmd . " guifg=" . a:guifg + endif + if a:guibg != "" + let cmd = cmd . " guibg=" . a:guibg + endif + if a:gui != "" + let cmd = cmd . " gui=" . a:gui + endif + if a:cterm != "" + let cmd = cmd . " cterm=" . a:cterm + endif + if cmd != "" + exec "hi " . a:group . cmd + endif +endfunction + + + +call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE") +call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold") +call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE") +call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Cursor", "NONE", s:base, s:text, "NONE", "NONE") +call s:hi("lCursor", "NONE", s:base, s:text, "NONE", "NONE") +call s:hi("CursorIM", "NONE", s:base, s:text, "NONE", "NONE") +call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE") +call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic" , "bold,italic") +call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE") +call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE") +call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE") +call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE") +call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE") +call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE") +call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE") +call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold") +call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold") +call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE") +call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold") +call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE") +call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold") +call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE") +call s:hi("SpellBad", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("SpellCap", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("SpellLocal", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("SpellRare", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTerm", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTermNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE") +call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold") +call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Comment", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE") +call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE") +call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline") +call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Todo", "NONE", s:base, s:flamingo, "bold", "bold") + +call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE") +call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE") +call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE") +call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE") +call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE") + +hi link Define PreProc +hi link Macro PreProc +hi link PreCondit PreProc +hi link SpecialChar Special +hi link Tag Special +hi link Delimiter Special +hi link SpecialComment Special +hi link Debug Special +hi link Exception Error +hi link StatusLineTerm StatusLine +hi link StatusLineTermNC StatusLineNC +hi link Terminal Normal +hi link Ignore Comment + +" Set terminal colors for playing well with plugins like fzf +let g:terminal_ansi_colors = [ + \ s:subtext1, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:surface2, + \ s:subtext0, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:surface1 +\ ] diff --git a/vim/colors/catppuccin_macchiato.vim b/vim/colors/catppuccin_macchiato.vim new file mode 100644 index 0000000..ecdd6ab --- /dev/null +++ b/vim/colors/catppuccin_macchiato.vim @@ -0,0 +1,163 @@ +" Name: catppuccin_macchiato.vim + +set background=dark +hi clear + +if exists('syntax on') + syntax reset +endif + +let g:colors_name='catppuccin_macchiato' +set t_Co=256 + +let s:rosewater = "#F4DBD6" +let s:flamingo = "#F0C6C6" +let s:pink = "#F5BDE6" +let s:mauve = "#C6A0F6" +let s:red = "#ED8796" +let s:maroon = "#EE99A0" +let s:peach = "#F5A97F" +let s:yellow = "#EED49F" +let s:green = "#A6DA95" +let s:teal = "#8BD5CA" +let s:sky = "#91D7E3" +let s:sapphire = "#7DC4E4" +let s:blue = "#8AADF4" +let s:lavender = "#B7BDF8" + +let s:text = "#CAD3F5" +let s:subtext1 = "#B8C0E0" +let s:subtext0 = "#A5ADCB" +let s:overlay2 = "#939AB7" +let s:overlay1 = "#8087A2" +let s:overlay0 = "#6E738D" +let s:surface2 = "#5B6078" +let s:surface1 = "#494D64" +let s:surface0 = "#363A4F" + +let s:base = "#24273A" +let s:mantle = "#1E2030" +let s:crust = "#181926" + +function! s:hi(group, guisp, guifg, guibg, gui, cterm) + let cmd = "" + if a:guisp != "" + let cmd = cmd . " guisp=" . a:guisp + endif + if a:guifg != "" + let cmd = cmd . " guifg=" . a:guifg + endif + if a:guibg != "" + let cmd = cmd . " guibg=" . a:guibg + endif + if a:gui != "" + let cmd = cmd . " gui=" . a:gui + endif + if a:cterm != "" + let cmd = cmd . " cterm=" . a:cterm + endif + if cmd != "" + exec "hi " . a:group . cmd + endif +endfunction + + + +call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE") +call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold") +call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE") +call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Cursor", "NONE", s:base, s:text, "NONE", "NONE") +call s:hi("lCursor", "NONE", s:base, s:text, "NONE", "NONE") +call s:hi("CursorIM", "NONE", s:base, s:text, "NONE", "NONE") +call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE") +call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic" , "bold,italic") +call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE") +call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE") +call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE") +call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE") +call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE") +call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE") +call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE") +call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold") +call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold") +call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE") +call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold") +call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE") +call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold") +call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE") +call s:hi("SpellBad", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("SpellCap", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("SpellLocal", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("SpellRare", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTerm", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTermNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE") +call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold") +call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Comment", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE") +call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE") +call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline") +call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Todo", "NONE", s:base, s:flamingo, "bold", "bold") + +call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE") +call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE") +call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE") +call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE") +call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE") + +hi link Define PreProc +hi link Macro PreProc +hi link PreCondit PreProc +hi link SpecialChar Special +hi link Tag Special +hi link Delimiter Special +hi link SpecialComment Special +hi link Debug Special +hi link Exception Error +hi link StatusLineTerm StatusLine +hi link StatusLineTermNC StatusLineNC +hi link Terminal Normal +hi link Ignore Comment + +" Set terminal colors for playing well with plugins like fzf +let g:terminal_ansi_colors = [ + \ s:surface1, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext1, + \ s:surface2, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext0 +\ ] diff --git a/vim/colors/catppuccin_mocha.vim b/vim/colors/catppuccin_mocha.vim new file mode 100644 index 0000000..9d601ef --- /dev/null +++ b/vim/colors/catppuccin_mocha.vim @@ -0,0 +1,163 @@ +" Name: catppuccin_mocha.vim + +set background=dark +hi clear + +if exists('syntax on') + syntax reset +endif + +let g:colors_name='catppuccin_mocha' +set t_Co=256 + +let s:rosewater = "#F5E0DC" +let s:flamingo = "#F2CDCD" +let s:pink = "#F5C2E7" +let s:mauve = "#CBA6F7" +let s:red = "#F38BA8" +let s:maroon = "#EBA0AC" +let s:peach = "#FAB387" +let s:yellow = "#F9E2AF" +let s:green = "#A6E3A1" +let s:teal = "#94E2D5" +let s:sky = "#89DCEB" +let s:sapphire = "#74C7EC" +let s:blue = "#89B4FA" +let s:lavender = "#B4BEFE" + +let s:text = "#CDD6F4" +let s:subtext1 = "#BAC2DE" +let s:subtext0 = "#A6ADC8" +let s:overlay2 = "#9399B2" +let s:overlay1 = "#7F849C" +let s:overlay0 = "#6C7086" +let s:surface2 = "#585B70" +let s:surface1 = "#45475A" +let s:surface0 = "#313244" + +let s:base = "#1E1E2E" +let s:mantle = "#181825" +let s:crust = "#11111B" + +function! s:hi(group, guisp, guifg, guibg, gui, cterm) + let cmd = "" + if a:guisp != "" + let cmd = cmd . " guisp=" . a:guisp + endif + if a:guifg != "" + let cmd = cmd . " guifg=" . a:guifg + endif + if a:guibg != "" + let cmd = cmd . " guibg=" . a:guibg + endif + if a:gui != "" + let cmd = cmd . " gui=" . a:gui + endif + if a:cterm != "" + let cmd = cmd . " cterm=" . a:cterm + endif + if cmd != "" + exec "hi " . a:group . cmd + endif +endfunction + + + +call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE") +call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold") +call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE") +call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Cursor", "NONE", s:base, s:text, "NONE", "NONE") +call s:hi("lCursor", "NONE", s:base, s:text, "NONE", "NONE") +call s:hi("CursorIM", "NONE", s:base, s:text, "NONE", "NONE") +call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE") +call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic" , "bold,italic") +call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE") +call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE") +call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE") +call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE") +call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE") +call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE") +call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE") +call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold") +call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold") +call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE") +call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold") +call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE") +call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold") +call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE") +call s:hi("SpellBad", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("SpellCap", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("SpellLocal", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("SpellRare", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTerm", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTermNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE") +call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold") +call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Comment", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE") +call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE") +call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline") +call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Todo", "NONE", s:base, s:flamingo, "bold", "bold") + +call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE") +call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE") +call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE") +call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE") +call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE") + +hi link Define PreProc +hi link Macro PreProc +hi link PreCondit PreProc +hi link SpecialChar Special +hi link Tag Special +hi link Delimiter Special +hi link SpecialComment Special +hi link Debug Special +hi link Exception Error +hi link StatusLineTerm StatusLine +hi link StatusLineTermNC StatusLineNC +hi link Terminal Normal +hi link Ignore Comment + +" Set terminal colors for playing well with plugins like fzf +let g:terminal_ansi_colors = [ + \ s:surface1, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext1, + \ s:surface2, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext0 +\ ] diff --git a/vim/vim/pack/colors/start/minimalist.vim b/vim/vim/pack/colors/start/minimalist.vim deleted file mode 100644 index 3748786..0000000 --- a/vim/vim/pack/colors/start/minimalist.vim +++ /dev/null @@ -1,227 +0,0 @@ -" Minimalist - A Material Colorscheme Darker -" -" Author: Diki Ananta -" Repository: https://github.com/dikiaap/minimalist -" Version: 1.4 -" License: MIT - -set background=dark -if version > 580 - hi clear - if exists("syntax_on") - syntax reset - endif -endif -set t_Co=256 -let g:colors_name = "minimalist" - -""""""""""""""""""""""" -" General -""""""""""""""""""""""" -hi ColorColumn ctermfg=NONE ctermbg=233 cterm=NONE guifg=NONE guibg=#121212 gui=NONE -hi Cursor ctermfg=234 ctermbg=255 cterm=NONE guifg=#1C1C1C guibg=#EEEEEE gui=NONE -hi CursorColumn ctermfg=NONE ctermbg=233 cterm=NONE guifg=NONE guibg=#121212 gui=NONE -hi CursorLine ctermfg=NONE ctermbg=233 cterm=NONE guifg=NONE guibg=#121212 gui=NONE -hi CursorLineNr ctermfg=59 ctermbg=233 cterm=NONE guifg=#5F5F5F guibg=#121212 gui=NONE -hi DiffAdd ctermfg=255 ctermbg=64 cterm=bold guifg=#EEEEEE guibg=#5F8700 gui=bold -hi DiffChange ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi DiffDelete ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE -hi DiffText ctermfg=255 ctermbg=24 cterm=bold guifg=#EEEEEE guibg=#005F87 gui=bold -hi Directory ctermfg=179 ctermbg=NONE cterm=NONE guifg=#D7AF5F guibg=NONE gui=NONE -hi ErrorMsg ctermfg=255 ctermbg=167 cterm=NONE guifg=#EEEEEE guibg=#D75F5F gui=NONE -hi FoldColumn ctermfg=117 ctermbg=239 cterm=NONE guifg=#87D7FF guibg=#4E4E4E gui=NONE -hi Folded ctermfg=242 ctermbg=234 cterm=NONE guifg=#666666 guibg=#1C1C1C gui=NONE -hi IncSearch ctermfg=234 ctermbg=75 cterm=NONE guifg=#1C1C1C guibg=#5FAFFF gui=NONE -hi LineNr ctermfg=59 ctermbg=234 cterm=NONE guifg=#5F5F5F guibg=#1C1C1C gui=NONE -hi MatchParen ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline -hi MoreMsg ctermfg=150 ctermbg=NONE cterm=NONE guifg=#AFD787 guibg=NONE gui=NONE -hi NonText ctermfg=234 ctermbg=234 cterm=NONE guifg=#1C1C1C guibg=#1C1C1C gui=NONE -hi Normal ctermfg=255 ctermbg=234 cterm=NONE guifg=#EEEEEE guibg=#1C1C1C gui=NONE -hi Pmenu ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi PmenuSel ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#5F5F5F gui=NONE -hi Question ctermfg=150 ctermbg=NONE cterm=NONE guifg=#AFD787 guibg=NONE gui=bold -hi Search ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline -hi SignColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3A3A3A gui=NONE -hi StatusLine ctermfg=255 ctermbg=239 cterm=bold guifg=#EEEEEE guibg=#4E4E4E gui=bold -hi StatusLineNC ctermfg=255 ctermbg=239 cterm=NONE guifg=#EEEEEE guibg=#4E4E4E gui=NONE -hi Title ctermfg=255 ctermbg=NONE cterm=NONE guifg=#EEEEEE guibg=NONE gui=NONE -hi Underlined ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE -hi VertSplit ctermfg=239 ctermbg=239 cterm=NONE guifg=#4E4E4E guibg=#4E4E4E gui=NONE -hi Visual ctermfg=NONE ctermbg=236 cterm=NONE guifg=NONE guibg=#303030 gui=NONE -hi WarningMsg ctermfg=255 ctermbg=167 cterm=NONE guifg=#EEEEEE guibg=#D75F5F gui=NONE -hi WildMenu ctermfg=234 ctermbg=215 cterm=NONE guifg=#1C1C1C guibg=#FFAF5F gui=NONE -hi NERDTreeUp ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE -hi NERDTreeDir ctermfg=251 ctermbg=NONE cterm=bold guifg=#C6C6C6 guibg=NONE gui=bold -hi NERDTreeDirSlash ctermfg=251 ctermbg=NONE cterm=NONE guifg=#C6C6C6 guibg=NONE gui=NONE -hi NERDTreeFile ctermfg=241 ctermbg=NONE cterm=NONE guifg=#606060 guibg=NONE gui=NONE -hi NERDTreeCWD ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE -hi NERDTreeOpenable ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE -hi NERDTreeClosable ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE - -""""""""""""""""""""""" -" Syntax Highlighting -""""""""""""""""""""""" -hi Boolean ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi Character ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi Comment ctermfg=238 ctermbg=NONE cterm=NONE guifg=#444444 guibg=NONE gui=NONE -hi Conditional ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi Constant ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi Define ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi Error ctermfg=255 ctermbg=167 cterm=NONE guifg=#EEEEEE guibg=#D75F5F gui=NONE -hi Float ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi Function ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi Identifier ctermfg=255 ctermbg=NONE cterm=NONE guifg=#EEEEEE guibg=NONE gui=italic -hi Keyword ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi Label ctermfg=186 ctermbg=NONE cterm=NONE guifg=#D7D787 guibg=NONE gui=NONE -hi Number ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi Operator ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi PreCondit ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi PreProc ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi Repeat ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi Special ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi SpecialComment ctermfg=242 ctermbg=NONE cterm=NONE guifg=#666666 guibg=NONE gui=NONE -hi SpecialKey ctermfg=59 ctermbg=237 cterm=NONE guifg=#5F5F5F guibg=#3A3A3A gui=NONE -hi SpellBad ctermfg=255 ctermbg=167 cterm=NONE guifg=#EEEEEE guibg=#D75F5F gui=undercurl -hi SpellCap ctermfg=255 ctermbg=74 cterm=NONE guifg=#EEEEEE guibg=#5FAFD7 gui=undercurl -hi SpellRare ctermfg=255 ctermbg=140 cterm=NONE guifg=#EEEEEE guibg=#AF87D7 gui=undercurl -hi SpellLocal ctermfg=255 ctermbg=14 cterm=NONE guifg=#EEEEEE guibg=#5FB3B3 gui=undercurl -hi Statement ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE -hi StorageClass ctermfg=215 ctermbg=NONE cterm=NONE guifg=#FFAF5F guibg=NONE gui=italic -hi String ctermfg=150 ctermbg=NONE cterm=NONE guifg=#AFD787 guibg=NONE gui=NONE -hi Structure ctermfg=215 ctermbg=NONE cterm=NONE guifg=#FFAF5F guibg=NONE gui=NONE -hi Tag ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi Todo ctermfg=74 ctermbg=234 cterm=inverse guifg=#5FAFD7 guibg=#1C1C1C gui=inverse,bold -hi Type ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE - -""""""""""""""""""""""" -" Supports -""""""""""""""""""""""" -hi cInclude ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE " C++ -hi cOperator ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi cppStatement ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi cssAttr ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE " CSS/CSS3 -hi cssAttrComma ctermfg=231 ctermbg=NONE cterm=NONE guifg=#EEEEEE guibg=NONE gui=NONE -hi cssBoxProp ctermfg=152 ctermbg=NONE cterm=NONE guifg=#AFD7D7 guibg=NONE gui=NONE -hi cssBraces ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi cssClassName ctermfg=215 ctermbg=NONE cterm=NONE guifg=#FFAF5F guibg=NONE gui=NONE -hi cssColor ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi cssCommonAttr ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi cssFontAttr ctermfg=150 ctermbg=NONE cterm=NONE guifg=#AFD787 guibg=NONE gui=NONE -hi cssFunctionName ctermfg=75 ctermbg=NONE cterm=NONE guifg=#5FAFFF guibg=NONE gui=NONE -hi cssNoise ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi cssProp ctermfg=152 ctermbg=NONE cterm=NONE guifg=#AFD7D7 guibg=NONE gui=NONE -hi cssPseudoClass ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi cssPseudoClassId ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi cssTagName ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE -hi cssUIAttr ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi cssUnitDecorators ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi cssURL ctermfg=255 ctermbg=NONE cterm=NONE guifg=#EEEEEE guibg=NONE gui=italic -hi cssValueLength ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi cssValueNumber ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi cssVendor ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi htmlArg ctermfg=215 ctermbg=NONE cterm=NONE guifg=#FFAF5F guibg=NONE gui=NONE " HTML/HTML5 -hi htmlEndTag ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi htmlScriptTag ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi htmlSpecialChar ctermfg=215 ctermbg=NONE cterm=NONE guifg=#FFAF5F guibg=NONE gui=NONE -hi htmlSpecialTagName ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE -hi htmlTag ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi htmlTagName ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE -hi javaScriptBoolean ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE " JavaScript -hi javaScriptBraces ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi javaScriptConditional ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi javaScriptException ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi javaScriptFunction ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=italic -hi javaScriptGlobal ctermfg=255 ctermbg=NONE cterm=NONE guifg=#EEEEEE guibg=NONE gui=NONE -hi javaScriptIdentifier ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi javaScriptLabel ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi javaScriptMessage ctermfg=255 ctermbg=NONE cterm=NONE guifg=#EEEEEE guibg=NONE gui=NONE -hi javaScriptNull ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi javaScriptNumber ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi javaScriptOperator ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi javaScriptParens ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi javaScriptRegexpString ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi javaScriptRepeat ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi javaScriptSpecial ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi javaScriptStatement ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi markdownCode ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE " Markdown -hi markdownCodeBlock ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi markdownCodeDelimiter ctermfg=247 ctermbg=NONE cterm=NONE guifg=#9E9E9E guibg=NONE gui=NONE -hi markdownError ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE -hi markdownHeadingDelimiter ctermfg=150 ctermbg=NONE cterm=NONE guifg=#AFD787 guibg=NONE gui=NONE -hi markdownUrl ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi phpBoolean ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE " PHP -hi phpClass ctermfg=215 ctermbg=NONE cterm=NONE guifg=#FFAF5F guibg=NONE gui=NONE -hi phpClassDelimiter ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi phpClassExtends ctermfg=150 ctermbg=NONE cterm=NONE guifg=#AFD787 guibg=NONE gui=NONE -hi phpClassImplements ctermfg=150 ctermbg=NONE cterm=NONE guifg=#AFD787 guibg=NONE gui=NONE -hi phpCommentStar ctermfg=238 ctermbg=NONE cterm=NONE guifg=#444444 guibg=NONE gui=NONE -hi phpCommentTitle ctermfg=238 ctermbg=NONE cterm=NONE guifg=#444444 guibg=NONE gui=NONE -hi phpDocComment ctermfg=238 ctermbg=NONE cterm=NONE guifg=#444444 guibg=NONE gui=NONE -hi phpDocIdentifier ctermfg=238 ctermbg=NONE cterm=NONE guifg=#444444 guibg=NONE gui=NONE -hi phpDocParam ctermfg=238 ctermbg=NONE cterm=NONE guifg=#444444 guibg=NONE gui=NONE -hi phpDocTags ctermfg=242 ctermbg=NONE cterm=NONE guifg=#666666 guibg=NONE gui=NONE -hi phpFunction ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi phpFunctions ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi phpIdentifier ctermfg=255 ctermbg=NONE cterm=NONE guifg=#EEEEEE guibg=NONE gui=NONE -hi phpInclude ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi phpKeyword ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi phpMethod ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi phpNumber ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi phpOperator ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi phpParent ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi phpMemberSelector ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi phpMethodsVar ctermfg=255 ctermbg=NONE cterm=NONE guifg=#EEEEEE guibg=NONE gui=NONE -hi phpStaticClasses ctermfg=215 ctermbg=NONE cterm=NONE guifg=#FFAF5F guibg=NONE gui=NONE -hi phpStringDouble ctermfg=150 ctermbg=NONE cterm=NONE guifg=#AFD787 guibg=NONE gui=NONE -hi phpStringDelimiter ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi phpStringSingle ctermfg=150 ctermbg=NONE cterm=NONE guifg=#AFD787 guibg=NONE gui=NONE -hi phpSuperglobals ctermfg=255 ctermbg=NONE cterm=NONE guifg=#EEEEEE guibg=NONE gui=NONE -hi phpType ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi phpUseClass ctermfg=215 ctermbg=NONE cterm=NONE guifg=#FFAF5F guibg=NONE gui=NONE -hi phpVarSelector ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi pythonConditional ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE " Python -hi pythonDecorator ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi pythonException ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi pythonFunction ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi pythonInclude ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi pythonNumber ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi pythonOperator ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi pythonRepeat ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi pythonStatement ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi pythonTodo ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi rubyBlockParameter ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE " Ruby -hi rubyClass ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi rubyClassVariable ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi rubyConstant ctermfg=215 ctermbg=NONE cterm=NONE guifg=#FFAF5F guibg=NONE gui=italic -hi rubyControl ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi rubyException ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi rubyFunction ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi rubyInclude ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi rubyInstanceVariable ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi rubyInterpolationDelimiter ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi rubyOperator ctermfg=140 ctermbg=NONE cterm=NONE guifg=#AF87D7 guibg=NONE gui=NONE -hi rubyPseudoVariable ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi rubyRegexp ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi rubyRegexpDelimiter ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi rubyStringDelimiter ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi rubySymbol ctermfg=150 ctermbg=NONE cterm=NONE guifg=#AFD787 guibg=NONE gui=NONE -hi sassClass ctermfg=215 ctermbg=NONE cterm=NONE guifg=#FFAF5F guibg=NONE gui=NONE " Sass -hi sassClassChar ctermfg=215 ctermbg=NONE cterm=NONE guifg=#FFAF5F guibg=NONE gui=NONE -hi sassFunction ctermfg=255 ctermbg=NONE cterm=NONE guifg=#EEEEEE guibg=NONE gui=NONE -hi sassInclude ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi sassVariable ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi shFunction ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE " Shell -hi shOperator ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi shStatement ctermfg=74 ctermbg=NONE cterm=NONE guifg=#5FAFD7 guibg=NONE gui=NONE -hi shTestOpr ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi shVariable ctermfg=255 ctermbg=NONE cterm=NONE guifg=#EEEEEE guibg=NONE gui=NONE -hi xmlAttrib ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE " XML -hi xmlCdataStart ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi xmlCdataCdata ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi xmlEndTag ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE -hi xmlEntity ctermfg=173 ctermbg=NONE cterm=NONE guifg=#D7875F guibg=NONE gui=NONE -hi xmlEntityPunct ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi xmlEqual ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi xmlProcessingDelim ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi xmlTag ctermfg=117 ctermbg=NONE cterm=NONE guifg=#87D7FF guibg=NONE gui=NONE -hi xmlTagName ctermfg=167 ctermbg=NONE cterm=NONE guifg=#D75F5F guibg=NONE gui=NONE diff --git a/vim/vim/pack/colors/start/solarized.vim b/vim/vim/pack/colors/start/solarized.vim deleted file mode 100644 index 70f5223..0000000 --- a/vim/vim/pack/colors/start/solarized.vim +++ /dev/null @@ -1,1117 +0,0 @@ -" Name: Solarized vim colorscheme -" Author: Ethan Schoonover -" URL: http://ethanschoonover.com/solarized -" (see this url for latest release & screenshots) -" License: OSI approved MIT license (see end of this file) -" Created: In the middle of the night -" Modified: 2011 May 05 -" -" Usage "{{{ -" -" --------------------------------------------------------------------- -" ABOUT: -" --------------------------------------------------------------------- -" Solarized is a carefully designed selective contrast colorscheme with dual -" light and dark modes that runs in both GUI, 256 and 16 color modes. -" -" See the homepage above for screenshots and details. -" -" --------------------------------------------------------------------- -" OPTIONS: -" --------------------------------------------------------------------- -" See the "solarized.txt" help file included with this colorscheme (in the -" "doc" subdirectory) for information on options, usage, the Toggle Background -" function and more. If you have already installed Solarized, this is available -" from the Solarized menu and command line as ":help solarized" -" -" --------------------------------------------------------------------- -" INSTALLATION: -" --------------------------------------------------------------------- -" Two options for installation: manual or pathogen -" -" MANUAL INSTALLATION OPTION: -" --------------------------------------------------------------------- -" -" 1. Download the solarized distribution (available on the homepage above) -" and unarchive the file. -" 2. Move `solarized.vim` to your `.vim/colors` directory. -" 3. Move each of the files in each subdirectories to the corresponding .vim -" subdirectory (e.g. autoload/togglebg.vim goes into your .vim/autoload -" directory as .vim/autoload/togglebg.vim). -" -" RECOMMENDED PATHOGEN INSTALLATION OPTION: -" --------------------------------------------------------------------- -" -" 1. Download and install Tim Pope's Pathogen from: -" https://github.com/tpope/vim-pathogen -" -" 2. Next, move or clone the `vim-colors-solarized` directory so that it is -" a subdirectory of the `.vim/bundle` directory. -" -" a. **clone with git:** -" -" $ cd ~/.vim/bundle -" $ git clone git://github.com/altercation/vim-colors-solarized.git -" -" b. **or move manually into the pathogen bundle directory:** -" In the parent directory of vim-colors-solarized: -" -" $ mv vim-colors-solarized ~/.vim/bundle/ -" -" MODIFY VIMRC: -" -" After either Option 1 or Option 2 above, put the following two lines in your -" .vimrc: -" -" syntax enable -" set background=dark -" colorscheme solarized -" -" or, for the light background mode of Solarized: -" -" syntax enable -" set background=light -" colorscheme solarized -" -" I like to have a different background in GUI and terminal modes, so I can use -" the following if-then. However, I find vim's background autodetection to be -" pretty good and, at least with MacVim, I can leave this background value -" assignment out entirely and get the same results. -" -" if has('gui_running') -" set background=light -" else -" set background=dark -" endif -" -" See the Solarized homepage at http://ethanschoonover.com/solarized for -" screenshots which will help you select either the light or dark background. -" -" --------------------------------------------------------------------- -" COLOR VALUES -" --------------------------------------------------------------------- -" Download palettes and files from: http://ethanschoonover.com/solarized -" -" L\*a\*b values are canonical (White D65, Reference D50), other values are -" matched in sRGB space. -" -" SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB -" --------- ------- ---- ------- ----------- ---------- ----------- ----------- -" base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 -" base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 -" base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46 -" base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51 -" base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 -" base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 -" base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93 -" base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 -" yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 -" orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 -" red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 -" magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 -" violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 -" blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 -" cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 -" green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 -" -" --------------------------------------------------------------------- -" COLORSCHEME HACKING -" --------------------------------------------------------------------- -" -" Useful commands for testing colorschemes: -" :source $VIMRUNTIME/syntax/hitest.vim -" :help highlight-groups -" :help cterm-colors -" :help group-name -" -" Useful links for developing colorschemes: -" http://www.vim.org/scripts/script.php?script_id=2937 -" http://vimcasts.org/episodes/creating-colorschemes-for-vim/ -" http://www.frexx.de/xterm-256-notes/" -" -" }}} -" Environment Specific Overrides "{{{ -" Allow or disallow certain features based on current terminal emulator or -" environment. - -" Terminals that support italics -let s:terms_italic=[ - \"rxvt", - \"gnome-terminal" - \] -" For reference only, terminals are known to be incomptible. -" Terminals that are in neither list need to be tested. -let s:terms_noitalic=[ - \"iTerm.app", - \"Apple_Terminal" - \] -if has("gui_running") - let s:terminal_italic=1 " TODO: could refactor to not require this at all -else - let s:terminal_italic=0 " terminals will be guilty until proven compatible - for term in s:terms_italic - if $TERM_PROGRAM =~ term - let s:terminal_italic=1 - endif - endfor -endif - -" }}} -" Default option values"{{{ -" --------------------------------------------------------------------- -" s:options_list is used to autogenerate a list of all non-default options -" using "call SolarizedOptions()" or with the "Generate .vimrc commands" -" Solarized menu option. See the "Menus" section below for the function itself. -let s:options_list=[ - \'" this block of commands has been autogenerated by solarized.vim and', - \'" includes the current, non-default Solarized option values.', - \'" To use, place these commands in your .vimrc file (replacing any', - \'" existing colorscheme commands). See also ":help solarized"', - \'', - \'" ------------------------------------------------------------------', - \'" Solarized Colorscheme Config', - \'" ------------------------------------------------------------------', - \] -let s:colorscheme_list=[ - \'syntax enable', - \'set background='.&background, - \'colorscheme solarized', - \] -let s:defaults_list=[ - \'" ------------------------------------------------------------------', - \'', - \'" The following items are available options, but do not need to be', - \'" included in your .vimrc as they are currently set to their defaults.', - \'' - \] -let s:lazycat_list=[ - \'" lazy method of appending this onto your .vimrc ":w! >> ~/.vimrc"', - \'" ------------------------------------------------------------------', - \] - -function! s:SetOption(name,default) - if type(a:default) == type(0) - let l:wrap='' - let l:ewrap='' - else - let l:wrap='"' - let l:ewrap='\"' - endif - if !exists("g:solarized_".a:name) || g:solarized_{a:name}==a:default - exe 'let g:solarized_'.a:name.'='.l:wrap.a:default.l:wrap.'"' - exe 'call add(s:defaults_list, "\" let g:solarized_'.a:name.'='.l:ewrap.g:solarized_{a:name}.l:ewrap.'")' - else - exe 'call add(s:options_list, "let g:solarized_'.a:name.'='.l:ewrap.g:solarized_{a:name}.l:ewrap.' \"default value is '.a:default.'")' - endif -endfunction - -if ($TERM_PROGRAM ==? "apple_terminal" && &t_Co < 256) - let s:solarized_termtrans_default = 1 -else - let s:solarized_termtrans_default = 0 -endif -call s:SetOption("termtrans",s:solarized_termtrans_default) -call s:SetOption("degrade",0) -call s:SetOption("bold",1) -call s:SetOption("underline",1) -call s:SetOption("italic",1) " note that we need to override this later if the terminal doesn't support -call s:SetOption("termcolors",16) -call s:SetOption("contrast","normal") -call s:SetOption("visibility","normal") -call s:SetOption("diffmode","normal") -call s:SetOption("hitrail",0) -call s:SetOption("menu",1) - -"}}} -" Colorscheme initialization "{{{ -" --------------------------------------------------------------------- -hi clear -if exists("syntax_on") - syntax reset -endif -let colors_name = "solarized" - -"}}} -" GUI & CSApprox hexadecimal palettes"{{{ -" --------------------------------------------------------------------- -" -" Set both gui and terminal color values in separate conditional statements -" Due to possibility that CSApprox is running (though I suppose we could just -" leave the hex values out entirely in that case and include only cterm colors) -" We also check to see if user has set solarized (force use of the -" neutral gray monotone palette component) -if (has("gui_running") && g:solarized_degrade == 0) - let s:vmode = "gui" - let s:base03 = "#002b36" - let s:base02 = "#073642" - let s:base01 = "#586e75" - let s:base00 = "#657b83" - let s:base0 = "#839496" - let s:base1 = "#93a1a1" - let s:base2 = "#eee8d5" - let s:base3 = "#fdf6e3" - let s:yellow = "#b58900" - let s:orange = "#cb4b16" - let s:red = "#dc322f" - let s:magenta = "#d33682" - let s:violet = "#6c71c4" - let s:blue = "#268bd2" - let s:cyan = "#2aa198" - "let s:green = "#859900" "original - let s:green = "#719e07" "experimental -elseif (has("gui_running") && g:solarized_degrade == 1) - " These colors are identical to the 256 color mode. They may be viewed - " while in gui mode via "let g:solarized_degrade=1", though this is not - " recommened and is for testing only. - let s:vmode = "gui" - let s:base03 = "#1c1c1c" - let s:base02 = "#262626" - let s:base01 = "#4e4e4e" - let s:base00 = "#585858" - let s:base0 = "#808080" - let s:base1 = "#8a8a8a" - let s:base2 = "#d7d7af" - let s:base3 = "#ffffd7" - let s:yellow = "#af8700" - let s:orange = "#d75f00" - let s:red = "#af0000" - let s:magenta = "#af005f" - let s:violet = "#5f5faf" - let s:blue = "#0087ff" - let s:cyan = "#00afaf" - let s:green = "#5f8700" -elseif g:solarized_termcolors != 256 && &t_Co >= 16 - let s:vmode = "cterm" - let s:base03 = "8" - let s:base02 = "0" - let s:base01 = "10" - let s:base00 = "11" - let s:base0 = "12" - let s:base1 = "14" - let s:base2 = "7" - let s:base3 = "15" - let s:yellow = "3" - let s:orange = "9" - let s:red = "1" - let s:magenta = "5" - let s:violet = "13" - let s:blue = "4" - let s:cyan = "6" - let s:green = "2" -elseif g:solarized_termcolors == 256 - let s:vmode = "cterm" - let s:base03 = "234" - let s:base02 = "235" - let s:base01 = "239" - let s:base00 = "240" - let s:base0 = "244" - let s:base1 = "245" - let s:base2 = "187" - let s:base3 = "230" - let s:yellow = "136" - let s:orange = "166" - let s:red = "124" - let s:magenta = "125" - let s:violet = "61" - let s:blue = "33" - let s:cyan = "37" - let s:green = "64" -else - let s:vmode = "cterm" - let s:bright = "* term=bold cterm=bold" -" let s:base03 = "0".s:bright -" let s:base02 = "0" -" let s:base01 = "2".s:bright -" let s:base00 = "3".s:bright -" let s:base0 = "4".s:bright -" let s:base1 = "6".s:bright -" let s:base2 = "7" -" let s:base3 = "7".s:bright -" let s:yellow = "3" -" let s:orange = "1".s:bright -" let s:red = "1" -" let s:magenta = "5" -" let s:violet = "5".s:bright -" let s:blue = "4" -" let s:cyan = "6" -" let s:green = "2" - let s:base03 = "DarkGray" " 0* - let s:base02 = "Black" " 0 - let s:base01 = "LightGreen" " 2* - let s:base00 = "LightYellow" " 3* - let s:base0 = "LightBlue" " 4* - let s:base1 = "LightCyan" " 6* - let s:base2 = "LightGray" " 7 - let s:base3 = "White" " 7* - let s:yellow = "DarkYellow" " 3 - let s:orange = "LightRed" " 1* - let s:red = "DarkRed" " 1 - let s:magenta = "DarkMagenta" " 5 - let s:violet = "LightMagenta" " 5* - let s:blue = "DarkBlue" " 4 - let s:cyan = "DarkCyan" " 6 - let s:green = "DarkGreen" " 2 - -endif -"}}} -" Formatting options and null values for passthrough effect "{{{ -" --------------------------------------------------------------------- - let s:none = "NONE" - let s:none = "NONE" - let s:t_none = "NONE" - let s:n = "NONE" - let s:c = ",undercurl" - let s:r = ",reverse" - let s:s = ",standout" - let s:ou = "" - let s:ob = "" -"}}} -" Background value based on termtrans setting "{{{ -" --------------------------------------------------------------------- -if (has("gui_running") || g:solarized_termtrans == 0) - let s:back = s:base03 -else - let s:back = "NONE" -endif -"}}} -" Alternate light scheme "{{{ -" --------------------------------------------------------------------- -if &background == "light" - let s:temp03 = s:base03 - let s:temp02 = s:base02 - let s:temp01 = s:base01 - let s:temp00 = s:base00 - let s:base03 = s:base3 - let s:base02 = s:base2 - let s:base01 = s:base1 - let s:base00 = s:base0 - let s:base0 = s:temp00 - let s:base1 = s:temp01 - let s:base2 = s:temp02 - let s:base3 = s:temp03 - if (s:back != "NONE") - let s:back = s:base03 - endif -endif -"}}} -" Optional contrast schemes "{{{ -" --------------------------------------------------------------------- -if g:solarized_contrast == "high" - let s:base01 = s:base00 - let s:base00 = s:base0 - let s:base0 = s:base1 - let s:base1 = s:base2 - let s:base2 = s:base3 - let s:back = s:back -endif -if g:solarized_contrast == "low" - let s:back = s:base02 - let s:ou = ",underline" -endif -"}}} -" Overrides dependent on user specified values and environment "{{{ -" --------------------------------------------------------------------- -if (g:solarized_bold == 0 || &t_Co == 8 ) - let s:b = "" - let s:bb = ",bold" -else - let s:b = ",bold" - let s:bb = "" -endif - -if g:solarized_underline == 0 - let s:u = "" -else - let s:u = ",underline" -endif - -if g:solarized_italic == 0 || s:terminal_italic == 0 - let s:i = "" -else - let s:i = ",italic" -endif -"}}} -" Highlighting primitives"{{{ -" --------------------------------------------------------------------- - -exe "let s:bg_none = ' ".s:vmode."bg=".s:none ."'" -exe "let s:bg_back = ' ".s:vmode."bg=".s:back ."'" -exe "let s:bg_base03 = ' ".s:vmode."bg=".s:base03 ."'" -exe "let s:bg_base02 = ' ".s:vmode."bg=".s:base02 ."'" -exe "let s:bg_base01 = ' ".s:vmode."bg=".s:base01 ."'" -exe "let s:bg_base00 = ' ".s:vmode."bg=".s:base00 ."'" -exe "let s:bg_base0 = ' ".s:vmode."bg=".s:base0 ."'" -exe "let s:bg_base1 = ' ".s:vmode."bg=".s:base1 ."'" -exe "let s:bg_base2 = ' ".s:vmode."bg=".s:base2 ."'" -exe "let s:bg_base3 = ' ".s:vmode."bg=".s:base3 ."'" -exe "let s:bg_green = ' ".s:vmode."bg=".s:green ."'" -exe "let s:bg_yellow = ' ".s:vmode."bg=".s:yellow ."'" -exe "let s:bg_orange = ' ".s:vmode."bg=".s:orange ."'" -exe "let s:bg_red = ' ".s:vmode."bg=".s:red ."'" -exe "let s:bg_magenta = ' ".s:vmode."bg=".s:magenta."'" -exe "let s:bg_violet = ' ".s:vmode."bg=".s:violet ."'" -exe "let s:bg_blue = ' ".s:vmode."bg=".s:blue ."'" -exe "let s:bg_cyan = ' ".s:vmode."bg=".s:cyan ."'" - -exe "let s:fg_none = ' ".s:vmode."fg=".s:none ."'" -exe "let s:fg_back = ' ".s:vmode."fg=".s:back ."'" -exe "let s:fg_base03 = ' ".s:vmode."fg=".s:base03 ."'" -exe "let s:fg_base02 = ' ".s:vmode."fg=".s:base02 ."'" -exe "let s:fg_base01 = ' ".s:vmode."fg=".s:base01 ."'" -exe "let s:fg_base00 = ' ".s:vmode."fg=".s:base00 ."'" -exe "let s:fg_base0 = ' ".s:vmode."fg=".s:base0 ."'" -exe "let s:fg_base1 = ' ".s:vmode."fg=".s:base1 ."'" -exe "let s:fg_base2 = ' ".s:vmode."fg=".s:base2 ."'" -exe "let s:fg_base3 = ' ".s:vmode."fg=".s:base3 ."'" -exe "let s:fg_green = ' ".s:vmode."fg=".s:green ."'" -exe "let s:fg_yellow = ' ".s:vmode."fg=".s:yellow ."'" -exe "let s:fg_orange = ' ".s:vmode."fg=".s:orange ."'" -exe "let s:fg_red = ' ".s:vmode."fg=".s:red ."'" -exe "let s:fg_magenta = ' ".s:vmode."fg=".s:magenta."'" -exe "let s:fg_violet = ' ".s:vmode."fg=".s:violet ."'" -exe "let s:fg_blue = ' ".s:vmode."fg=".s:blue ."'" -exe "let s:fg_cyan = ' ".s:vmode."fg=".s:cyan ."'" - -exe "let s:fmt_none = ' ".s:vmode."=NONE". " term=NONE". "'" -exe "let s:fmt_bold = ' ".s:vmode."=NONE".s:b. " term=NONE".s:b."'" -exe "let s:fmt_bldi = ' ".s:vmode."=NONE".s:b. " term=NONE".s:b."'" -exe "let s:fmt_undr = ' ".s:vmode."=NONE".s:u. " term=NONE".s:u."'" -exe "let s:fmt_undb = ' ".s:vmode."=NONE".s:u.s:b. " term=NONE".s:u.s:b."'" -exe "let s:fmt_undi = ' ".s:vmode."=NONE".s:u. " term=NONE".s:u."'" -exe "let s:fmt_uopt = ' ".s:vmode."=NONE".s:ou. " term=NONE".s:ou."'" -exe "let s:fmt_curl = ' ".s:vmode."=NONE".s:c. " term=NONE".s:c."'" -exe "let s:fmt_ital = ' ".s:vmode."=NONE".s:i. " term=NONE".s:i."'" -exe "let s:fmt_stnd = ' ".s:vmode."=NONE".s:s. " term=NONE".s:s."'" -exe "let s:fmt_revr = ' ".s:vmode."=NONE".s:r. " term=NONE".s:r."'" -exe "let s:fmt_revb = ' ".s:vmode."=NONE".s:r.s:b. " term=NONE".s:r.s:b."'" -" revbb (reverse bold for bright colors) is only set to actual bold in low -" color terminals (t_co=8, such as OS X Terminal.app) and should only be used -" with colors 8-15. -exe "let s:fmt_revbb = ' ".s:vmode."=NONE".s:r.s:bb. " term=NONE".s:r.s:bb."'" -exe "let s:fmt_revbbu = ' ".s:vmode."=NONE".s:r.s:bb.s:u." term=NONE".s:r.s:bb.s:u."'" - -if has("gui_running") - exe "let s:sp_none = ' guisp=".s:none ."'" - exe "let s:sp_back = ' guisp=".s:back ."'" - exe "let s:sp_base03 = ' guisp=".s:base03 ."'" - exe "let s:sp_base02 = ' guisp=".s:base02 ."'" - exe "let s:sp_base01 = ' guisp=".s:base01 ."'" - exe "let s:sp_base00 = ' guisp=".s:base00 ."'" - exe "let s:sp_base0 = ' guisp=".s:base0 ."'" - exe "let s:sp_base1 = ' guisp=".s:base1 ."'" - exe "let s:sp_base2 = ' guisp=".s:base2 ."'" - exe "let s:sp_base3 = ' guisp=".s:base3 ."'" - exe "let s:sp_green = ' guisp=".s:green ."'" - exe "let s:sp_yellow = ' guisp=".s:yellow ."'" - exe "let s:sp_orange = ' guisp=".s:orange ."'" - exe "let s:sp_red = ' guisp=".s:red ."'" - exe "let s:sp_magenta = ' guisp=".s:magenta."'" - exe "let s:sp_violet = ' guisp=".s:violet ."'" - exe "let s:sp_blue = ' guisp=".s:blue ."'" - exe "let s:sp_cyan = ' guisp=".s:cyan ."'" -else - let s:sp_none = "" - let s:sp_back = "" - let s:sp_base03 = "" - let s:sp_base02 = "" - let s:sp_base01 = "" - let s:sp_base00 = "" - let s:sp_base0 = "" - let s:sp_base1 = "" - let s:sp_base2 = "" - let s:sp_base3 = "" - let s:sp_green = "" - let s:sp_yellow = "" - let s:sp_orange = "" - let s:sp_red = "" - let s:sp_magenta = "" - let s:sp_violet = "" - let s:sp_blue = "" - let s:sp_cyan = "" -endif - -"}}} -" Basic highlighting"{{{ -" --------------------------------------------------------------------- -" note that link syntax to avoid duplicate configuration doesn't work with the -" exe compiled formats - -exe "hi! Normal" .s:fmt_none .s:fg_base0 .s:bg_back - -exe "hi! Comment" .s:fmt_ital .s:fg_base01 .s:bg_none -" *Comment any comment - -exe "hi! Constant" .s:fmt_none .s:fg_cyan .s:bg_none -" *Constant any constant -" String a string constant: "this is a string" -" Character a character constant: 'c', '\n' -" Number a number constant: 234, 0xff -" Boolean a boolean constant: TRUE, false -" Float a floating point constant: 2.3e10 - -exe "hi! Identifier" .s:fmt_none .s:fg_blue .s:bg_none -" *Identifier any variable name -" Function function name (also: methods for classes) -" -exe "hi! Statement" .s:fmt_none .s:fg_green .s:bg_none -" *Statement any statement -" Conditional if, then, else, endif, switch, etc. -" Repeat for, do, while, etc. -" Label case, default, etc. -" Operator "sizeof", "+", "*", etc. -" Keyword any other keyword -" Exception try, catch, throw - -exe "hi! PreProc" .s:fmt_none .s:fg_orange .s:bg_none -" *PreProc generic Preprocessor -" Include preprocessor #include -" Define preprocessor #define -" Macro same as Define -" PreCondit preprocessor #if, #else, #endif, etc. - -exe "hi! Type" .s:fmt_none .s:fg_yellow .s:bg_none -" *Type int, long, char, etc. -" StorageClass static, register, volatile, etc. -" Structure struct, union, enum, etc. -" Typedef A typedef - -exe "hi! Special" .s:fmt_none .s:fg_red .s:bg_none -" *Special any special symbol -" SpecialChar special character in a constant -" Tag you can use CTRL-] on this -" Delimiter character that needs attention -" SpecialComment special things inside a comment -" Debug debugging statements - -exe "hi! Underlined" .s:fmt_none .s:fg_violet .s:bg_none -" *Underlined text that stands out, HTML links - -exe "hi! Ignore" .s:fmt_none .s:fg_none .s:bg_none -" *Ignore left blank, hidden |hl-Ignore| - -exe "hi! Error" .s:fmt_bold .s:fg_red .s:bg_none -" *Error any erroneous construct - -exe "hi! Todo" .s:fmt_bold .s:fg_magenta.s:bg_none -" *Todo anything that needs extra attention; mostly the -" keywords TODO FIXME and XXX -" -"}}} -" Extended highlighting "{{{ -" --------------------------------------------------------------------- -if (g:solarized_visibility=="high") - exe "hi! SpecialKey" .s:fmt_revr .s:fg_red .s:bg_none - exe "hi! NonText" .s:fmt_bold .s:fg_red .s:bg_none -elseif (g:solarized_visibility=="low") - exe "hi! SpecialKey" .s:fmt_bold .s:fg_base02 .s:bg_none - exe "hi! NonText" .s:fmt_bold .s:fg_base02 .s:bg_none -else - exe "hi! SpecialKey" .s:fmt_bold .s:fg_base00 .s:bg_base02 - exe "hi! NonText" .s:fmt_bold .s:fg_base00 .s:bg_none -endif -exe "hi! StatusLine" .s:fmt_none .s:fg_base1 .s:bg_base02 .s:fmt_revbb -exe "hi! StatusLineNC" .s:fmt_none .s:fg_base00 .s:bg_base02 .s:fmt_revbb -exe "hi! Visual" .s:fmt_none .s:fg_base01 .s:bg_base03 .s:fmt_revbb -exe "hi! Directory" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! ErrorMsg" .s:fmt_revr .s:fg_red .s:bg_none -exe "hi! IncSearch" .s:fmt_stnd .s:fg_orange .s:bg_none -exe "hi! Search" .s:fmt_revr .s:fg_yellow .s:bg_none -exe "hi! MoreMsg" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! ModeMsg" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! LineNr" .s:fmt_none .s:fg_base01 .s:bg_base02 -exe "hi! Question" .s:fmt_bold .s:fg_cyan .s:bg_none -if ( has("gui_running") || &t_Co > 8 ) - exe "hi! VertSplit" .s:fmt_none .s:fg_base00 .s:bg_base00 -else - exe "hi! VertSplit" .s:fmt_revbb .s:fg_base00 .s:bg_base02 -endif -exe "hi! Title" .s:fmt_bold .s:fg_orange .s:bg_none -exe "hi! VisualNOS" .s:fmt_stnd .s:fg_none .s:bg_base02 .s:fmt_revbb -exe "hi! WarningMsg" .s:fmt_bold .s:fg_red .s:bg_none -exe "hi! WildMenu" .s:fmt_none .s:fg_base2 .s:bg_base02 .s:fmt_revbb -exe "hi! Folded" .s:fmt_undb .s:fg_base0 .s:bg_base02 .s:sp_base03 -exe "hi! FoldColumn" .s:fmt_none .s:fg_base0 .s:bg_base02 -if (g:solarized_diffmode=="high") -exe "hi! DiffAdd" .s:fmt_revr .s:fg_green .s:bg_none -exe "hi! DiffChange" .s:fmt_revr .s:fg_yellow .s:bg_none -exe "hi! DiffDelete" .s:fmt_revr .s:fg_red .s:bg_none -exe "hi! DiffText" .s:fmt_revr .s:fg_blue .s:bg_none -elseif (g:solarized_diffmode=="low") -exe "hi! DiffAdd" .s:fmt_undr .s:fg_green .s:bg_none .s:sp_green -exe "hi! DiffChange" .s:fmt_undr .s:fg_yellow .s:bg_none .s:sp_yellow -exe "hi! DiffDelete" .s:fmt_bold .s:fg_red .s:bg_none -exe "hi! DiffText" .s:fmt_undr .s:fg_blue .s:bg_none .s:sp_blue -else " normal - if has("gui_running") -exe "hi! DiffAdd" .s:fmt_bold .s:fg_green .s:bg_base02 .s:sp_green -exe "hi! DiffChange" .s:fmt_bold .s:fg_yellow .s:bg_base02 .s:sp_yellow -exe "hi! DiffDelete" .s:fmt_bold .s:fg_red .s:bg_base02 -exe "hi! DiffText" .s:fmt_bold .s:fg_blue .s:bg_base02 .s:sp_blue - else -exe "hi! DiffAdd" .s:fmt_none .s:fg_green .s:bg_base02 .s:sp_green -exe "hi! DiffChange" .s:fmt_none .s:fg_yellow .s:bg_base02 .s:sp_yellow -exe "hi! DiffDelete" .s:fmt_none .s:fg_red .s:bg_base02 -exe "hi! DiffText" .s:fmt_none .s:fg_blue .s:bg_base02 .s:sp_blue - endif -endif -exe "hi! SignColumn" .s:fmt_none .s:fg_base0 -exe "hi! Conceal" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! SpellBad" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_red -exe "hi! SpellCap" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_violet -exe "hi! SpellRare" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_cyan -exe "hi! SpellLocal" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_yellow -exe "hi! Pmenu" .s:fmt_none .s:fg_base0 .s:bg_base02 .s:fmt_revbb -exe "hi! PmenuSel" .s:fmt_none .s:fg_base01 .s:bg_base2 .s:fmt_revbb -exe "hi! PmenuSbar" .s:fmt_none .s:fg_base2 .s:bg_base0 .s:fmt_revbb -exe "hi! PmenuThumb" .s:fmt_none .s:fg_base0 .s:bg_base03 .s:fmt_revbb -exe "hi! TabLine" .s:fmt_undr .s:fg_base0 .s:bg_base02 .s:sp_base0 -exe "hi! TabLineFill" .s:fmt_undr .s:fg_base0 .s:bg_base02 .s:sp_base0 -exe "hi! TabLineSel" .s:fmt_undr .s:fg_base01 .s:bg_base2 .s:sp_base0 .s:fmt_revbbu -exe "hi! CursorColumn" .s:fmt_none .s:fg_none .s:bg_base02 -exe "hi! CursorLine" .s:fmt_uopt .s:fg_none .s:bg_base02 .s:sp_base1 -exe "hi! ColorColumn" .s:fmt_none .s:fg_none .s:bg_base02 -exe "hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base0 -hi! link lCursor Cursor -exe "hi! MatchParen" .s:fmt_bold .s:fg_red .s:bg_base01 - -"}}} -" vim syntax highlighting "{{{ -" --------------------------------------------------------------------- -"exe "hi! vimLineComment" . s:fg_base01 .s:bg_none .s:fmt_ital -"hi! link vimComment Comment -"hi! link vimLineComment Comment -hi! link vimVar Identifier -hi! link vimFunc Function -hi! link vimUserFunc Function -hi! link helpSpecial Special -hi! link vimSet Normal -hi! link vimSetEqual Normal -exe "hi! vimCommentString" .s:fmt_none .s:fg_violet .s:bg_none -exe "hi! vimCommand" .s:fmt_none .s:fg_yellow .s:bg_none -exe "hi! vimCmdSep" .s:fmt_bold .s:fg_blue .s:bg_none -exe "hi! helpExample" .s:fmt_none .s:fg_base1 .s:bg_none -exe "hi! helpOption" .s:fmt_none .s:fg_cyan .s:bg_none -exe "hi! helpNote" .s:fmt_none .s:fg_magenta.s:bg_none -exe "hi! helpVim" .s:fmt_none .s:fg_magenta.s:bg_none -exe "hi! helpHyperTextJump" .s:fmt_undr .s:fg_blue .s:bg_none -exe "hi! helpHyperTextEntry".s:fmt_none .s:fg_green .s:bg_none -exe "hi! vimIsCommand" .s:fmt_none .s:fg_base00 .s:bg_none -exe "hi! vimSynMtchOpt" .s:fmt_none .s:fg_yellow .s:bg_none -exe "hi! vimSynType" .s:fmt_none .s:fg_cyan .s:bg_none -exe "hi! vimHiLink" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! vimHiGroup" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! vimGroup" .s:fmt_undb .s:fg_blue .s:bg_none -"}}} -" diff highlighting "{{{ -" --------------------------------------------------------------------- -hi! link diffAdded Statement -hi! link diffLine Identifier -"}}} -" git & gitcommit highlighting "{{{ -"git -"exe "hi! gitDateHeader" -"exe "hi! gitIdentityHeader" -"exe "hi! gitIdentityKeyword" -"exe "hi! gitNotesHeader" -"exe "hi! gitReflogHeader" -"exe "hi! gitKeyword" -"exe "hi! gitIdentity" -"exe "hi! gitEmailDelimiter" -"exe "hi! gitEmail" -"exe "hi! gitDate" -"exe "hi! gitMode" -"exe "hi! gitHashAbbrev" -"exe "hi! gitHash" -"exe "hi! gitReflogMiddle" -"exe "hi! gitReference" -"exe "hi! gitStage" -"exe "hi! gitType" -"exe "hi! gitDiffAdded" -"exe "hi! gitDiffRemoved" -"gitcommit -"exe "hi! gitcommitSummary" -exe "hi! gitcommitComment" .s:fmt_ital .s:fg_base01 .s:bg_none -hi! link gitcommitUntracked gitcommitComment -hi! link gitcommitDiscarded gitcommitComment -hi! link gitcommitSelected gitcommitComment -exe "hi! gitcommitUnmerged" .s:fmt_bold .s:fg_green .s:bg_none -exe "hi! gitcommitOnBranch" .s:fmt_bold .s:fg_base01 .s:bg_none -exe "hi! gitcommitBranch" .s:fmt_bold .s:fg_magenta .s:bg_none -hi! link gitcommitNoBranch gitcommitBranch -exe "hi! gitcommitDiscardedType".s:fmt_none .s:fg_red .s:bg_none -exe "hi! gitcommitSelectedType" .s:fmt_none .s:fg_green .s:bg_none -"exe "hi! gitcommitUnmergedType" -"exe "hi! gitcommitType" -"exe "hi! gitcommitNoChanges" -"exe "hi! gitcommitHeader" -exe "hi! gitcommitHeader" .s:fmt_none .s:fg_base01 .s:bg_none -exe "hi! gitcommitUntrackedFile".s:fmt_bold .s:fg_cyan .s:bg_none -exe "hi! gitcommitDiscardedFile".s:fmt_bold .s:fg_red .s:bg_none -exe "hi! gitcommitSelectedFile" .s:fmt_bold .s:fg_green .s:bg_none -exe "hi! gitcommitUnmergedFile" .s:fmt_bold .s:fg_yellow .s:bg_none -exe "hi! gitcommitFile" .s:fmt_bold .s:fg_base0 .s:bg_none -hi! link gitcommitDiscardedArrow gitcommitDiscardedFile -hi! link gitcommitSelectedArrow gitcommitSelectedFile -hi! link gitcommitUnmergedArrow gitcommitUnmergedFile -"exe "hi! gitcommitArrow" -"exe "hi! gitcommitOverflow" -"exe "hi! gitcommitBlank" -" }}} -" html highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! htmlTag" .s:fmt_none .s:fg_base01 .s:bg_none -exe "hi! htmlEndTag" .s:fmt_none .s:fg_base01 .s:bg_none -exe "hi! htmlTagN" .s:fmt_bold .s:fg_base1 .s:bg_none -exe "hi! htmlTagName" .s:fmt_bold .s:fg_blue .s:bg_none -exe "hi! htmlSpecialTagName".s:fmt_ital .s:fg_blue .s:bg_none -exe "hi! htmlArg" .s:fmt_none .s:fg_base00 .s:bg_none -exe "hi! javaScript" .s:fmt_none .s:fg_yellow .s:bg_none -"}}} -" perl highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! perlHereDoc" . s:fg_base1 .s:bg_back .s:fmt_none -exe "hi! perlVarPlain" . s:fg_yellow .s:bg_back .s:fmt_none -exe "hi! perlStatementFileDesc". s:fg_cyan.s:bg_back.s:fmt_none - -"}}} -" tex highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! texStatement" . s:fg_cyan .s:bg_back .s:fmt_none -exe "hi! texMathZoneX" . s:fg_yellow .s:bg_back .s:fmt_none -exe "hi! texMathMatcher" . s:fg_yellow .s:bg_back .s:fmt_none -exe "hi! texMathMatcher" . s:fg_yellow .s:bg_back .s:fmt_none -exe "hi! texRefLabel" . s:fg_yellow .s:bg_back .s:fmt_none -"}}} -" ruby highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! rubyDefine" . s:fg_base1 .s:bg_back .s:fmt_bold -"rubyInclude -"rubySharpBang -"rubyAccess -"rubyPredefinedVariable -"rubyBoolean -"rubyClassVariable -"rubyBeginEnd -"rubyRepeatModifier -"hi! link rubyArrayDelimiter Special " [ , , ] -"rubyCurlyBlock { , , } - -"hi! link rubyClass Keyword -"hi! link rubyModule Keyword -"hi! link rubyKeyword Keyword -"hi! link rubyOperator Operator -"hi! link rubyIdentifier Identifier -"hi! link rubyInstanceVariable Identifier -"hi! link rubyGlobalVariable Identifier -"hi! link rubyClassVariable Identifier -"hi! link rubyConstant Type -"}}} -" haskell syntax highlighting"{{{ -" --------------------------------------------------------------------- -" For use with syntax/haskell.vim : Haskell Syntax File -" http://www.vim.org/scripts/script.php?script_id=3034 -" See also Steffen Siering's github repository: -" http://github.com/urso/dotrc/blob/master/vim/syntax/haskell.vim -" --------------------------------------------------------------------- -" -" Treat True and False specially, see the plugin referenced above -let hs_highlight_boolean=1 -" highlight delims, see the plugin referenced above -let hs_highlight_delimiters=1 - -exe "hi! cPreCondit". s:fg_orange.s:bg_none .s:fmt_none - -exe "hi! VarId" . s:fg_blue .s:bg_none .s:fmt_none -exe "hi! ConId" . s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! hsImport" . s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! hsString" . s:fg_base00 .s:bg_none .s:fmt_none - -exe "hi! hsStructure" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hs_hlFunctionName" . s:fg_blue .s:bg_none -exe "hi! hsStatement" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hsImportLabel" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hs_OpFunctionName" . s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! hs_DeclareFunction" . s:fg_orange .s:bg_none .s:fmt_none -exe "hi! hsVarSym" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hsType" . s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! hsTypedef" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hsModuleName" . s:fg_green .s:bg_none .s:fmt_undr -exe "hi! hsModuleStartLabel" . s:fg_magenta.s:bg_none .s:fmt_none -hi! link hsImportParams Delimiter -hi! link hsDelimTypeExport Delimiter -hi! link hsModuleStartLabel hsStructure -hi! link hsModuleWhereLabel hsModuleStartLabel - -" following is for the haskell-conceal plugin -" the first two items don't have an impact, but better safe -exe "hi! hsNiceOperator" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hsniceoperator" . s:fg_cyan .s:bg_none .s:fmt_none - -"}}} -" pandoc markdown syntax highlighting "{{{ -" --------------------------------------------------------------------- - -"PandocHiLink pandocNormalBlock -exe "hi! pandocTitleBlock" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocTitleBlockTitle" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocTitleComment" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocComment" .s:fg_base01 .s:bg_none .s:fmt_ital -exe "hi! pandocVerbatimBlock" .s:fg_yellow .s:bg_none .s:fmt_none -hi! link pandocVerbatimBlockDeep pandocVerbatimBlock -hi! link pandocCodeBlock pandocVerbatimBlock -hi! link pandocCodeBlockDelim pandocVerbatimBlock -exe "hi! pandocBlockQuote" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader1" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader2" .s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader3" .s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader4" .s:fg_red .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader5" .s:fg_base0 .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader6" .s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! pandocListMarker" .s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! pandocListReference" .s:fg_magenta.s:bg_none .s:fmt_undr - -" Definitions -" --------------------------------------------------------------------- -let s:fg_pdef = s:fg_violet -exe "hi! pandocDefinitionBlock" .s:fg_pdef .s:bg_none .s:fmt_none -exe "hi! pandocDefinitionTerm" .s:fg_pdef .s:bg_none .s:fmt_stnd -exe "hi! pandocDefinitionIndctr" .s:fg_pdef .s:bg_none .s:fmt_bold -exe "hi! pandocEmphasisDefinition" .s:fg_pdef .s:bg_none .s:fmt_ital -exe "hi! pandocEmphasisNestedDefinition" .s:fg_pdef .s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasisDefinition" .s:fg_pdef .s:bg_none .s:fmt_bold -exe "hi! pandocStrongEmphasisNestedDefinition" .s:fg_pdef.s:bg_none.s:fmt_bldi -exe "hi! pandocStrongEmphasisEmphasisDefinition" .s:fg_pdef.s:bg_none.s:fmt_bldi -exe "hi! pandocStrikeoutDefinition" .s:fg_pdef .s:bg_none .s:fmt_revr -exe "hi! pandocVerbatimInlineDefinition" .s:fg_pdef .s:bg_none .s:fmt_none -exe "hi! pandocSuperscriptDefinition" .s:fg_pdef .s:bg_none .s:fmt_none -exe "hi! pandocSubscriptDefinition" .s:fg_pdef .s:bg_none .s:fmt_none - -" Tables -" --------------------------------------------------------------------- -let s:fg_ptable = s:fg_blue -exe "hi! pandocTable" .s:fg_ptable.s:bg_none .s:fmt_none -exe "hi! pandocTableStructure" .s:fg_ptable.s:bg_none .s:fmt_none -hi! link pandocTableStructureTop pandocTableStructre -hi! link pandocTableStructureEnd pandocTableStructre -exe "hi! pandocTableZebraLight" .s:fg_ptable.s:bg_base03.s:fmt_none -exe "hi! pandocTableZebraDark" .s:fg_ptable.s:bg_base02.s:fmt_none -exe "hi! pandocEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_ital -exe "hi! pandocEmphasisNestedTable" .s:fg_ptable.s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_bold -exe "hi! pandocStrongEmphasisNestedTable" .s:fg_ptable.s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasisEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_bldi -exe "hi! pandocStrikeoutTable" .s:fg_ptable.s:bg_none .s:fmt_revr -exe "hi! pandocVerbatimInlineTable" .s:fg_ptable.s:bg_none .s:fmt_none -exe "hi! pandocSuperscriptTable" .s:fg_ptable.s:bg_none .s:fmt_none -exe "hi! pandocSubscriptTable" .s:fg_ptable.s:bg_none .s:fmt_none - -" Headings -" --------------------------------------------------------------------- -let s:fg_phead = s:fg_orange -exe "hi! pandocHeading" .s:fg_phead .s:bg_none.s:fmt_bold -exe "hi! pandocHeadingMarker" .s:fg_yellow.s:bg_none.s:fmt_bold -exe "hi! pandocEmphasisHeading" .s:fg_phead .s:bg_none.s:fmt_bldi -exe "hi! pandocEmphasisNestedHeading" .s:fg_phead .s:bg_none.s:fmt_bldi -exe "hi! pandocStrongEmphasisHeading" .s:fg_phead .s:bg_none.s:fmt_bold -exe "hi! pandocStrongEmphasisNestedHeading" .s:fg_phead .s:bg_none.s:fmt_bldi -exe "hi! pandocStrongEmphasisEmphasisHeading".s:fg_phead .s:bg_none.s:fmt_bldi -exe "hi! pandocStrikeoutHeading" .s:fg_phead .s:bg_none.s:fmt_revr -exe "hi! pandocVerbatimInlineHeading" .s:fg_phead .s:bg_none.s:fmt_bold -exe "hi! pandocSuperscriptHeading" .s:fg_phead .s:bg_none.s:fmt_bold -exe "hi! pandocSubscriptHeading" .s:fg_phead .s:bg_none.s:fmt_bold - -" Links -" --------------------------------------------------------------------- -exe "hi! pandocLinkDelim" .s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! pandocLinkLabel" .s:fg_blue .s:bg_none .s:fmt_undr -exe "hi! pandocLinkText" .s:fg_blue .s:bg_none .s:fmt_undb -exe "hi! pandocLinkURL" .s:fg_base00 .s:bg_none .s:fmt_undr -exe "hi! pandocLinkTitle" .s:fg_base00 .s:bg_none .s:fmt_undi -exe "hi! pandocLinkTitleDelim" .s:fg_base01 .s:bg_none .s:fmt_undi .s:sp_base00 -exe "hi! pandocLinkDefinition" .s:fg_cyan .s:bg_none .s:fmt_undr .s:sp_base00 -exe "hi! pandocLinkDefinitionID" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocImageCaption" .s:fg_violet .s:bg_none .s:fmt_undb -exe "hi! pandocFootnoteLink" .s:fg_green .s:bg_none .s:fmt_undr -exe "hi! pandocFootnoteDefLink" .s:fg_green .s:bg_none .s:fmt_bold -exe "hi! pandocFootnoteInline" .s:fg_green .s:bg_none .s:fmt_undb -exe "hi! pandocFootnote" .s:fg_green .s:bg_none .s:fmt_none -exe "hi! pandocCitationDelim" .s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! pandocCitation" .s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! pandocCitationID" .s:fg_magenta.s:bg_none .s:fmt_undr -exe "hi! pandocCitationRef" .s:fg_magenta.s:bg_none .s:fmt_none - -" Main Styles -" --------------------------------------------------------------------- -exe "hi! pandocStyleDelim" .s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! pandocEmphasis" .s:fg_base0 .s:bg_none .s:fmt_ital -exe "hi! pandocEmphasisNested" .s:fg_base0 .s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasis" .s:fg_base0 .s:bg_none .s:fmt_bold -exe "hi! pandocStrongEmphasisNested" .s:fg_base0 .s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasisEmphasis" .s:fg_base0 .s:bg_none .s:fmt_bldi -exe "hi! pandocStrikeout" .s:fg_base01 .s:bg_none .s:fmt_revr -exe "hi! pandocVerbatimInline" .s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! pandocSuperscript" .s:fg_violet .s:bg_none .s:fmt_none -exe "hi! pandocSubscript" .s:fg_violet .s:bg_none .s:fmt_none - -exe "hi! pandocRule" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocRuleLine" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocEscapePair" .s:fg_red .s:bg_none .s:fmt_bold -exe "hi! pandocCitationRef" .s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! pandocNonBreakingSpace" . s:fg_red .s:bg_none .s:fmt_revr -hi! link pandocEscapedCharacter pandocEscapePair -hi! link pandocLineBreak pandocEscapePair - -" Embedded Code -" --------------------------------------------------------------------- -exe "hi! pandocMetadataDelim" .s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! pandocMetadata" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocMetadataKey" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocMetadata" .s:fg_blue .s:bg_none .s:fmt_bold -hi! link pandocMetadataTitle pandocMetadata - -"}}} -" Utility autocommand "{{{ -" --------------------------------------------------------------------- -" In cases where Solarized is initialized inside a terminal vim session and -" then transferred to a gui session via the command `:gui`, the gui vim process -" does not re-read the colorscheme (or .vimrc for that matter) so any `has_gui` -" related code that sets gui specific values isn't executed. -" -" Currently, Solarized sets only the cterm or gui values for the colorscheme -" depending on gui or terminal mode. It's possible that, if the following -" autocommand method is deemed excessively poor form, that approach will be -" used again and the autocommand below will be dropped. -" -" However it seems relatively benign in this case to include the autocommand -" here. It fires only in cases where vim is transferring from terminal to gui -" mode (detected with the script scope s:vmode variable). It also allows for -" other potential terminal customizations that might make gui mode suboptimal. -" -autocmd GUIEnter * if (s:vmode != "gui") | exe "colorscheme " . g:colors_name | endif -"}}} -" Highlight Trailing Space {{{ -" Experimental: Different highlight when on cursorline -function! s:SolarizedHiTrail() - if g:solarized_hitrail==0 - hi! clear solarizedTrailingSpace - else - syn match solarizedTrailingSpace "\s*$" - exe "hi! solarizedTrailingSpace " .s:fmt_undr .s:fg_red .s:bg_none .s:sp_red - endif -endfunction -augroup SolarizedHiTrail - autocmd! - if g:solarized_hitrail==1 - autocmd! Syntax * call s:SolarizedHiTrail() - autocmd! ColorScheme * if g:colors_name == "solarized" | call s:SolarizedHiTrail() | else | augroup! s:SolarizedHiTrail | endif - endif -augroup END -" }}} -" Menus "{{{ -" --------------------------------------------------------------------- -" Turn off Solarized menu by including the following assignment in your .vimrc: -" -" let g:solarized_menu=0 - -function! s:SolarizedOptions() - new "new buffer - setf vim "vim filetype - let failed = append(0, s:defaults_list) - let failed = append(0, s:colorscheme_list) - let failed = append(0, s:options_list) - let failed = append(0, s:lazycat_list) - 0 "jump back to the top -endfunction -if !exists(":SolarizedOptions") - command SolarizedOptions :call s:SolarizedOptions() -endif - -function! SolarizedMenu() - if exists("g:loaded_solarized_menu") - try - silent! aunmenu Solarized - endtry - endif - let g:loaded_solarized_menu = 1 - - if g:colors_name == "solarized" && g:solarized_menu != 0 - - amenu &Solarized.&Contrast.&Low\ Contrast :let g:solarized_contrast="low" \| colorscheme solarized - amenu &Solarized.&Contrast.&Normal\ Contrast :let g:solarized_contrast="normal" \| colorscheme solarized - amenu &Solarized.&Contrast.&High\ Contrast :let g:solarized_contrast="high" \| colorscheme solarized - an &Solarized.&Contrast.-sep- - amenu &Solarized.&Contrast.&Help:\ Contrast :help 'solarized_contrast' - - amenu &Solarized.&Visibility.&Low\ Visibility :let g:solarized_visibility="low" \| colorscheme solarized - amenu &Solarized.&Visibility.&Normal\ Visibility :let g:solarized_visibility="normal" \| colorscheme solarized - amenu &Solarized.&Visibility.&High\ Visibility :let g:solarized_visibility="high" \| colorscheme solarized - an &Solarized.&Visibility.-sep- - amenu &Solarized.&Visibility.&Help:\ Visibility :help 'solarized_visibility' - - amenu &Solarized.&Background.&Toggle\ Background :ToggleBG - amenu &Solarized.&Background.&Dark\ Background :set background=dark \| colorscheme solarized - amenu &Solarized.&Background.&Light\ Background :set background=light \| colorscheme solarized - an &Solarized.&Background.-sep- - amenu &Solarized.&Background.&Help:\ ToggleBG :help togglebg - - if g:solarized_bold==0 | let l:boldswitch="On" | else | let l:boldswitch="Off" | endif - exe "amenu &Solarized.&Styling.&Turn\\ Bold\\ ".l:boldswitch." :let g:solarized_bold=(abs(g:solarized_bold-1)) \\| colorscheme solarized" - if g:solarized_italic==0 | let l:italicswitch="On" | else | let l:italicswitch="Off" | endif - exe "amenu &Solarized.&Styling.&Turn\\ Italic\\ ".l:italicswitch." :let g:solarized_italic=(abs(g:solarized_italic-1)) \\| colorscheme solarized" - if g:solarized_underline==0 | let l:underlineswitch="On" | else | let l:underlineswitch="Off" | endif - exe "amenu &Solarized.&Styling.&Turn\\ Underline\\ ".l:underlineswitch." :let g:solarized_underline=(abs(g:solarized_underline-1)) \\| colorscheme solarized" - - amenu &Solarized.&Diff\ Mode.&Low\ Diff\ Mode :let g:solarized_diffmode="low" \| colorscheme solarized - amenu &Solarized.&Diff\ Mode.&Normal\ Diff\ Mode :let g:solarized_diffmode="normal" \| colorscheme solarized - amenu &Solarized.&Diff\ Mode.&High\ Diff\ Mode :let g:solarized_diffmode="high" \| colorscheme solarized - - if g:solarized_hitrail==0 | let l:hitrailswitch="On" | else | let l:hitrailswitch="Off" | endif - exe "amenu &Solarized.&Experimental.&Turn\\ Highlight\\ Trailing\\ Spaces\\ ".l:hitrailswitch." :let g:solarized_hitrail=(abs(g:solarized_hitrail-1)) \\| colorscheme solarized" - an &Solarized.&Experimental.-sep- - amenu &Solarized.&Experimental.&Help:\ HiTrail :help 'solarized_hitrail' - - an &Solarized.-sep1- - - amenu &Solarized.&Autogenerate\ options :SolarizedOptions - - an &Solarized.-sep2- - - amenu &Solarized.&Help.&Solarized\ Help :help solarized - amenu &Solarized.&Help.&Toggle\ Background\ Help :help togglebg - amenu &Solarized.&Help.&Removing\ This\ Menu :help solarized-menu - - an 9999.77 &Help.&Solarized\ Colorscheme :help solarized - an 9999.78 &Help.&Toggle\ Background :help togglebg - an 9999.79 &Help.-sep3- - - endif -endfunction - -autocmd ColorScheme * if g:colors_name != "solarized" | silent! aunmenu Solarized | else | call SolarizedMenu() | endif - -"}}} -" License "{{{ -" --------------------------------------------------------------------- -" -" Copyright (c) 2011 Ethan Schoonover -" -" Permission is hereby granted, free of charge, to any person obtaining a copy -" of this software and associated documentation files (the "Software"), to deal -" in the Software without restriction, including without limitation the rights -" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -" copies of the Software, and to permit persons to whom the Software is -" furnished to do so, subject to the following conditions: -" -" The above copyright notice and this permission notice shall be included in -" all copies or substantial portions of the Software. -" -" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -" THE SOFTWARE. -" -" vim:foldmethod=marker:foldlevel=0 -"}}} diff --git a/vim/vim/pack/plugins/start/vim-commentary b/vim/vim/pack/plugins/start/vim-commentary deleted file mode 160000 index 141d9d3..0000000 --- a/vim/vim/pack/plugins/start/vim-commentary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a diff --git a/vim/vim/pack/plugins/start/vim-fugitive b/vim/vim/pack/plugins/start/vim-fugitive deleted file mode 160000 index 7df9f07..0000000 --- a/vim/vim/pack/plugins/start/vim-fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7df9f07e1fd53d560f2e352d5faa3eba92cd1582 diff --git a/vim/vim/pack/plugins/start/vim-polyglot b/vim/vim/pack/plugins/start/vim-polyglot deleted file mode 160000 index 3ddca5d..0000000 --- a/vim/vim/pack/plugins/start/vim-polyglot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3ddca5da461ebfaa82104f82e3cbf19d1c326ade diff --git a/vim/vim/pack/plugins/start/vim-unimpaired b/vim/vim/pack/plugins/start/vim-unimpaired deleted file mode 160000 index a49c4f2..0000000 --- a/vim/vim/pack/plugins/start/vim-unimpaired +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a49c4f2bf05f18a6e4f6572a19763ba7abba52b1 diff --git a/vim/vim/templates/journal b/vim/vim/templates/journal deleted file mode 100644 index a51c8b9..0000000 --- a/vim/vim/templates/journal +++ /dev/null @@ -1,7 +0,0 @@ -= Date = - -== Quote == - -== Recap == - -== Notes == diff --git a/vim/vimrc b/vim/vimrc index 11624a7..684beaf 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -1,7 +1,6 @@ " ============================================================================== " vimrc file for niblock :: Use `:so %` to re-source after changes " ============================================================================== - " ============================================================================== " General Settings " ============================================================================== @@ -45,95 +44,43 @@ set nohlsearch " Disable search highlighting let g:netrw_liststyle=3 " Netrw Tree list style let g:netrw_banner=0 " Disable the netrw banner - -augroup ruby_settings " Custom settings: Ruby{-like} - autocmd! - autocmd FileType ruby,eruby,yaml - \ setlocal makeprg=rubocop -augroup END - -augroup python_settings " Custom settings: Python-like - autocmd! - autocmd FileType py - \ setlocal shiftwidth=4 - \ softtabstop=4 -augroup END - -augroup shell_settings " Custom settings: Shell-like - autocmd! - autocmd FileType sh - \ setlocal makeprg=shellcheck -augroup END - -augroup spellcheckr " Spelling, for some files... - autocmd! - autocmd BufNewFile,BufRead *.md,*.rdoc,*.txt,*.wiki - \ setlocal spell -augroup END - -augroup lintr " Linting, based on :make! - autocmd! - autocmd BufWritePost *.rb,*.sh - \ silent make! | silent redraw! - autocmd QuickFixCmdPost [^l]* cwindow -augroup END " ============================================================================== -" Colors +" Colors [VIM Only] " ============================================================================== -augroup user_stl_colors " Custom status-line colors - autocmd! - autocmd ColorScheme * - \ hi User1 term=bold cterm=bold ctermfg=Red ctermbg=DarkGrey | - \ hi User2 term=bold cterm=bold ctermfg=Cyan ctermbg=DarkGrey | - \ hi User3 term=bold cterm=bold ctermfg=White ctermbg=DarkGrey | - \ hi User4 ctermfg=White ctermbg=Black | - \ hi User5 ctermfg=150 ctermbg=Black | - \ hi User6 ctermfg=Grey ctermbg=Black -augroup END +if !has('nvim') + set termguicolors " Enable fancy colors -if filereadable(expand('~/.vim/colors/minimalist.vim')) - colorscheme minimalist " Set colorscheme + if filereadable(expand('~/.config/vim/colors/catppuccin_frappe.vim')) + colorscheme catppuccin_frappe " Set colorscheme, if available + endif + + hi link User1 Directory " Set User statusline colors + hi link User2 Title " Used as '%n*', n = 1..6 + hi link User3 SpellBad " See :hi for colors + hi link User4 Added + hi link User5 Changed + hi link User6 Removed endif " ============================================================================== -" Status Line +" Status Line [VIM Only] " ============================================================================== -set laststatus=2 " Enable the statusline -set statusline=%!ActiveStatus() " Style it +if !has('nvim') + set laststatus=2 " Enable the statusline + set statusline=%!SLine() " Style it -function! ActiveStatus() abort " When in the active window - let statusline="" " Initialize it - let statusline.="%3*%m" " Modified flag - let statusline.="%6*%{expand('%:p:h')}/" " Full-path to current buffer - let statusline.="%4*%t" " File name - let statusline.="%5*%{GitBranch()}" " Show Git branch, if applicable - let statusline.="%=" " Switch to right-side - let statusline.="%4*%y\ " " Filetype - let statusline.="%3*" " Color change (see :hi) - let statusline.="\|%4l\:%2c\|" " Line and column - let statusline.="%2*%{&spell?'[SPELL]':''}" " Spell flag - let statusline.="%1*%r%0*" " Read-only flag - return statusline -endfunction - -function! PassiveStatus() abort " When in a non-active window - let statusline="" " Initialize it - let statusline.="%6*%m" " Modified flag - let statusline.="%{expand('%:p:h')}/" " Full-path to current buffer - let statusline.="%t" " File name - let statusline.="%{GitBranch()}" " Show Git branch, if applicable - let statusline.="%=" " Switch to right-side - let statusline.="%y\ " " Filetype - let statusline.="\|%4l\:%2c\|" " Line and column - let statusline.="%{&spell?'[SPELL]':''}" " Spell flag - let statusline.="%r%0*" " Read-only flag - return statusline -endfunction - -augroup user_statusline " Change based on active window - autocmd! - autocmd WinEnter * setlocal statusline=%!ActiveStatus() - autocmd WinLeave * setlocal statusline=%!PassiveStatus() -augroup END + function! SLine() abort + let sline="" " Initialize it + let sline.="%3*%m" " Modified flag + let sline.="%1*%{expand('%:p:h')}/" " Full-path to current buffer + let sline.="%2*%t" " File name + let sline.="%=" " Switch to right-side + let sline.="%4*%y\ " " Filetype + let sline.="%5*%{&spell?'[SPELL]':''}" " Spell flag + let sline.="%6*%r" " Read-only flag + let sline.="%1*\|%4l\:%2c\|" " Line and column + return sline + endfunction +endif " ============================================================================== " Mappings " ============================================================================== @@ -143,70 +90,10 @@ nnoremap j gj nnoremap k gk nnoremap ^ g^ nnoremap $ g$ -" Toggle fold with space if we're in a fold, otherwise just space -nnoremap @=(foldlevel('.')?'za':"\") -vnoremap zf " Allow saving of files as sudo when I forgot to start vim using sudo. cmap w!! w !sudo tee > /dev/null % " Remove Trailing Whitespaace nnoremap rtw :%s/\s\+$//e -" Open help topic in a full new tab -command! -nargs=1 -complete=help H :tabnew | :set buftype=help | :h -" Simple mapping to dotfiles directory (f = current tab; F = new tab) -nnoremap f :edit ~/.dotfiles/ -nnoremap F :tabnew ~/.dotfiles/ " Emulate vim-vinegar nnoremap - :silent edit =empty(expand('%')) ? '.' : \ expand('%:p:h') -" Send the select range to the specified pane -command! -nargs=? -range Twrite execute TmuxWrite(, , ) -" Some notes/wiki shortcuts -nnoremap ww :edit ~/Documents/Wiki/index.md -nnoremap ws :vsplit ~/Documents/Wiki/scratchpad.md -nnoremap wt :vsplit ~/Documents/Wiki/to-do.md -nnoremap wd :edit ~/Documents/Wiki/diary/diary.wiki -nnoremap tj :call NewJournal() -nnoremap :execute "normal! f(gf" -" ============================================================================== -" Functions -" ============================================================================== -" Read from the journal template, and replace 'Date' with today's date -function! NewJournal() abort - .-1read ~/.vim/templates/journal - s/Date/\=strftime("%A, %B %d")/ -endfunction -" Fetch the git branch of the current file, if applicable -function! GitBranch() abort - let l:branchname = system("git rev-parse --abbrev-ref HEAD 2>/dev/null - \ | tr -d '\n'") - return strlen(l:branchname) > 0 ? '#'.l:branchname : '' -endfunction -" Simple tmux send-keys functionality -function! TmuxWrite(pane, line1, line2) abort - let l:val = join(filter(map(getline(a:line1, a:line2), - \ 'substitute(v:val, "^\\s*", "", "")'), - \ "!empty(v:val)"), - \ "\r") - try - if empty(a:pane) - throw 'Twrite Failed: No pane provided' - endif - let l:panes = systemlist('tmux list-panes -t '.a:pane.' -F "#D - \ #{pane_active}"') - let l:target = substitute( - \join(filter(l:panes, 'match(v:val, ''%\d 1'') == 0'), ""), - \'\(%\d\) 1', '\1', "") - if l:target ==# $TMUX_PANE - throw 'Twrite Failed: Not writing self' - endif - let l:out = system('tmux send-keys -t'.l:target.' "" ' - \.shellescape(l:val)) - if v:shell_error - throw 'Twrite Failed: '.l:out[0:-2] - endif - echo len(l:val).' keys sent to '.a:pane - return '' - catch /.*/ - return 'echoerr '.string(v:exception) - endtry -endfunction