Use monospace alias for fonts, remove menu clutter

This commit is contained in:
natemaia
2018-12-02 20:19:37 -08:00
parent 26b202b69f
commit 25d560d149
60 changed files with 313 additions and 4428 deletions

View File

@ -1,22 +1,17 @@
" ------------------- jinx ---------------------- "
" Written by Nathaniel Maia, December 2017 "
" ----------------------------------------------- "
" vim:fdm=marker
" ---------- Setup and Checks ----------- " {{{1
" Pre {{{2
if !has('gui_running') && &t_Co != 256
finish
endif
if exists('syntax_on')
highlight clear
syntax reset
highlight clear
syntax reset
endif
let g:colors_name = 'jinx'
" Colors {{{1
" empty color dictionary
@ -25,71 +20,136 @@ let s:jinx = {}
" NOTE: For those looking to edit the theme
"
" Color definition is done for both true color
" and 256 color. The format is in ['HEX', 256color]
" and 256 color. The format is in ['HEX', 256color, 16color]
"
" eg. let s:jinx.black = ['#000000', 0]
" let s:jinx.black = ['#000000', 0, 0]
" completion menu, wildmenu, and status/tab lines
let s:jinx.menu_bgr = ['#2c3135', 238]
let s:jinx.menu_fgr = ['#808080', 102]
let s:jinx.menusel_bgr = ['#1F2326', 235]
let s:jinx.menusel_fgr = ['#E1E1E1', 251]
let s:jinx.menualt_fgr = ['#E1E1E1', 251]
let s:jinx.menualt_bgr = ['#37383D', 237]
let s:jinx.tabsel_bgr = ['#8DBC8D', 108]
let s:jinx.menu_bgr = ['#4D5057', 238, 8]
let s:jinx.menu_fgr = ['#808080', 102, 15]
let s:jinx.menusel_bgr = ['#1F2326', 235, 0]
let s:jinx.menusel_fgr = ['#E1E1E1', 251, 7]
let s:jinx.menualt_fgr = ['#E1E1E1', 251, 7]
let s:jinx.menualt_bgr = ['#37383D', 237, 0]
let s:jinx.tabsel_bgr = ['#8DBC8D', 108, 2]
" background, foreground, line, visual selection, folds, and comments
" as well as standard 1-7 colors:
" red, green, yellow, blue, purple, cyan, and orange (instead of white)
if exists('g:jinx_colors') && g:jinx_colors =~? 'day'
" terminal colours for :terminal {{{
let g:terminal_ansi_colors = [
\ '#4D545E', '#FF777A', '#8DBC8D', '#FFEB56', '#6699CC', '#CC99CC', '#5DD5FF', '#E1E1E1',
\ '#4D545E', '#FF777A', '#8DBC8D', '#FFEB56', '#6699CC', '#CC99CC', '#5DD5FF', '#E1E1E1'
\ ]
let s:i = 0
for s:color in g:terminal_ansi_colors
let g:terminal_color_{s:i} = s:color
let s:i += 1
endfor
"}}}
" background, foreground, line, visual selection, folds,
" and comments as well as standard 1-7 colors: red, green,
" yellow, blue, purple, cyan, and orange (instead of white)
if exists('g:jinx_colors') && g:jinx_colors =~? 'day' "{{{
set background=light
let s:jinx.fgr = ['#494949', 238]
let s:jinx.bgr = ['#E1E1E1', 255]
let s:jinx.line = ['#D0D0D0', 252]
let s:jinx.select = ['#D0D0D0', 252]
let s:jinx.folded = ['#B2B2B2', 249]
let s:jinx.commnt = ['#808080', 244]
let s:jinx.fgr = ['#494949', 238, 0]
let s:jinx.bgr = ['#E1E1E1', 254, 7]
let s:jinx.line = ['#D0D0D0', 252, 15]
let s:jinx.select = ['#D0D0D0', 252, 15]
let s:jinx.folded = ['#B2B2B2', 249, 15]
let s:jinx.commnt = ['#808080', 244, 15]
let s:jinx.red = ['#EF7878', 210, 1]
let s:jinx.green = ['#78A078', 108, 2]
let s:jinx.yellow = ['#CE9D00', 178, 3]
let s:jinx.blue = ['#4E88CF', 32, 4]
let s:jinx.purple = ['#AF86C8', 140, 5]
let s:jinx.cyan = ['#00AFAF', 37, 6]
let s:jinx.orange = ['#E0914C', 166, 9]
let g:terminal_color_1 = '#EF7878'
let g:terminal_color_2 = '#78A078'
let g:terminal_color_3 = '#CE9D00'
let g:terminal_color_4 = '#4E88CF'
let g:terminal_color_5 = '#AF86C8'
let g:terminal_color_6 = '#00AFAF'
let g:terminal_color_9 = '#FF777A'
let g:terminal_color_10 = '#8DBC8D'
let g:terminal_color_11 = '#FFEB56'
let g:terminal_color_12 = '#6699CC'
let g:terminal_color_13 = '#CC99CC'
let g:terminal_color_14 = '#5DD5FF'
let g:terminal_ansi_colors = [
\ '#E1E1E1', '#EF7878', '#78A078', '#CE9D00', '#4E88CF', '#AF86C8', '#00AFAF', '#4D545E',
\ '#E1E1E1', '#FF777A', '#8DBC8D', '#FFEB56', '#6699CC', '#CC99CC', '#5DD5FF', '#4D545E'
\ ]
let s:i = 0
for s:color in g:terminal_ansi_colors
let g:terminal_color_{s:i} = s:color
let s:i += 1
endfor
elseif exists('g:jinx_colors') && g:jinx_colors =~? 'midnight'
let s:jinx.menu_bgr = ['#2c3135', 237, 0]
let s:jinx.red = ['#EF7878', 210]
let s:jinx.green = ['#78A078', 108]
let s:jinx.yellow = ['#CE9D00', 178]
let s:jinx.blue = ['#4E88CF', 32]
let s:jinx.purple = ['#AF86C8', 140]
let s:jinx.cyan = ['#00AFAF', 37]
let s:jinx.orange = ['#E0914C', 172]
else
set background=dark
let s:jinx.fgr = ['#E1E1E1', 255]
let s:jinx.bgr = ['#1c2023', 234]
let s:jinx.line = ['#2c3135', 67]
let s:jinx.select = ['#2c3135', 67]
let s:jinx.folded = ['#414449', 239]
let s:jinx.commnt = ['#B9B9B9', 102]
let s:jinx.fgr = ['#E1E1E1', 253, 7]
let s:jinx.bgr = ['#40464F', 234, 0]
let s:jinx.line = ['#2c3135', 237, 15]
let s:jinx.select = ['#2c3135', 237, 15]
let s:jinx.folded = ['#414449', 240, 15]
let s:jinx.commnt = ['#B9B9B9', 102, 15]
let s:jinx.red = ['#FF777A', 210]
let s:jinx.green = ['#8DBC8D', 108]
let s:jinx.yellow = ['#FFEB56', 220]
let s:jinx.blue = ['#6699CC', 32]
let s:jinx.purple = ['#CC99CC', 140]
let s:jinx.cyan = ['#5DD5FF', 81]
let s:jinx.orange = ['#FF9157', 208]
endif
let s:jinx.red = ['#FF777A', 210, 1]
let s:jinx.green = ['#8DBC8D', 108, 2]
let s:jinx.yellow = ['#FFEB56', 220, 3]
let s:jinx.blue = ['#6699CC', 32, 4]
let s:jinx.purple = ['#CC99CC', 140, 5]
let s:jinx.cyan = ['#5DD5FF', 81, 6]
let s:jinx.orange = ['#FF9157', 208, 9]
else
" night
set background=dark
let s:jinx.fgr = ['#E1E1E1', 254, 7]
let s:jinx.bgr = ['#4D545E', 237, 0]
let s:jinx.line = ['#5F6772', 243, 8]
let s:jinx.select = ['#5F6772', 243, 1]
let s:jinx.folded = ['#414449', 239, 8]
let s:jinx.commnt = ['#B9B9B9', 250, 8]
function! <SID>HighLight(GRP, FG, BG, ATT) abort " {{{1
let s:jinx.red = ['#FF777A', 210, 1]
let s:jinx.green = ['#8DBC8D', 108, 2]
let s:jinx.yellow = ['#FFEB56', 220, 3]
let s:jinx.blue = ['#6699CC', 32, 4]
let s:jinx.purple = ['#CC99CC', 140, 5]
let s:jinx.cyan = ['#5DD5FF', 81, 6]
let s:jinx.orange = ['#FF9157', 208, 9]
endif "}}}
function! <SID>HighLight(GRP, FG, BG, ATT) abort " {{{1
if a:FG !=# ''
let l:fg_col = get(s:jinx, a:FG)
let l:fg_true = l:fg_col[0]
let l:fg_term = l:fg_col[1]
if $TERM =~? 'linux' || &t_Co < 256
let l:fg_term = l:fg_col[2]
else
let l:fg_term = l:fg_col[1]
endif
exec 'highlight! '.a:GRP.' guifg='.l:fg_true.' ctermfg='.l:fg_term
endif
if a:BG !=# ''
let l:bg_col = get(s:jinx, a:BG)
let l:bg_true = l:bg_col[0]
let l:bg_term = l:bg_col[1]
if $TERM =~? 'linux' || &t_Co < 256
let l:bg_term = l:bg_col[2]
else
let l:bg_term = l:bg_col[1]
endif
exec 'highlight! '.a:GRP.' guibg='.l:bg_true.' ctermbg='.l:bg_term
endif
if a:ATT !=# ''
if a:ATT !=# '' && &t_Co >= 256
exec 'highlight! '.a:GRP.' gui='.a:ATT.' cterm='.a:ATT
endif
endfunction
@ -99,10 +159,10 @@ endfunction
" Editor {{{2
call <SID>HighLight('Title', 'commnt', 'bgr', 'bold')
call <SID>HighLight('Title', 'commnt', 'bgr', 'bold')
call <SID>HighLight('Visual', '', 'select', '')
call <SID>HighLight('SignColumn', '', 'line', '')
call <SID>HighLight('CursorLine', '', 'line', 'none')
call <SID>HighLight('CursorLine', '', 'line', 'none')
call <SID>HighLight('CursorColumn', '', 'line', '')
call <SID>HighLight('CursorLineNr', 'cyan', 'line', '')
call <SID>HighLight('LineNr', 'commnt', 'line', '')
@ -110,7 +170,7 @@ call <SID>HighLight('ColorColumn', 'fgr', 'red', '')
call <SID>HighLight('Error', 'red', 'bgr', '')
call <SID>HighLight('ErrorMsg', 'red', 'bgr', '')
call <SID>HighLight('WarningMsg', 'red', 'bgr', '')
call <SID>HighLight('MatchParen', 'blue', 'bgr', 'bold')
call <SID>HighLight('MatchParen', 'yellow', 'bgr', 'bold')
call <SID>HighLight('ModeMsg', 'cyan', 'bgr', '')
call <SID>HighLight('MoreMsg', 'cyan', 'bgr', '')
call <SID>HighLight('Directory', 'blue', 'bgr', '')
@ -119,43 +179,46 @@ call <SID>HighLight('NonText', 'commnt', 'bgr', '')
call <SID>HighLight('SpecialKey', 'commnt', 'bgr', '')
call <SID>HighLight('Folded', 'commnt', 'folded', '')
call <SID>HighLight('Search', 'bgr', 'blue', '')
call <SID>HighLight('HLNext', 'bgr', 'red', 'bold')
call <SID>HighLight('Normal', 'fgr', 'bgr', '')
call <SID>HighLight('VertSplit', 'menu_bgr', 'menu_fgr', '')
" Tabline {{{2
call <SID>HighLight('TabLine', 'menu_fgr', 'menu_bgr', 'none')
call <SID>HighLight('TabLineFill', 'menu_bgr', 'menu_bgr', '')
call <SID>HighLight('TabLineSel', 'tabsel_bgr', 'menu_bgr', 'bold')
call <SID>HighLight('TabLine', 'menusel_fgr', 'menu_bgr', 'none')
call <SID>HighLight('TabLineFill', 'menu_bgr', 'menu_bgr', '')
call <SID>HighLight('TabLineSel', 'menu_bgr', 'tabsel_bgr', 'bold')
call <SID>HighLight('WildMenu', 'menusel_fgr', 'menu_bgr', 'bold')
call <SID>HighLight('Pmenu', 'menusel_fgr', 'menu_bgr', 'bold')
call <SID>HighLight('PmenuSel', 'menusel_bgr', 'menusel_fgr', 'bold')
call <SID>HighLight('PmenuSbar', 'menu_fgr', 'menu_bgr', '')
call <SID>HighLight('PmenuThumb', 'menu_fgr', 'menu_bgr', '')
call <SID>HighLight('StatusLine', 'menu_bgr', 'menu_fgr', '')
call <SID>HighLight('StatusLineNC', 'menu_fgr', 'menu_bgr', '')
call <SID>HighLight('PmenuSbar', 'menu_fgr', 'menu_bgr', '')
call <SID>HighLight('PmenuThumb', 'menu_fgr', 'menu_bgr', '')
call <SID>HighLight('StatusLine', 'menu_bgr', 'menusel_fgr', '')
call <SID>HighLight('StatusLineNC', 'menu_bgr', 'menu_fgr', '')
if has('spell') " {{{2
call <SID>HighLight('SpellBad', '', '', 'undercurl')
call <SID>HighLight('SpellLocal', '', '', 'undercurl')
call <SID>HighLight('SpellRare', '', '', 'undercurl')
endif
" Spelling {{{2
call <SID>HighLight('SpellBad', '', '', 'underline')
call <SID>HighLight('SpellLocal', '', '', 'underline')
call <SID>HighLight('SpellRare', '', '', 'underline')
if exists('g:loaded_ctrlp') " {{{2
call <SID>HighLight('CtrlPNoEntries', 'red', '', 'bold')
call <SID>HighLight('CtrlPMatch', 'blue', '', 'bold')
call <SID>HighLight('CtrlPLinePre', 'blue', 'menu_bgr', 'none')
call <SID>HighLight('CtrlPPrtBase', 'blue', '', 'none')
call <SID>HighLight('CtrlPPrtCursor', 'menu_fgr', 'menu_bgr', 'bold')
call <SID>HighLight('CtrlPMode1', 'menu_fgr', 'menu_bgr', 'bold')
call <SID>HighLight('CtrlPMode2', 'menu_fgr', 'menu_bgr', 'bold')
call <SID>HighLight('CtrlPStats', 'menu_fgr', 'menu_bgr', 'bold')
endif
" Ctrl-P {{{2
call <SID>HighLight('CtrlPNoEntries', 'red', '', 'bold')
call <SID>HighLight('CtrlPMatch', 'blue', '', 'bold')
call <SID>HighLight('CtrlPLinePre', 'blue', 'menu_bgr', 'none')
call <SID>HighLight('CtrlPPrtBase', 'blue', '', 'none')
call <SID>HighLight('CtrlPPrtCursor', 'menu_fgr', 'menu_bgr', 'bold')
call <SID>HighLight('CtrlPMode1', 'menu_fgr', 'menu_bgr', 'bold')
call <SID>HighLight('CtrlPMode2', 'menu_fgr', 'menu_bgr', 'bold')
call <SID>HighLight('CtrlPStats', 'menu_fgr', 'menu_bgr', 'bold')
if exists('g:loaded_ale') " {{{2
call <SID>HighLight('ALEErrorSign', 'red', 'line', 'bold')
call <SID>HighLight('ALEWarningSign', 'orange', 'line', 'bold')
endif
" ALE linter {{{2
call <SID>HighLight('ALEErrorSign', 'red', 'line', '')
call <SID>HighLight('ALEWarningSign', 'orange', 'line', '')
call <SID>HighLight('ALEError', 'red', '', 'underline')
call <SID>HighLight('ALEWarning', 'red', '', 'underline')
call <SID>HighLight('ALEStyleError', 'orange', '', 'underline')
call <SID>HighLight('ALEStyleWarning', 'orange', '', 'underline')
" Generic {{{2
@ -182,7 +245,7 @@ call <SID>HighLight('Macro', 'purple', '', 'bold')
call <SID>HighLight('Special', 'purple', '', 'bold')
call <SID>HighLight('TypeDef', 'purple', '', 'bold')
call <SID>HighLight('Define', 'yellow', '', 'bold')
call <SID>HighLight('Constant', 'yellow', '', 'bold')
call <SID>HighLight('Constant', 'purple', '', 'bold')
call <SID>HighLight('PreProc', 'yellow', '', '')
call <SID>HighLight('Identifier', 'yellow', '', 'bold')
call <SID>HighLight('PreCondit', 'yellow', '', '')
@ -191,22 +254,29 @@ call <SID>HighLight('Conceal', 'orange', '', '')
" Vim {{{2
call <SID>HighLight('vimCommand', 'green', '', 'bold')
call <SID>HighLight('vimGroup', 'yellow', '', 'bold')
call <SID>HighLight('vimGroupName', 'yellow', '', 'bold')
call <SID>HighLight('VimFunction', 'orange', '', 'bold')
call <SID>HighLight('vimMapModKey', 'purple', '', 'bold')
call <SID>HighLight('vimBracket', 'purple', '', 'bold')
call <SID>HighLight('vimOption', 'purple', '', 'bold')
call <SID>HighLight('vimMapMod', 'purple', '', '')
call <SID>HighLight('vimNotation', 'purple', '', '')
call <SID>HighLight('vimCommand', 'green', '', 'bold')
call <SID>HighLight('vimVar', 'yellow', '', 'bold')
call <SID>HighLight('vimGroup', 'yellow', '', 'bold')
call <SID>HighLight('vimGroupName', 'yellow', '', 'bold')
call <SID>HighLight('VimFunction', 'orange', '', 'bold')
call <SID>HighLight('VimFunctionKey', 'orange', '', 'bold')
call <SID>HighLight('vimMapModKey', 'purple', '', 'bold')
call <SID>HighLight('vimBracket', 'purple', '', 'bold')
call <SID>HighLight('vimOption', 'purple', '', 'bold')
call <SID>HighLight('vimMapMod', 'purple', '', '')
call <SID>HighLight('vimNotation', 'purple', '', '')
" Shell {{{2
call <SID>HighLight('shSet', 'green', '', 'bold')
call <SID>HighLight('shLoop', 'green', '', 'bold')
call <SID>HighLight('shTestOpr', 'green', '', 'bold')
call <SID>HighLight('shConstant', 'yellow', '', 'bold')
call <SID>HighLight('shFunctionKey', 'orange', '', 'bold')
call <SID>HighLight('shStatement', 'green', '', 'bold')
call <SID>HighLight('shKeyword', 'purple', '', 'bold')
call <SID>HighLight('zshStatement', 'purple', '', 'bold')
call <SID>HighLight('zshOption', 'purple', '', 'bold')
call <SID>HighLight('zshStatement', 'green', '', 'bold')
call <SID>HighLight('zshOption', 'green', '', 'bold')
call <SID>HighLight('zshFunction', 'orange', '', 'bold')
call <SID>HighLight('zshVariableDef', 'yellow', '', '')
call <SID>HighLight('zshOperator', 'blue', '', 'bold')
@ -245,28 +315,36 @@ call <SID>HighLight('rubyConstant', 'yellow', '', '')
" Python {{{2
call <SID>HighLight('pythonRun', 'red', '', '')
call <SID>HighLight('pythonDecorator', 'red', '', 'bold')
call <SID>HighLight('pythonExClass', 'blue', '', '')
call <SID>HighLight('pythonException', 'blue', '', 'bold')
call <SID>HighLight('pythonExceptions', 'blue', '', 'bold')
call <SID>HighLight('pythonEscape', 'blue', '', '')
call <SID>HighLight('pythonImport', 'green', '', 'bold')
call <SID>HighLight('pythonRepeat', 'green', '', '')
call <SID>HighLight('pythonCoding', 'green', '', '')
call <SID>HighLight('pythonInclude', 'green', '', 'bold')
call <SID>HighLight('pythonPreCondit', 'green', '', '')
call <SID>HighLight('pythonStatement', 'green', '', 'bold')
call <SID>HighLight('pythonConditional', 'green', '', '')
call <SID>HighLight('pythonDef', 'yellow', '', 'bold')
call <SID>HighLight('pythonBuiltin', 'purple', '', 'bold')
call <SID>HighLight('pythonBuiltinObj', 'purple', '', 'bold')
call <SID>HighLight('pythonBuiltinFunc', 'orange', '', 'bold')
call <SID>HighLight('pythonDot', 'orange', '', 'bold')
call <SID>HighLight('pythonLambda', 'orange', '', '')
call <SID>HighLight('pythonFunction', 'orange', '', 'bold')
call <SID>HighLight('pythonDottedName', 'orange', '', '')
call <SID>HighLight('pythonBuiltinObjs', 'orange', '', '')
call <SID>HighLight('pythonRun', 'red', '', '')
call <SID>HighLight('pythonOperator', 'blue', '', 'bold')
call <SID>HighLight('pythonClass', 'blue', '', '')
call <SID>HighLight('pythonClassParameters', 'purple', '', '')
call <SID>HighLight('pythonParam', 'purple', '', '')
call <SID>HighLight('pythonDecorator', 'blue', '', 'bold')
call <SID>HighLight('pythonExClass', 'blue', '', '')
call <SID>HighLight('pythonException', 'blue', '', 'bold')
call <SID>HighLight('pythonExceptions', 'blue', '', 'bold')
call <SID>HighLight('pythonBrackets', 'blue', '', '')
call <SID>HighLight('pythonEscape', 'blue', '', '')
call <SID>HighLight('pythonImport', 'green', '', 'bold')
call <SID>HighLight('pythonRepeat', 'green', '', '')
call <SID>HighLight('pythonCoding', 'green', '', '')
call <SID>HighLight('pythonInclude', 'green', '', 'bold')
call <SID>HighLight('pythonPreCondit', 'green', '', '')
call <SID>HighLight('pythonStatement', 'green', '', 'bold')
call <SID>HighLight('pythonConditional', 'green', '', '')
call <SID>HighLight('pythonDef', 'yellow', '', 'bold')
call <SID>HighLight('pythonSelf', 'blue', '', 'bold')
call <SID>HighLight('pythonBuiltinType', 'purple', '', 'bold')
call <SID>HighLight('pythonBuiltin', 'purple', '', 'bold')
call <SID>HighLight('pythonBuiltinObj', 'purple', '', 'bold')
call <SID>HighLight('pythonBuiltinFunc', 'orange', '', 'bold')
call <SID>HighLight('pythonDot', 'orange', '', 'bold')
call <SID>HighLight('pythonLambda', 'orange', '', '')
call <SID>HighLight('pythonLambdaExpr', 'orange', '', '')
call <SID>HighLight('pythonFunction', 'orange', '', 'bold')
call <SID>HighLight('pythonDottedName', 'orange', '', '')
call <SID>HighLight('pythonBuiltinObjs', 'orange', '', '')
" LaTeX {{{2
@ -435,5 +513,3 @@ call <SID>HighLight('DiffText', 'line', 'blue', 'bold')
" Remove the highlight function as it's no longer needed.
" Will cause problems reloading the theme if not deleted.
delfunction <SID>HighLight
" vim:fdm=marker:et:sts=4:sw=4