diff --git a/base/.config/fontconfig/fonts.conf b/base/.config/fontconfig/fonts.conf
index 221ec2e3..cb3c3150 100644
--- a/base/.config/fontconfig/fonts.conf
+++ b/base/.config/fontconfig/fonts.conf
@@ -1,52 +1,52 @@
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
-
- serif
-
- DejaVu Serif
-
-
-
- sans-serif
-
- DejaVu Sans
-
-
-
- sans
-
- DejaVu Sans
-
-
-
- monospace
-
- DejaVu Sans Mono
-
-
-
- mono
-
- DejaVu Sans Mono
-
-
+
+ serif
+
+ DejaVu Serif
+
+
+
+ sans-serif
+
+ DejaVu Sans
+
+
+
+ sans
+
+ DejaVu Sans
+
+
+
+ monospace
+
+ DejaVu Sans Mono
+
+
+
+ mono
+
+ DejaVu Sans Mono
+
+
diff --git a/base/.vim/colors/jinx.vim b/base/.vim/colors/jinx.vim
index 4a63519c..683ba330 100644
--- a/base/.vim/colors/jinx.vim
+++ b/base/.vim/colors/jinx.vim
@@ -1,16 +1,15 @@
-" ------------------- jinx ---------------------- "
-" Written by Nathaniel Maia, December 2017 "
-" ----------------------------------------------- "
-" vim:fdm=marker
+" ------------------- jinx ---------------------- "
+" written by Nathaniel Maia, 2017 - 2019 "
+" ----------------------------------------------- "
" ---------- Setup and Checks ----------- " {{{1
-if exists('syntax_on')
+if exists('syntax_on') " {{{2
highlight clear
syntax reset
endif
-" Colors {{{1
+" color definitions {{{2
" start with an empty color dictionary
let s:jinx = {}
@@ -68,7 +67,7 @@ else " night
let s:jinx.commnt = ['#B9B9B9', 250, 7]
endif
-function! HighLight(GRP, FG, BG, ATT) abort " {{{1
+function! hlg(GRP, FG, BG, ATT) abort " {{{2
if a:FG !=# ''
let l:fg_col = get(s:jinx, a:FG)
let l:fg_true = l:fg_col[0]
@@ -82,373 +81,374 @@ function! HighLight(GRP, FG, BG, ATT) abort " {{{1
if a:BG !=# ''
let l:bg_col = get(s:jinx, a:BG)
let l:bg_true = l:bg_col[0]
- if $TERM =~? 'linux' || &t_Co < 256
+ 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 !=# '' && &t_Co >= 256
+ if a:ATT !=# ''
exec 'highlight! '.a:GRP.' gui='.a:ATT.' cterm='.a:ATT
endif
endfunction
-
" ---------- Highlight Groups ------------ " {{{1
" Editor {{{2
-call HighLight('Title', 'commnt', 'bgr', 'bold')
-call HighLight('Visual', '', 'select', '')
-call HighLight('SignColumn', '', 'line', '')
-call HighLight('CursorLine', '', 'line', '')
-call HighLight('CursorColumn', '', 'line', '')
-call HighLight('CursorLineNr', 'cyan', 'line', '')
-call HighLight('LineNr', 'commnt', 'line', '')
-call HighLight('ColorColumn', 'fgr', 'red', '')
-call HighLight('Error', 'red', 'bgr', '')
-call HighLight('ErrorMsg', 'red', 'bgr', '')
-call HighLight('WarningMsg', 'red', 'bgr', '')
-call HighLight('MatchParen', 'yellow', 'bgr', '')
-call HighLight('ModeMsg', 'cyan', 'bgr', '')
-call HighLight('MoreMsg', 'cyan', 'bgr', '')
-call HighLight('Directory', 'blue', 'bgr', '')
-call HighLight('Question', 'green', 'bgr', '')
-call HighLight('NonText', 'commnt', 'bgr', '')
-call HighLight('SpecialKey', 'commnt', 'bgr', '')
-call HighLight('Folded', 'commnt', 'folded', '')
-call HighLight('Search', 'bgr', 'blue', '')
-call HighLight('HLNext', 'bgr', 'red', '')
-call HighLight('Normal', 'fgr', 'bgr', '')
-call HighLight('VertSplit', 'line', 'commnt', '')
+call hlg('Title', 'commnt', 'bgr', 'bold')
+call hlg('Visual', '', 'select', '')
+call hlg('SignColumn', '', 'line', '')
+call hlg('CursorLine', '', 'line', '')
+call hlg('CursorColumn', '', 'line', '')
+call hlg('CursorLineNr', 'cyan', 'line', '')
+call hlg('LineNr', 'commnt', 'line', '')
+call hlg('ColorColumn', 'fgr', 'red', '')
+call hlg('Error', 'red', 'bgr', '')
+call hlg('ErrorMsg', 'red', 'bgr', '')
+call hlg('WarningMsg', 'red', 'bgr', '')
+call hlg('MatchParen', 'yellow', 'bgr', '')
+call hlg('ModeMsg', 'cyan', 'bgr', '')
+call hlg('MoreMsg', 'cyan', 'bgr', '')
+call hlg('Directory', 'blue', 'bgr', '')
+call hlg('Question', 'green', 'bgr', '')
+call hlg('NonText', 'commnt', 'bgr', '')
+call hlg('SpecialKey', 'commnt', 'bgr', '')
+call hlg('Folded', 'commnt', 'folded', '')
+call hlg('Search', 'bgr', 'blue', '')
+call hlg('HLNext', 'bgr', 'red', '')
+call hlg('Normal', 'fgr', 'bgr', '')
+call hlg('VertSplit', 'line', 'commnt', '')
" Tabline {{{2
-call HighLight('TabLine', 'fgr', 'line', '')
-call HighLight('TabLineFill', 'line', 'line', '')
-call HighLight('TabLineSel', 'line', 'green', '')
-call HighLight('WildMenu', 'bgr', 'fgr', '')
-call HighLight('Pmenu', 'bgr', 'commnt', '')
-call HighLight('PmenuSel', 'fgr', 'bgr', '')
-call HighLight('PmenuSbar', 'commnt', 'line', '')
-call HighLight('PmenuThumb', 'commnt', 'line', '')
-call HighLight('StatusLine', 'line', 'fgr', '')
-call HighLight('StatusLineNC', 'fgr', 'line', '')
+call hlg('TabLine', 'fgr', 'line', '')
+call hlg('TabLineFill', 'line', 'line', '')
+call hlg('TabLineSel', 'line', 'green', '')
+call hlg('WildMenu', 'bgr', 'fgr', '')
+call hlg('Pmenu', 'bgr', 'commnt', '')
+call hlg('PmenuSel', 'fgr', 'bgr', '')
+call hlg('PmenuSbar', 'commnt', 'line', '')
+call hlg('PmenuThumb', 'commnt', 'line', '')
+call hlg('StatusLine', 'line', 'fgr', '')
+call hlg('StatusLineNC', 'fgr', 'line', '')
" Spelling {{{2
-call HighLight('SpellBad', '', '', 'underline')
-call HighLight('SpellLocal', '', '', 'underline')
-call HighLight('SpellRare', '', '', 'underline')
+call hlg('SpellBad', '', '', 'underline')
+call hlg('SpellLocal', '', '', 'underline')
+call hlg('SpellRare', '', '', 'underline')
" ALE linter {{{2
-call HighLight('ALEErrorSign', 'red', 'line', '')
-call HighLight('ALEWarningSign', 'orange', 'line', '')
-call HighLight('ALEError', 'red', '', 'underline')
-call HighLight('ALEWarning', 'red', '', 'underline')
-call HighLight('ALEStyleError', 'orange', '', 'underline')
-call HighLight('ALEStyleWarning', 'orange', '', 'underline')
+call hlg('ALEErrorSign', 'red', 'line', '')
+call hlg('ALEWarningSign', 'orange', 'line', '')
+call hlg('ALEError', 'red', '', 'underline')
+call hlg('ALEWarning', 'red', '', 'underline')
+call hlg('ALEStyleError', 'orange', '', 'underline')
+call hlg('ALEStyleWarning', 'orange', '', 'underline')
" Generic {{{2
-call HighLight('Comment', 'commnt', '', '')
-call HighLight('Todo', 'red', '', '')
-call HighLight('Exception', 'red', '', '')
-call HighLight('Float', 'cyan', '', '')
-call HighLight('Number', 'cyan', '', '')
-call HighLight('Include', 'cyan', '', '')
-call HighLight('Character', 'blue', '', '')
-call HighLight('Operator', 'blue', '', '')
-call HighLight('String', 'blue', '', '')
-call HighLight('Label', 'green', '', '')
-call HighLight('Repeat', 'purple', '', '')
-call HighLight('Statement', 'green', '', '')
-call HighLight('Conditional', 'green', '', '')
-call HighLight('Boolean', 'green', '', '')
-call HighLight('Keyword', 'green', '', '')
-call HighLight('Macro', 'purple', '', '')
-call HighLight('Define', 'purple', '', '')
-call HighLight('Special', 'purple', '', '')
-call HighLight('Tag', 'purple', '', '')
-call HighLight('Type', 'purple', '', '')
-call HighLight('TypeDef', 'purple', '', '')
-call HighLight('Structure', 'purple', '', '')
-call HighLight('StorageClass', 'purple', '', '')
-call HighLight('PreProc', 'yellow', '', '')
-call HighLight('Constant', 'yellow', '', '')
-call HighLight('Identifier', 'yellow', '', '')
-call HighLight('PreCondit', 'yellow', '', '')
-call HighLight('Conceal', 'orange', '', '')
-call HighLight('Function', 'orange', '', '')
+call hlg('Comment', 'commnt', '', '')
+call hlg('Todo', 'red', '', '')
+call hlg('Exception', 'red', '', '')
+call hlg('Float', 'cyan', '', '')
+call hlg('Number', 'cyan', '', '')
+call hlg('Include', 'cyan', '', '')
+call hlg('Character', 'blue', '', '')
+call hlg('Operator', 'blue', '', '')
+call hlg('String', 'blue', '', '')
+call hlg('Label', 'green', '', '')
+call hlg('Repeat', 'purple', '', '')
+call hlg('Statement', 'green', '', '')
+call hlg('Conditional', 'green', '', '')
+call hlg('Boolean', 'green', '', '')
+call hlg('Keyword', 'green', '', '')
+call hlg('Macro', 'purple', '', '')
+call hlg('Define', 'purple', '', '')
+call hlg('Special', 'purple', '', '')
+call hlg('Tag', 'purple', '', '')
+call hlg('Type', 'purple', '', '')
+call hlg('TypeDef', 'purple', '', '')
+call hlg('Structure', 'purple', '', '')
+call hlg('StorageClass', 'purple', '', '')
+call hlg('PreProc', 'yellow', '', '')
+call hlg('Constant', 'yellow', '', '')
+call hlg('Identifier', 'yellow', '', '')
+call hlg('PreCondit', 'yellow', '', '')
+call hlg('Conceal', 'orange', '', '')
+call hlg('Function', 'orange', '', '')
" Vim {{{2
-call HighLight('vimCommand', 'green', '', '')
-call HighLight('vimVar', 'yellow', '', '')
-call HighLight('vimGroup', 'yellow', '', '')
-call HighLight('vimGroupName', 'yellow', '', '')
-call HighLight('VimFunction', 'orange', '', '')
-call HighLight('VimFunctionKey', 'orange', '', '')
-call HighLight('vimMapModKey', 'purple', '', '')
-call HighLight('vimBracket', 'purple', '', '')
-call HighLight('vimOption', 'purple', '', '')
-call HighLight('vimMapMod', 'purple', '', '')
-call HighLight('vimNotation', 'purple', '', '')
+call hlg('vimCommand', 'green', '', '')
+call hlg('vimVar', 'yellow', '', '')
+call hlg('vimGroup', 'yellow', '', '')
+call hlg('vimGroupName', 'yellow', '', '')
+call hlg('VimFunction', 'orange', '', '')
+call hlg('VimFunctionKey', 'orange', '', '')
+call hlg('vimMapModKey', 'purple', '', '')
+call hlg('vimBracket', 'purple', '', '')
+call hlg('vimOption', 'purple', '', '')
+call hlg('vimMapMod', 'purple', '', '')
+call hlg('vimNotation', 'purple', '', '')
" Shell {{{2
-call HighLight('shSet', 'green', '', '')
-call HighLight('shLoop', 'green', '', '')
-call HighLight('shFor', 'yellow', '', '')
-call HighLight('shTestOpr', 'blue', '', '')
-call HighLight('shConstant', 'yellow', '', '')
-call HighLight('shFunctionKey', 'orange', '', '')
-call HighLight('shStatement', 'green', '', '')
-call HighLight('shKeyword', 'purple', '', '')
-call HighLight('zshStatement', 'green', '', '')
-call HighLight('zshOption', 'purple', '', '')
-call HighLight('zshParentheses', 'purple', '', '')
-call HighLight('zshBrackets', 'purple', '', '')
-call HighLight('zshRepeat', 'green', '', '')
-call HighLight('zshRedir', 'fgr', '', '')
-call HighLight('zshFunction', 'orange', '', '')
-call HighLight('zshVariableDef', 'yellow', '', '')
-call HighLight('zshVariable', 'yellow', '', '')
-call HighLight('zshOperator', 'blue', '', '')
-call HighLight('zshPreProc', 'commnt', '', '')
+call hlg('shSet', 'green', '', '')
+call hlg('shLoop', 'green', '', '')
+call hlg('shFor', 'yellow', '', '')
+call hlg('shTestOpr', 'blue', '', '')
+call hlg('shConstant', 'yellow', '', '')
+call hlg('shFunctionKey', 'orange', '', '')
+call hlg('shStatement', 'green', '', '')
+call hlg('shKeyword', 'purple', '', '')
+call hlg('zshStatement', 'green', '', '')
+call hlg('zshOption', 'purple', '', '')
+call hlg('zshParentheses', 'purple', '', '')
+call hlg('zshBrackets', 'purple', '', '')
+call hlg('zshRepeat', 'green', '', '')
+call hlg('zshRedir', 'fgr', '', '')
+call hlg('zshFunction', 'orange', '', '')
+call hlg('zshVariableDef', 'yellow', '', '')
+call hlg('zshVariable', 'yellow', '', '')
+call hlg('zshOperator', 'blue', '', '')
+call hlg('zshPreProc', 'commnt', '', '')
" C {{{2
-call HighLight('cConditional', 'green', '', '')
-call HighLight('cRepeat', 'purple', '', '')
-call HighLight('cStorageClass', 'purple', '', '')
-call HighLight('cType', 'yellow', '', '')
+call hlg('cConditional', 'green', '', '')
+call hlg('cRepeat', 'purple', '', '')
+call hlg('cStorageClass', 'purple', '', '')
+call hlg('cType', 'yellow', '', '')
" PHP {{{2
-call HighLight('phpMemberSelector', 'blue', '', '')
-call HighLight('phpVarSelector', 'red', '', '')
-call HighLight('phpConditional', 'green', '', '')
-call HighLight('phpStatement', 'green', '', '')
-call HighLight('phpKeyword', 'purple', '', '')
-call HighLight('phpRepeat', 'purple', '', '')
+call hlg('phpMemberSelector', 'blue', '', '')
+call hlg('phpVarSelector', 'red', '', '')
+call hlg('phpConditional', 'green', '', '')
+call hlg('phpStatement', 'green', '', '')
+call hlg('phpKeyword', 'purple', '', '')
+call hlg('phpRepeat', 'purple', '', '')
" Ruby {{{2
-call HighLight('rubyInclude', 'blue', '', '')
-call HighLight('rubyAttribute', 'blue', '', '')
-call HighLight('rubySymbol', 'green', '', '')
-call HighLight('rubyStringDelimiter', 'green', '', '')
-call HighLight('rubyRepeat', 'purple', '', '')
-call HighLight('rubyControl', 'purple', '', '')
-call HighLight('rubyConditional', 'purple', '', '')
-call HighLight('rubyException', 'purple', '', '')
-call HighLight('rubyCurlyBlock', 'orange', '', '')
-call HighLight('rubyLocalVariableOrMethod', 'orange', '', '')
-call HighLight('rubyInterpolationDelimiter', 'orange', '', '')
-call HighLight('rubyAccess', 'yellow', '', '')
-call HighLight('rubyConstant', 'yellow', '', '')
+call hlg('rubyInclude', 'blue', '', '')
+call hlg('rubyAttribute', 'blue', '', '')
+call hlg('rubySymbol', 'green', '', '')
+call hlg('rubyStringDelimiter', 'green', '', '')
+call hlg('rubyRepeat', 'purple', '', '')
+call hlg('rubyControl', 'purple', '', '')
+call hlg('rubyConditional', 'purple', '', '')
+call hlg('rubyException', 'purple', '', '')
+call hlg('rubyCurlyBlock', 'orange', '', '')
+call hlg('rubyLocalVariableOrMethod', 'orange', '', '')
+call hlg('rubyInterpolationDelimiter', 'orange', '', '')
+call hlg('rubyAccess', 'yellow', '', '')
+call hlg('rubyConstant', 'yellow', '', '')
" Python {{{2
-call HighLight('pythonRun', 'red', '', '')
-call HighLight('pythonOperator', 'blue', '', '')
-call HighLight('pythonClass', 'blue', '', '')
-call