From 8af355267e282a21d1f0b70b90e45a55167bf7bd Mon Sep 17 00:00:00 2001 From: natemaia Date: Sat, 2 Mar 2019 19:41:03 -0800 Subject: [PATCH] More minor updates to configs --- base/.vim/colors/jinx.vim | 357 +++++++++++++------------------ base/.vimrc | 4 +- bspwm-home/.config/bspwm/bspwmrc | 3 - i3-gaps-home/.config/i3/config | 4 - 4 files changed, 149 insertions(+), 219 deletions(-) diff --git a/base/.vim/colors/jinx.vim b/base/.vim/colors/jinx.vim index 15332091..4a63519c 100644 --- a/base/.vim/colors/jinx.vim +++ b/base/.vim/colors/jinx.vim @@ -6,15 +6,13 @@ " ---------- Setup and Checks ----------- " {{{1 if exists('syntax_on') - highlight clear - syntax reset + highlight clear + syntax reset endif -let g:colors_name = 'jinx' - " Colors {{{1 -" empty color dictionary +" start with an empty color dictionary let s:jinx = {} " NOTE: For those looking to edit the theme @@ -24,20 +22,9 @@ let s:jinx = {} " " let s:jinx.black = ['#000000', 0, 0] -" completion menu, wildmenu, and status/tab lines -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] - -" 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' + \ '#4D545E', '#D9534F', '#80B080', '#FFEB56', '#6699CC', '#CC99CC', '#5DD5FF', '#E1E1E1', + \ '#4D545E', '#D9534F', '#80B080', '#FFEB56', '#6699CC', '#CC99CC', '#5DD5FF', '#E1E1E1' \ ] let s:i = 0 for s:color in g:terminal_ansi_colors @@ -45,88 +32,41 @@ for s:color in g:terminal_ansi_colors let s:i += 1 endfor -"}}} +let s:jinx.red = ['#EE5555', 210, 1] +let s:jinx.green = ['#88BB88', 108, 2] +let s:jinx.yellow = ['#FFCC66', 220, 3] +let s:jinx.blue = ['#4488CC', 32, 4] +let s:jinx.purple = ['#AA88CC', 140, 5] +let s:jinx.cyan = ['#44CCEE', 81, 6] +let s:jinx.orange = ['#FF8844', 172, 9] -" 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' "{{{ +if exists('g:jinx_theme') && g:jinx_theme =~? 'day' set background=light - let s:jinx.fgr = ['#494949', 238, 0] - let s:jinx.bgr = ['#E1E1E1', 254, 7] + 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.select = ['#D0D0D0', 252, 1] 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.yellow = ['#EE9911', 178, 3] + let s:jinx.cyan = ['#3388AA', 37, 6] +elseif exists('g:jinx_theme') && g:jinx_theme =~? 'midnight' set background=dark - let s:jinx.fgr = ['#E1E1E1', 253, 7] - let s:jinx.bgr = ['#1E2125', 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, 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 + let s:jinx.fgr = ['#CCCCCC', 251, 15] + let s:jinx.bgr = ['#111111', 234, 0] + let s:jinx.line = ['#2A2A2F', 237, 8] + let s:jinx.select = ['#2A2A2F', 237, 1] + let s:jinx.folded = ['#2A2A2F', 237, 8] + let s:jinx.commnt = ['#777777', 243, 7] +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] - - 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 "}}} + let s:jinx.fgr = ['#E1E1E1', 254, 15] + let s:jinx.bgr = ['#4D545E', 237, 0] + let s:jinx.line = ['#5F6772', 243, 8] + let s:jinx.select = ['#5F6772', 243, 8] + let s:jinx.folded = ['#5F6772', 243, 8] + let s:jinx.commnt = ['#B9B9B9', 250, 7] +endif function! HighLight(GRP, FG, BG, ATT) abort " {{{1 if a:FG !=# '' @@ -159,10 +99,10 @@ endfunction " Editor {{{2 -call HighLight('Title', 'commnt', 'bgr', 'bold') +call HighLight('Title', 'commnt', 'bgr', 'bold') call HighLight('Visual', '', 'select', '') call HighLight('SignColumn', '', 'line', '') -call HighLight('CursorLine', '', 'line', 'none') +call HighLight('CursorLine', '', 'line', '') call HighLight('CursorColumn', '', 'line', '') call HighLight('CursorLineNr', 'cyan', 'line', '') call HighLight('LineNr', 'commnt', 'line', '') @@ -170,7 +110,7 @@ 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', 'bold') +call HighLight('MatchParen', 'yellow', 'bgr', '') call HighLight('ModeMsg', 'cyan', 'bgr', '') call HighLight('MoreMsg', 'cyan', 'bgr', '') call HighLight('Directory', 'blue', 'bgr', '') @@ -179,107 +119,105 @@ 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', 'bold') +call HighLight('HLNext', 'bgr', 'red', '') call HighLight('Normal', 'fgr', 'bgr', '') -call HighLight('VertSplit', 'menu_bgr', 'menu_fgr', '') +call HighLight('VertSplit', 'line', 'commnt', '') " Tabline {{{2 -call HighLight('TabLine', 'menusel_fgr', 'menu_bgr', 'none') -call HighLight('TabLineFill', 'menu_bgr', 'menu_bgr', '') -call HighLight('TabLineSel', 'menu_bgr', 'tabsel_bgr', 'bold') -call HighLight('WildMenu', 'menusel_fgr', 'menu_bgr', 'bold') -call HighLight('Pmenu', 'menusel_fgr', 'menu_bgr', 'bold') -call HighLight('PmenuSel', 'menusel_bgr', 'menusel_fgr', 'bold') -call HighLight('PmenuSbar', 'menu_fgr', 'menu_bgr', '') -call HighLight('PmenuThumb', 'menu_fgr', 'menu_bgr', '') -call HighLight('StatusLine', 'menu_bgr', 'menusel_fgr', '') -call HighLight('StatusLineNC', 'menu_bgr', 'menu_fgr', '') +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', '') " Spelling {{{2 call HighLight('SpellBad', '', '', 'underline') call HighLight('SpellLocal', '', '', 'underline') call HighLight('SpellRare', '', '', 'underline') -" Ctrl-P {{{2 -call HighLight('CtrlPNoEntries', 'red', '', 'bold') -call HighLight('CtrlPMatch', 'blue', '', 'bold') -call HighLight('CtrlPLinePre', 'blue', 'menu_bgr', 'none') -call HighLight('CtrlPPrtBase', 'blue', '', 'none') -call HighLight('CtrlPPrtCursor', 'menu_fgr', 'menu_bgr', 'bold') -call HighLight('CtrlPMode1', 'menu_fgr', 'menu_bgr', 'bold') -call HighLight('CtrlPMode2', 'menu_fgr', 'menu_bgr', 'bold') -call HighLight('CtrlPStats', 'menu_fgr', 'menu_bgr', 'bold') " 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 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') " Generic {{{2 -call HighLight('Comment', 'commnt', '', '') -call HighLight('Todo', 'red', 'bgr', 'bold') -call HighLight('Float', 'cyan', '', '') -call HighLight('Character', 'cyan', '', '') -call HighLight('String', 'cyan', '', '') -call HighLight('Number', 'cyan', '', 'bold') -call HighLight('Boolean', 'cyan', '', 'bold') -call HighLight('Exception', 'blue', '', 'bold') -call HighLight('Include', 'blue', '', '') -call HighLight('Operator', 'blue', '', 'bold') -call HighLight('Label', 'green', '', '') -call HighLight('Repeat', 'green', '', '') -call HighLight('Statement', 'green', '', '') -call HighLight('Conditional', 'green', '', '') -call HighLight('Keyword', 'green', '', 'bold') -call HighLight('Structure', 'purple', '', 'bold') -call HighLight('StorageClass', 'purple', '', 'bold') -call HighLight('Type', 'purple', '', 'bold') -call HighLight('Tag', 'purple', '', 'bold') -call HighLight('Macro', 'purple', '', 'bold') -call HighLight('Special', 'purple', '', 'bold') -call HighLight('TypeDef', 'purple', '', 'bold') -call HighLight('Define', 'yellow', '', 'bold') -call HighLight('Constant', 'purple', '', 'bold') -call HighLight('PreProc', 'yellow', '', '') -call HighLight('Identifier', 'yellow', '', 'bold') -call HighLight('PreCondit', 'yellow', '', '') -call HighLight('Function', 'orange', '', 'bold') -call HighLight('Conceal', 'orange', '', '') +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', '', '') " Vim {{{2 -call HighLight('vimCommand', 'green', '', 'bold') -call HighLight('vimVar', 'yellow', '', 'bold') -call HighLight('vimGroup', 'yellow', '', 'bold') -call HighLight('vimGroupName', 'yellow', '', 'bold') -call HighLight('VimFunction', 'orange', '', 'bold') -call HighLight('VimFunctionKey', 'orange', '', 'bold') -call HighLight('vimMapModKey', 'purple', '', 'bold') -call HighLight('vimBracket', 'purple', '', 'bold') -call HighLight('vimOption', 'purple', '', 'bold') +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', '', '') " Shell {{{2 -call HighLight('shSet', 'green', '', 'bold') -call HighLight('shLoop', 'green', '', 'bold') -call HighLight('shTestOpr', 'green', '', 'bold') -call HighLight('shConstant', 'yellow', '', 'bold') -call HighLight('shFunctionKey', 'orange', '', 'bold') -call HighLight('shStatement', 'green', '', 'bold') -call HighLight('shKeyword', 'purple', '', 'bold') -call HighLight('zshStatement', 'green', '', 'bold') -call HighLight('zshOption', 'green', '', 'bold') -call HighLight('zshFunction', 'orange', '', 'bold') +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('zshOperator', 'blue', '', 'bold') +call HighLight('zshVariable', 'yellow', '', '') +call HighLight('zshOperator', 'blue', '', '') +call HighLight('zshPreProc', 'commnt', '', '') " C {{{2 @@ -293,8 +231,8 @@ call HighLight('cType', 'yellow', '', '') call HighLight('phpMemberSelector', 'blue', '', '') call HighLight('phpVarSelector', 'red', '', '') call HighLight('phpConditional', 'green', '', '') -call HighLight('phpStatement', 'green', '', 'bold') -call HighLight('phpKeyword', 'purple', '', 'bold') +call HighLight('phpStatement', 'green', '', '') +call HighLight('phpKeyword', 'purple', '', '') call HighLight('phpRepeat', 'purple', '', '') " Ruby {{{2 @@ -316,33 +254,33 @@ call HighLight('rubyConstant', 'yellow', '', '') " Python {{{2 call HighLight('pythonRun', 'red', '', '') -call HighLight('pythonOperator', 'blue', '', 'bold') +call HighLight('pythonOperator', 'blue', '', '') call HighLight('pythonClass', 'blue', '', '') call HighLight('pythonClassParameters', 'purple', '', '') call HighLight('pythonParam', 'purple', '', '') -call HighLight('pythonDecorator', 'blue', '', 'bold') +call HighLight('pythonDecorator', 'blue', '', '') call HighLight('pythonExClass', 'blue', '', '') -call HighLight('pythonException', 'blue', '', 'bold') -call HighLight('pythonExceptions', 'blue', '', 'bold') +call HighLight('pythonException', 'blue', '', '') +call HighLight('pythonExceptions', 'blue', '', '') call HighLight('pythonBrackets', 'blue', '', '') call HighLight('pythonEscape', 'blue', '', '') -call HighLight('pythonImport', 'green', '', 'bold') +call HighLight('pythonImport', 'green', '', '') call HighLight('pythonRepeat', 'green', '', '') call HighLight('pythonCoding', 'green', '', '') -call HighLight('pythonInclude', 'green', '', 'bold') +call HighLight('pythonInclude', 'green', '', '') call HighLight('pythonPreCondit', 'green', '', '') -call HighLight('pythonStatement', 'green', '', 'bold') +call HighLight('pythonStatement', 'green', '', '') call HighLight('pythonConditional', 'green', '', '') -call HighLight('pythonDef', 'yellow', '', 'bold') -call HighLight('pythonSelf', 'blue', '', 'bold') -call HighLight('pythonBuiltinType', 'purple', '', 'bold') -call HighLight('pythonBuiltin', 'purple', '', 'bold') -call HighLight('pythonBuiltinObj', 'purple', '', 'bold') -call HighLight('pythonBuiltinFunc', 'orange', '', 'bold') -call HighLight('pythonDot', 'orange', '', 'bold') +call HighLight('pythonDef', 'yellow', '', '') +call HighLight('pythonSelf', 'blue', '', '') +call HighLight('pythonBuiltinType', 'purple', '', '') +call HighLight('pythonBuiltin', 'purple', '', '') +call HighLight('pythonBuiltinObj', 'purple', '', '') +call HighLight('pythonBuiltinFunc', 'orange', '', '') +call HighLight('pythonDot', 'orange', '', '') call HighLight('pythonLambda', 'orange', '', '') call HighLight('pythonLambdaExpr', 'orange', '', '') -call HighLight('pythonFunction', 'orange', '', 'bold') +call HighLight('pythonFunction', 'orange', '', '') call HighLight('pythonDottedName', 'orange', '', '') call HighLight('pythonBuiltinObjs', 'orange', '', '') @@ -365,25 +303,25 @@ call HighLight('texComment', 'commnt', '', 'none') " JavaScript {{{2 -call HighLight('javaScriptNumber', 'cyan', '', 'bold') -call HighLight('javascriptNull', 'red', '', 'bold') +call HighLight('javaScriptNumber', 'cyan', '', '') +call HighLight('javascriptNull', 'red', '', '') call HighLight('javascriptStatement', 'green', '', '') call HighLight('javaScriptConditional', 'green', '', '') call HighLight('javaScriptRepeat', 'purple', '', '') -call HighLight('javaScriptBraces', 'purple', '', 'bold') -call HighLight('javascriptGlobal', 'yellow', '', 'bold') -call HighLight('javaScriptFunction', 'orange', '', 'bold') -call HighLight('javaScriptMember', 'orange', '', 'bold') +call HighLight('javaScriptBraces', 'purple', '', '') +call HighLight('javascriptGlobal', 'yellow', '', '') +call HighLight('javaScriptFunction', 'orange', '', '') +call HighLight('javaScriptMember', 'orange', '', '') " HTML {{{2 call HighLight('htmlTag', 'red', '', '') -call HighLight('htmlTagName', 'red', '', 'bold') -call HighLight('htmlLink', 'blue', '', 'bold') -call HighLight('htmlArg', 'green', '', 'bold') -call HighLight('htmlScriptTag', 'purple', '', 'bold') -call HighLight('htmlTitle', 'blue', '', 'bold') -call HighLight('htmlH1', 'blue', '', 'bold') +call HighLight('htmlTagName', 'red', '', '') +call HighLight('htmlLink', 'blue', '', '') +call HighLight('htmlArg', 'green', '', '') +call HighLight('htmlScriptTag', 'purple', '', '') +call HighLight('htmlTitle', 'blue', '', '') +call HighLight('htmlH1', 'blue', '', '') call HighLight('htmlH2', 'cyan', '', '') call HighLight('htmlH3', 'cyan', '', '') call HighLight('htmlH4', 'green', '', '') @@ -403,10 +341,10 @@ call HighLight('markdownHeadingDelimiter', 'red', '', '') call HighLight('markdownListMarker', 'blue', '', '') call HighLight('markdownOrderedListMarker', 'blue', '', '') call HighLight('markdownCode', 'purple', '', '') -call HighLight('markdownCodeBlock', 'purple', '', 'bold') -call HighLight('markdownCodeDelimiter', 'orange', '', 'bold') -call HighLight('markdownH1', 'blue', '', 'bold') -call HighLight('markdownH2', 'blue', '', 'bold') +call HighLight('markdownCodeBlock', 'purple', '', '') +call HighLight('markdownCodeDelimiter', 'purple', '', '') +call HighLight('markdownH1', 'blue', '', '') +call HighLight('markdownH2', 'blue', '', '') call HighLight('markdownH3', 'cyan', '', '') call HighLight('markdownH4', 'cyan', '', '') call HighLight('markdownH5', 'green', '', '') @@ -503,13 +441,14 @@ call HighLight('scalaLineComment', 'commnt', '', '') " Diff {{{2 -call HighLight('DiffDelete', 'red', '', '') -call HighLight('DiffChange', 'blue', '', '') -call HighLight('DiffAdd', 'green', '', '') -call HighLight('DiffText', 'line', 'blue', 'bold') +call HighLight('DiffDelete', 'red', '', '') +call HighLight('DiffChange', 'blue', '', '') +call HighLight('DiffAdd', 'green', '', '') +call HighLight('DiffText', 'line', 'blue', '') " Cleanup {{{2 " Remove the highlight function as it's no longer needed. " Will cause problems reloading the theme if not deleted. delfunction HighLight +let g:colors_name = 'jinx' diff --git a/base/.vimrc b/base/.vimrc index b2006eed..aa205449 100644 --- a/base/.vimrc +++ b/base/.vimrc @@ -44,7 +44,7 @@ set linebreak breakindent set list listchars=tab:>>,trail:~ " midnight, night, or day -let g:jinx_colors = 'midnight' +let g:jinx_theme = 'midnight' try colorscheme jinx @@ -54,13 +54,11 @@ endtry if $TERM !=? 'linux' set termguicolors - " true colors in terminals (neovim doesn't need this) if !has('nvim') && !($TERM =~? 'xterm' || &term =~? 'xterm') let $TERM = 'xterm-256color' let &term = 'xterm-256color' endif - if has('multi_byte') && $TERM !=? 'linux' set listchars=tab:»»,trail:• set fillchars=vert:┃ showbreak=↪ diff --git a/bspwm-home/.config/bspwm/bspwmrc b/bspwm-home/.config/bspwm/bspwmrc index 3fb0fce7..db9bfae0 100755 --- a/bspwm-home/.config/bspwm/bspwmrc +++ b/bspwm-home/.config/bspwm/bspwmrc @@ -6,9 +6,6 @@ xsetroot -cursor_name left_ptr # key bindings sxhkd & -# wallpaper -nitrogen --restore & - # launch compton al-compositor --start & diff --git a/i3-gaps-home/.config/i3/config b/i3-gaps-home/.config/i3/config index 20ef6751..4b72720d 100644 --- a/i3-gaps-home/.config/i3/config +++ b/i3-gaps-home/.config/i3/config @@ -59,12 +59,8 @@ set $Mon2 HDMI2 # run with reload exec_always --no-startup-id al-polybar-session -exec_always --no-startup-id nitrogen --restore exec_always --no-startup-id xrdb -load ~/.Xresources -# If you have a numpad you may want to enable this -# exec_always --no-startup-id numlockx on - # run once exec --no-startup-id xfsettingsd exec --no-startup-id al-compositor --start