diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index d6b571b..0b7c85e 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -11,6 +11,9 @@ Plugin 'ctrlpvim/ctrlp.vim' Plugin 'ervandew/supertab' Plugin 'hashivim/vim-terraform' Plugin 'itchyny/lightline.vim' +Plugin 'joshdick/onedark.vim' +Plugin 'Matt-Deacalion/vim-systemd-syntax' +Plugin 'nanotech/jellybeans.vim' Plugin 'NLKNguyen/papercolor-theme' Plugin 'rust-lang/rust.vim' Plugin 'scrooloose/syntastic' @@ -345,5 +348,17 @@ let g:syntastic_auto_loc_list = 1 let g:syntastic_check_on_open = 1 let g:syntastic_check_on_wq = 0 -color dln-light +let g:onedark_termcolors = 256 +let g:onedark_use_term_italics = 1 +let g:onedark_terminal_italics = 0 + +let g:jellybeans_use_term_italics = 1 +let g:jellybeans_overrides = { +\ 'background': { 'ctermbg': 'none', '256ctermbg': 'none' }, +\ 'Comment': { 'ctermfg': '25', 'cterm': 'italic' }, +\ 'LineNr': { 'ctermfg': '252', 'cterm': 'italic' }, +\} + +" color dln-light +color jellybeans diff --git a/.config/redshift.conf b/.config/redshift.conf index 7c480a4..7f02273 100644 --- a/.config/redshift.conf +++ b/.config/redshift.conf @@ -1,6 +1,6 @@ [redshift] temp-day=5800 -temp-night=4300 +temp-night=3700 brightness-day=0.99 brightness-night=0.7 location-provider=manual diff --git a/.gitconfig b/.gitconfig index dd91130..800aa36 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,6 @@ [core] excludesfile = "~/.gitignore" -editor = vim +editor = nvim [user] name = Daniel Lundin diff --git a/.vim/colors/dln-jellybeans.vim b/.vim/colors/dln-jellybeans.vim deleted file mode 100644 index 18be1c3..0000000 --- a/.vim/colors/dln-jellybeans.vim +++ /dev/null @@ -1,570 +0,0 @@ -" Vim color file -" -" " __ _ _ _ " -" " \ \ ___| | |_ _| |__ ___ __ _ _ __ ___ " -" " \ \/ _ \ | | | | | _ \ / _ \/ _ | _ \/ __| " -" " /\_/ / __/ | | |_| | |_| | __/ |_| | | | \__ \ " -" " \___/ \___|_|_|\__ |____/ \___|\____|_| |_|___/ " -" " \___/ " -" -" "A colorful, dark color scheme for Vim." -" -" File: jellybeans.vim -" URL: github.com/nanotech/jellybeans.vim -" Scripts URL: vim.org/scripts/script.php?script_id=2555 -" Maintainer: NanoTech (nanotech.nanotechcorp.net) -" Version: 1.6~git -" Last Change: January 15th, 2012 -" License: MIT -" Contributors: Daniel Herbert (pocketninja) -" Henry So, Jr. -" David Liang -" Rich Healey (richo) -" Andrew Wong (w0ng) -" -" Copyright (c) 2009-2012 NanoTech -" -" Permission is hereby granted, free of charge, to any per‐ -" son obtaining a copy of this software and associated doc‐ -" umentation files (the “Software”), to deal in the Soft‐ -" ware without restriction, including without limitation -" the rights to use, copy, modify, merge, publish, distrib‐ -" ute, 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 PARTICU‐ -" LAR 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 CON‐ -" TRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON‐ -" NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -" THE SOFTWARE. - -set background=dark - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "dln-jellybeans" - -if has("gui_running") || &t_Co == 88 || &t_Co == 256 - let s:low_color = 0 -else - let s:low_color = 1 -endif - -" Color approximation functions by Henry So, Jr. and David Liang {{{ -" Added to jellybeans.vim by Daniel Herbert - -" returns an approximate grey index for the given grey level -fun! s:grey_number(x) - if &t_Co == 88 - if a:x < 23 - return 0 - elseif a:x < 69 - return 1 - elseif a:x < 103 - return 2 - elseif a:x < 127 - return 3 - elseif a:x < 150 - return 4 - elseif a:x < 173 - return 5 - elseif a:x < 196 - return 6 - elseif a:x < 219 - return 7 - elseif a:x < 243 - return 8 - else - return 9 - endif - else - if a:x < 14 - return 0 - else - let l:n = (a:x - 8) / 10 - let l:m = (a:x - 8) % 10 - if l:m < 5 - return l:n - else - return l:n + 1 - endif - endif - endif -endfun - -" returns the actual grey level represented by the grey index -fun! s:grey_level(n) - if &t_Co == 88 - if a:n == 0 - return 0 - elseif a:n == 1 - return 46 - elseif a:n == 2 - return 92 - elseif a:n == 3 - return 115 - elseif a:n == 4 - return 139 - elseif a:n == 5 - return 162 - elseif a:n == 6 - return 185 - elseif a:n == 7 - return 208 - elseif a:n == 8 - return 231 - else - return 255 - endif - else - if a:n == 0 - return 0 - else - return 8 + (a:n * 10) - endif - endif -endfun - -" returns the palette index for the given grey index -fun! s:grey_color(n) - if &t_Co == 88 - if a:n == 0 - return 16 - elseif a:n == 9 - return 79 - else - return 79 + a:n - endif - else - if a:n == 0 - return 16 - elseif a:n == 25 - return 231 - else - return 231 + a:n - endif - endif -endfun - -" returns an approximate color index for the given color level -fun! s:rgb_number(x) - if &t_Co == 88 - if a:x < 69 - return 0 - elseif a:x < 172 - return 1 - elseif a:x < 230 - return 2 - else - return 3 - endif - else - if a:x < 75 - return 0 - else - let l:n = (a:x - 55) / 40 - let l:m = (a:x - 55) % 40 - if l:m < 20 - return l:n - else - return l:n + 1 - endif - endif - endif -endfun - -" returns the actual color level for the given color index -fun! s:rgb_level(n) - if &t_Co == 88 - if a:n == 0 - return 0 - elseif a:n == 1 - return 139 - elseif a:n == 2 - return 205 - else - return 255 - endif - else - if a:n == 0 - return 0 - else - return 55 + (a:n * 40) - endif - endif -endfun - -" returns the palette index for the given R/G/B color indices -fun! s:rgb_color(x, y, z) - if &t_Co == 88 - return 16 + (a:x * 16) + (a:y * 4) + a:z - else - return 16 + (a:x * 36) + (a:y * 6) + a:z - endif -endfun - -" returns the palette index to approximate the given R/G/B color levels -fun! s:color(r, g, b) - " get the closest grey - let l:gx = s:grey_number(a:r) - let l:gy = s:grey_number(a:g) - let l:gz = s:grey_number(a:b) - - " get the closest color - let l:x = s:rgb_number(a:r) - let l:y = s:rgb_number(a:g) - let l:z = s:rgb_number(a:b) - - if l:gx == l:gy && l:gy == l:gz - " there are two possibilities - let l:dgr = s:grey_level(l:gx) - a:r - let l:dgg = s:grey_level(l:gy) - a:g - let l:dgb = s:grey_level(l:gz) - a:b - let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) - let l:dr = s:rgb_level(l:gx) - a:r - let l:dg = s:rgb_level(l:gy) - a:g - let l:db = s:rgb_level(l:gz) - a:b - let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db) - if l:dgrey < l:drgb - " use the grey - return s:grey_color(l:gx) - else - " use the color - return s:rgb_color(l:x, l:y, l:z) - endif - else - " only one possibility - return s:rgb_color(l:x, l:y, l:z) - endif -endfun - -" returns the palette index to approximate the 'rrggbb' hex string -fun! s:rgb(rgb) - let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0 - let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0 - let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0 - return s:color(l:r, l:g, l:b) -endfun - -" sets the highlighting for the given group -fun! s:X(group, fg, bg, attr, lcfg, lcbg) - if s:low_color - let l:fge = empty(a:lcfg) - let l:bge = empty(a:lcbg) - - if !l:fge && !l:bge - exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=".a:lcbg - elseif !l:fge && l:bge - exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=NONE" - elseif l:fge && !l:bge - exec "hi ".a:group." ctermfg=NONE ctermbg=".a:lcbg - endif - else - let l:fge = empty(a:fg) - let l:bge = empty(a:bg) - - if !l:fge && !l:bge - exec "hi ".a:group." guifg=#".a:fg." guibg=#".a:bg." ctermfg=".s:rgb(a:fg)." ctermbg=".s:rgb(a:bg) - elseif !l:fge && l:bge - exec "hi ".a:group." guifg=#".a:fg." guibg=NONE ctermfg=".s:rgb(a:fg)." ctermbg=NONE" - elseif l:fge && !l:bge - exec "hi ".a:group." guifg=NONE guibg=#".a:bg." ctermfg=NONE ctermbg=".s:rgb(a:bg) - endif - endif - - if a:attr == "" - exec "hi ".a:group." gui=none cterm=none" - else - " let l:noitalic = join(filter(split(a:attr, ","), "v:val !=? 'italic'"), ",") - let l:noitalic = a:attr - if empty(l:noitalic) - let l:noitalic = "none" - endif - exec "hi ".a:group." gui=".a:attr." cterm=".l:noitalic - endif -endfun -" }}} - -if !exists("g:jellybeans_background_color") - let g:jellybeans_background_color = "151515" -end - -call s:X("Normal","e8e8d3",g:jellybeans_background_color,"","White","") -set background=dark - -if !exists("g:jellybeans_use_lowcolor_black") || g:jellybeans_use_lowcolor_black - let s:termBlack = "Black" -else - let s:termBlack = "Grey" -endif - -if version >= 700 - call s:X("CursorLine","","222222","","",s:termBlack) - call s:X("CursorColumn","","1c1c1c","","",s:termBlack) - call s:X("MatchParen","ffffff","556779","bold","","DarkCyan") - - call s:X("TabLine","000000","b0b8c0","italic","",s:termBlack) - call s:X("TabLineFill","9098a0","","","",s:termBlack) - call s:X("TabLineSel","000000","f0f0f0","italic,bold",s:termBlack,"White") - - " Auto-completion - call s:X("Pmenu","ffffff","606060","","White",s:termBlack) - call s:X("PmenuSel","101010","eeeeee","",s:termBlack,"White") -endif - -call s:X("Visual","","404040","","",s:termBlack) -call s:X("Cursor",g:jellybeans_background_color,"b0d0f0","","","") - -call s:X("LineNr","444444",g:jellybeans_background_color,"italic",s:termBlack,"") -call s:X("CursorLineNr","ccc5c4","","none","White","") -call s:X("Comment","888888","","italic","Grey","") -call s:X("Todo","c7c7c7","","bold","White",s:termBlack) - -call s:X("StatusLine","000000","dddddd","italic","","White") -call s:X("StatusLineNC","ffffff","403c41","italic","White","Black") -call s:X("VertSplit","777777","403c41","",s:termBlack,s:termBlack) -call s:X("WildMenu","f0a0c0","302028","","Magenta","") - -call s:X("Folded","a0a8b0","384048","italic",s:termBlack,"") -call s:X("FoldColumn","535D66","1f1f1f","","",s:termBlack) -call s:X("SignColumn","777777","333333","","",s:termBlack) -call s:X("ColorColumn","","000000","","",s:termBlack) - -call s:X("Title","70b950","","bold","Green","") - -call s:X("Constant","cf6a4c","","","Red","") -call s:X("Special","799d6a","","","Green","") -call s:X("Delimiter","668799","","","Grey","") - -call s:X("String","99ad6a","","","Green","") -call s:X("StringDelimiter","556633","","","DarkGreen","") - -call s:X("Identifier","c6b6ee","","","LightCyan","") -call s:X("Structure","8fbfdc","","","LightCyan","") -call s:X("Function","fad07a","","","Yellow","") -call s:X("Statement","8197bf","","","DarkBlue","") -call s:X("PreProc","8fbfdc","","","LightBlue","") - -hi! link Operator Structure - -call s:X("Type","ffb964","","","Yellow","") -call s:X("NonText","606060",g:jellybeans_background_color,"",s:termBlack,"") - -call s:X("SpecialKey","444444","1c1c1c","",s:termBlack,"") - -call s:X("Search","f0a0c0","302028","underline","Magenta","") - -call s:X("Directory","dad085","","","Yellow","") -call s:X("ErrorMsg","","902020","","","DarkRed") -hi! link Error ErrorMsg -hi! link MoreMsg Special -call s:X("Question","65C254","","","Green","") - - -" Spell Checking - -call s:X("SpellBad","","902020","underline","","DarkRed") -call s:X("SpellCap","","0000df","underline","","Blue") -call s:X("SpellRare","","540063","underline","","DarkMagenta") -call s:X("SpellLocal","","2D7067","underline","","Green") - -" Diff - -hi! link diffRemoved Constant -hi! link diffAdded String - -" VimDiff - -call s:X("DiffAdd","D2EBBE","437019","","White","DarkGreen") -call s:X("DiffDelete","40000A","700009","","DarkRed","DarkRed") -call s:X("DiffChange","","2B5B77","","White","DarkBlue") -call s:X("DiffText","8fbfdc","000000","reverse","Yellow","") - -" PHP - -hi! link phpFunctions Function -call s:X("StorageClass","c59f6f","","","Red","") -hi! link phpSuperglobal Identifier -hi! link phpQuoteSingle StringDelimiter -hi! link phpQuoteDouble StringDelimiter -hi! link phpBoolean Constant -hi! link phpNull Constant -hi! link phpArrayPair Operator -hi! link phpOperator Normal -hi! link phpRelation Normal -hi! link phpVarSelector Identifier - -" Python - -hi! link pythonOperator Statement - -" Ruby - -hi! link rubySharpBang Comment -call s:X("rubyClass","447799","","","DarkBlue","") -call s:X("rubyIdentifier","c6b6fe","","","Cyan","") -hi! link rubyConstant Type -hi! link rubyFunction Function - -call s:X("rubyInstanceVariable","c6b6fe","","","Cyan","") -call s:X("rubySymbol","7697d6","","","Blue","") -hi! link rubyGlobalVariable rubyInstanceVariable -hi! link rubyModule rubyClass -call s:X("rubyControl","7597c6","","","Blue","") - -hi! link rubyString String -hi! link rubyStringDelimiter StringDelimiter -hi! link rubyInterpolationDelimiter Identifier - -call s:X("rubyRegexpDelimiter","540063","","","Magenta","") -call s:X("rubyRegexp","dd0093","","","DarkMagenta","") -call s:X("rubyRegexpSpecial","a40073","","","Magenta","") - -call s:X("rubyPredefinedIdentifier","de5577","","","Red","") - -" Erlang - -hi! link erlangAtom rubySymbol -hi! link erlangBIF rubyPredefinedIdentifier -hi! link erlangFunction rubyPredefinedIdentifier -hi! link erlangDirective Statement -hi! link erlangNode Identifier - -" JavaScript - -hi! link javaScriptValue Constant -hi! link javaScriptRegexpString rubyRegexp - -" CoffeeScript - -hi! link coffeeRegExp javaScriptRegexpString - -" Lua - -hi! link luaOperator Conditional - -" C - -hi! link cFormat Identifier -hi! link cOperator Constant - -" Objective-C/Cocoa - -hi! link objcClass Type -hi! link cocoaClass objcClass -hi! link objcSubclass objcClass -hi! link objcSuperclass objcClass -hi! link objcDirective rubyClass -hi! link objcStatement Constant -hi! link cocoaFunction Function -hi! link objcMethodName Identifier -hi! link objcMethodArg Normal -hi! link objcMessageName Identifier - -" Vimscript - -hi! link vimOper Normal - -" HTML - -hi! link htmlTag Statement -hi! link htmlEndTag htmlTag -hi! link htmlTagName htmlTag - -" XML - -hi! link xmlTag Statement -hi! link xmlEndTag xmlTag -hi! link xmlTagName xmlTag -hi! link xmlEqual xmlTag -hi! link xmlEntity Special -hi! link xmlEntityPunct xmlEntity -hi! link xmlDocTypeDecl PreProc -hi! link xmlDocTypeKeyword PreProc -hi! link xmlProcessingDelim xmlAttrib - -" Debugger.vim - -call s:X("DbgCurrent","DEEBFE","345FA8","","White","DarkBlue") -call s:X("DbgBreakPt","","4F0037","","","DarkMagenta") - -" vim-indent-guides - -if !exists("g:indent_guides_auto_colors") - let g:indent_guides_auto_colors = 0 -endif -call s:X("IndentGuidesOdd","","232323","","","") -call s:X("IndentGuidesEven","","1b1b1b","","","") - -" Plugins, etc. - -hi! link TagListFileName Directory -call s:X("PreciseJumpTarget","B9ED67","405026","","White","Green") - -if !exists("g:jellybeans_background_color_256") - let g:jellybeans_background_color_256=233 -end -" Manual overrides for 256-color terminals. Dark colors auto-map badly. -if !s:low_color - hi StatusLineNC ctermbg=235 - hi Folded ctermbg=236 - hi FoldColumn ctermbg=234 - hi SignColumn ctermbg=236 - hi CursorColumn ctermbg=234 - hi CursorLine ctermbg=235 - hi SpecialKey ctermbg=234 - exec "hi NonText ctermbg=".g:jellybeans_background_color_256 - exec "hi LineNr ctermbg=".g:jellybeans_background_color_256 - hi DiffText ctermfg=81 - exec "hi Normal ctermbg=".g:jellybeans_background_color_256 - hi DbgBreakPt ctermbg=53 - hi IndentGuidesOdd ctermbg=235 - hi IndentGuidesEven ctermbg=234 -endif - -if exists("g:jellybeans_overrides") - fun! s:load_colors(defs) - for [l:group, l:v] in items(a:defs) - call s:X(l:group, get(l:v, 'guifg', ''), get(l:v, 'guibg', ''), - \ get(l:v, 'attr', ''), - \ get(l:v, 'ctermfg', ''), get(l:v, 'ctermbg', '')) - if !s:low_color - for l:prop in ['ctermfg', 'ctermbg'] - let l:override_key = '256'.l:prop - if has_key(l:v, l:override_key) - exec "hi ".l:group." ".l:prop."=".l:v[l:override_key] - endif - endfor - endif - unlet l:group - unlet l:v - endfor - endfun - call s:load_colors(g:jellybeans_overrides) - delf s:load_colors -endif - -" delete functions {{{ -delf s:X -delf s:rgb -delf s:color -delf s:rgb_color -delf s:rgb_level -delf s:rgb_number -delf s:grey_color -delf s:grey_level -delf s:grey_number -" }}} diff --git a/.vim/colors/dln-light.vim b/.vim/colors/dln-light.vim index 4f372b0..3309624 100644 --- a/.vim/colors/dln-light.vim +++ b/.vim/colors/dln-light.vim @@ -1,4 +1,5 @@ " Vim color file +color s " Maintainer: Daniel Lundin " Last Change: Mon Oct 17 13:18:58 CEST 2016 diff --git a/.vim/colors/jellybeans.vim b/.vim/colors/jellybeans.vim deleted file mode 100644 index f9d5397..0000000 --- a/.vim/colors/jellybeans.vim +++ /dev/null @@ -1,569 +0,0 @@ -" Vim color file -" -" " __ _ _ _ " -" " \ \ ___| | |_ _| |__ ___ __ _ _ __ ___ " -" " \ \/ _ \ | | | | | _ \ / _ \/ _ | _ \/ __| " -" " /\_/ / __/ | | |_| | |_| | __/ |_| | | | \__ \ " -" " \___/ \___|_|_|\__ |____/ \___|\____|_| |_|___/ " -" " \___/ " -" -" "A colorful, dark color scheme for Vim." -" -" File: jellybeans.vim -" URL: github.com/nanotech/jellybeans.vim -" Scripts URL: vim.org/scripts/script.php?script_id=2555 -" Maintainer: NanoTech (nanotech.nanotechcorp.net) -" Version: 1.6~git -" Last Change: January 15th, 2012 -" License: MIT -" Contributors: Daniel Herbert (pocketninja) -" Henry So, Jr. -" David Liang -" Rich Healey (richo) -" Andrew Wong (w0ng) -" -" Copyright (c) 2009-2012 NanoTech -" -" Permission is hereby granted, free of charge, to any per‐ -" son obtaining a copy of this software and associated doc‐ -" umentation files (the “Software”), to deal in the Soft‐ -" ware without restriction, including without limitation -" the rights to use, copy, modify, merge, publish, distrib‐ -" ute, 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 PARTICU‐ -" LAR 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 CON‐ -" TRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON‐ -" NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -" THE SOFTWARE. - -set background=dark - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "jellybeans" - -if has("gui_running") || &t_Co == 88 || &t_Co == 256 - let s:low_color = 0 -else - let s:low_color = 1 -endif - -" Color approximation functions by Henry So, Jr. and David Liang {{{ -" Added to jellybeans.vim by Daniel Herbert - -" returns an approximate grey index for the given grey level -fun! s:grey_number(x) - if &t_Co == 88 - if a:x < 23 - return 0 - elseif a:x < 69 - return 1 - elseif a:x < 103 - return 2 - elseif a:x < 127 - return 3 - elseif a:x < 150 - return 4 - elseif a:x < 173 - return 5 - elseif a:x < 196 - return 6 - elseif a:x < 219 - return 7 - elseif a:x < 243 - return 8 - else - return 9 - endif - else - if a:x < 14 - return 0 - else - let l:n = (a:x - 8) / 10 - let l:m = (a:x - 8) % 10 - if l:m < 5 - return l:n - else - return l:n + 1 - endif - endif - endif -endfun - -" returns the actual grey level represented by the grey index -fun! s:grey_level(n) - if &t_Co == 88 - if a:n == 0 - return 0 - elseif a:n == 1 - return 46 - elseif a:n == 2 - return 92 - elseif a:n == 3 - return 115 - elseif a:n == 4 - return 139 - elseif a:n == 5 - return 162 - elseif a:n == 6 - return 185 - elseif a:n == 7 - return 208 - elseif a:n == 8 - return 231 - else - return 255 - endif - else - if a:n == 0 - return 0 - else - return 8 + (a:n * 10) - endif - endif -endfun - -" returns the palette index for the given grey index -fun! s:grey_color(n) - if &t_Co == 88 - if a:n == 0 - return 16 - elseif a:n == 9 - return 79 - else - return 79 + a:n - endif - else - if a:n == 0 - return 16 - elseif a:n == 25 - return 231 - else - return 231 + a:n - endif - endif -endfun - -" returns an approximate color index for the given color level -fun! s:rgb_number(x) - if &t_Co == 88 - if a:x < 69 - return 0 - elseif a:x < 172 - return 1 - elseif a:x < 230 - return 2 - else - return 3 - endif - else - if a:x < 75 - return 0 - else - let l:n = (a:x - 55) / 40 - let l:m = (a:x - 55) % 40 - if l:m < 20 - return l:n - else - return l:n + 1 - endif - endif - endif -endfun - -" returns the actual color level for the given color index -fun! s:rgb_level(n) - if &t_Co == 88 - if a:n == 0 - return 0 - elseif a:n == 1 - return 139 - elseif a:n == 2 - return 205 - else - return 255 - endif - else - if a:n == 0 - return 0 - else - return 55 + (a:n * 40) - endif - endif -endfun - -" returns the palette index for the given R/G/B color indices -fun! s:rgb_color(x, y, z) - if &t_Co == 88 - return 16 + (a:x * 16) + (a:y * 4) + a:z - else - return 16 + (a:x * 36) + (a:y * 6) + a:z - endif -endfun - -" returns the palette index to approximate the given R/G/B color levels -fun! s:color(r, g, b) - " get the closest grey - let l:gx = s:grey_number(a:r) - let l:gy = s:grey_number(a:g) - let l:gz = s:grey_number(a:b) - - " get the closest color - let l:x = s:rgb_number(a:r) - let l:y = s:rgb_number(a:g) - let l:z = s:rgb_number(a:b) - - if l:gx == l:gy && l:gy == l:gz - " there are two possibilities - let l:dgr = s:grey_level(l:gx) - a:r - let l:dgg = s:grey_level(l:gy) - a:g - let l:dgb = s:grey_level(l:gz) - a:b - let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) - let l:dr = s:rgb_level(l:gx) - a:r - let l:dg = s:rgb_level(l:gy) - a:g - let l:db = s:rgb_level(l:gz) - a:b - let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db) - if l:dgrey < l:drgb - " use the grey - return s:grey_color(l:gx) - else - " use the color - return s:rgb_color(l:x, l:y, l:z) - endif - else - " only one possibility - return s:rgb_color(l:x, l:y, l:z) - endif -endfun - -" returns the palette index to approximate the 'rrggbb' hex string -fun! s:rgb(rgb) - let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0 - let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0 - let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0 - return s:color(l:r, l:g, l:b) -endfun - -" sets the highlighting for the given group -fun! s:X(group, fg, bg, attr, lcfg, lcbg) - if s:low_color - let l:fge = empty(a:lcfg) - let l:bge = empty(a:lcbg) - - if !l:fge && !l:bge - exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=".a:lcbg - elseif !l:fge && l:bge - exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=NONE" - elseif l:fge && !l:bge - exec "hi ".a:group." ctermfg=NONE ctermbg=".a:lcbg - endif - else - let l:fge = empty(a:fg) - let l:bge = empty(a:bg) - - if !l:fge && !l:bge - exec "hi ".a:group." guifg=#".a:fg." guibg=#".a:bg." ctermfg=".s:rgb(a:fg)." ctermbg=".s:rgb(a:bg) - elseif !l:fge && l:bge - exec "hi ".a:group." guifg=#".a:fg." guibg=NONE ctermfg=".s:rgb(a:fg)." ctermbg=NONE" - elseif l:fge && !l:bge - exec "hi ".a:group." guifg=NONE guibg=#".a:bg." ctermfg=NONE ctermbg=".s:rgb(a:bg) - endif - endif - - if a:attr == "" - exec "hi ".a:group." gui=none cterm=none" - else - let l:noitalic = join(filter(split(a:attr, ","), "v:val !=? 'italic'"), ",") - if empty(l:noitalic) - let l:noitalic = "none" - endif - exec "hi ".a:group." gui=".a:attr." cterm=".l:noitalic - endif -endfun -" }}} - -if !exists("g:jellybeans_background_color") - let g:jellybeans_background_color = "151515" -end - -call s:X("Normal","e8e8d3",g:jellybeans_background_color,"","White","") -set background=dark - -if !exists("g:jellybeans_use_lowcolor_black") || g:jellybeans_use_lowcolor_black - let s:termBlack = "Black" -else - let s:termBlack = "Grey" -endif - -if version >= 700 - call s:X("CursorLine","","1c1c1c","","",s:termBlack) - call s:X("CursorColumn","","1c1c1c","","",s:termBlack) - call s:X("MatchParen","ffffff","556779","bold","","DarkCyan") - - call s:X("TabLine","000000","b0b8c0","italic","",s:termBlack) - call s:X("TabLineFill","9098a0","","","",s:termBlack) - call s:X("TabLineSel","000000","f0f0f0","italic,bold",s:termBlack,"White") - - " Auto-completion - call s:X("Pmenu","ffffff","606060","","White",s:termBlack) - call s:X("PmenuSel","101010","eeeeee","",s:termBlack,"White") -endif - -call s:X("Visual","","404040","","",s:termBlack) -call s:X("Cursor",g:jellybeans_background_color,"b0d0f0","","","") - -call s:X("LineNr","605958",g:jellybeans_background_color,"none",s:termBlack,"") -call s:X("CursorLineNr","ccc5c4","","none","White","") -call s:X("Comment","888888","","italic","Grey","") -call s:X("Todo","c7c7c7","","bold","White",s:termBlack) - -call s:X("StatusLine","000000","dddddd","italic","","White") -call s:X("StatusLineNC","ffffff","403c41","italic","White","Black") -call s:X("VertSplit","777777","403c41","",s:termBlack,s:termBlack) -call s:X("WildMenu","f0a0c0","302028","","Magenta","") - -call s:X("Folded","a0a8b0","384048","italic",s:termBlack,"") -call s:X("FoldColumn","535D66","1f1f1f","","",s:termBlack) -call s:X("SignColumn","777777","333333","","",s:termBlack) -call s:X("ColorColumn","","000000","","",s:termBlack) - -call s:X("Title","70b950","","bold","Green","") - -call s:X("Constant","cf6a4c","","","Red","") -call s:X("Special","799d6a","","","Green","") -call s:X("Delimiter","668799","","","Grey","") - -call s:X("String","99ad6a","","","Green","") -call s:X("StringDelimiter","556633","","","DarkGreen","") - -call s:X("Identifier","c6b6ee","","","LightCyan","") -call s:X("Structure","8fbfdc","","","LightCyan","") -call s:X("Function","fad07a","","","Yellow","") -call s:X("Statement","8197bf","","","DarkBlue","") -call s:X("PreProc","8fbfdc","","","LightBlue","") - -hi! link Operator Structure - -call s:X("Type","ffb964","","","Yellow","") -call s:X("NonText","606060",g:jellybeans_background_color,"",s:termBlack,"") - -call s:X("SpecialKey","444444","1c1c1c","",s:termBlack,"") - -call s:X("Search","f0a0c0","302028","underline","Magenta","") - -call s:X("Directory","dad085","","","Yellow","") -call s:X("ErrorMsg","","902020","","","DarkRed") -hi! link Error ErrorMsg -hi! link MoreMsg Special -call s:X("Question","65C254","","","Green","") - - -" Spell Checking - -call s:X("SpellBad","","902020","underline","","DarkRed") -call s:X("SpellCap","","0000df","underline","","Blue") -call s:X("SpellRare","","540063","underline","","DarkMagenta") -call s:X("SpellLocal","","2D7067","underline","","Green") - -" Diff - -hi! link diffRemoved Constant -hi! link diffAdded String - -" VimDiff - -call s:X("DiffAdd","D2EBBE","437019","","White","DarkGreen") -call s:X("DiffDelete","40000A","700009","","DarkRed","DarkRed") -call s:X("DiffChange","","2B5B77","","White","DarkBlue") -call s:X("DiffText","8fbfdc","000000","reverse","Yellow","") - -" PHP - -hi! link phpFunctions Function -call s:X("StorageClass","c59f6f","","","Red","") -hi! link phpSuperglobal Identifier -hi! link phpQuoteSingle StringDelimiter -hi! link phpQuoteDouble StringDelimiter -hi! link phpBoolean Constant -hi! link phpNull Constant -hi! link phpArrayPair Operator -hi! link phpOperator Normal -hi! link phpRelation Normal -hi! link phpVarSelector Identifier - -" Python - -hi! link pythonOperator Statement - -" Ruby - -hi! link rubySharpBang Comment -call s:X("rubyClass","447799","","","DarkBlue","") -call s:X("rubyIdentifier","c6b6fe","","","Cyan","") -hi! link rubyConstant Type -hi! link rubyFunction Function - -call s:X("rubyInstanceVariable","c6b6fe","","","Cyan","") -call s:X("rubySymbol","7697d6","","","Blue","") -hi! link rubyGlobalVariable rubyInstanceVariable -hi! link rubyModule rubyClass -call s:X("rubyControl","7597c6","","","Blue","") - -hi! link rubyString String -hi! link rubyStringDelimiter StringDelimiter -hi! link rubyInterpolationDelimiter Identifier - -call s:X("rubyRegexpDelimiter","540063","","","Magenta","") -call s:X("rubyRegexp","dd0093","","","DarkMagenta","") -call s:X("rubyRegexpSpecial","a40073","","","Magenta","") - -call s:X("rubyPredefinedIdentifier","de5577","","","Red","") - -" Erlang - -hi! link erlangAtom rubySymbol -hi! link erlangBIF rubyPredefinedIdentifier -hi! link erlangFunction rubyPredefinedIdentifier -hi! link erlangDirective Statement -hi! link erlangNode Identifier - -" JavaScript - -hi! link javaScriptValue Constant -hi! link javaScriptRegexpString rubyRegexp - -" CoffeeScript - -hi! link coffeeRegExp javaScriptRegexpString - -" Lua - -hi! link luaOperator Conditional - -" C - -hi! link cFormat Identifier -hi! link cOperator Constant - -" Objective-C/Cocoa - -hi! link objcClass Type -hi! link cocoaClass objcClass -hi! link objcSubclass objcClass -hi! link objcSuperclass objcClass -hi! link objcDirective rubyClass -hi! link objcStatement Constant -hi! link cocoaFunction Function -hi! link objcMethodName Identifier -hi! link objcMethodArg Normal -hi! link objcMessageName Identifier - -" Vimscript - -hi! link vimOper Normal - -" HTML - -hi! link htmlTag Statement -hi! link htmlEndTag htmlTag -hi! link htmlTagName htmlTag - -" XML - -hi! link xmlTag Statement -hi! link xmlEndTag xmlTag -hi! link xmlTagName xmlTag -hi! link xmlEqual xmlTag -hi! link xmlEntity Special -hi! link xmlEntityPunct xmlEntity -hi! link xmlDocTypeDecl PreProc -hi! link xmlDocTypeKeyword PreProc -hi! link xmlProcessingDelim xmlAttrib - -" Debugger.vim - -call s:X("DbgCurrent","DEEBFE","345FA8","","White","DarkBlue") -call s:X("DbgBreakPt","","4F0037","","","DarkMagenta") - -" vim-indent-guides - -if !exists("g:indent_guides_auto_colors") - let g:indent_guides_auto_colors = 0 -endif -call s:X("IndentGuidesOdd","","232323","","","") -call s:X("IndentGuidesEven","","1b1b1b","","","") - -" Plugins, etc. - -hi! link TagListFileName Directory -call s:X("PreciseJumpTarget","B9ED67","405026","","White","Green") - -if !exists("g:jellybeans_background_color_256") - let g:jellybeans_background_color_256=233 -end -" Manual overrides for 256-color terminals. Dark colors auto-map badly. -if !s:low_color - hi StatusLineNC ctermbg=235 - hi Folded ctermbg=236 - hi FoldColumn ctermbg=234 - hi SignColumn ctermbg=236 - hi CursorColumn ctermbg=234 - hi CursorLine ctermbg=234 - hi SpecialKey ctermbg=234 - exec "hi NonText ctermbg=".g:jellybeans_background_color_256 - exec "hi LineNr ctermbg=".g:jellybeans_background_color_256 - hi DiffText ctermfg=81 - exec "hi Normal ctermbg=".g:jellybeans_background_color_256 - hi DbgBreakPt ctermbg=53 - hi IndentGuidesOdd ctermbg=235 - hi IndentGuidesEven ctermbg=234 -endif - -if exists("g:jellybeans_overrides") - fun! s:load_colors(defs) - for [l:group, l:v] in items(a:defs) - call s:X(l:group, get(l:v, 'guifg', ''), get(l:v, 'guibg', ''), - \ get(l:v, 'attr', ''), - \ get(l:v, 'ctermfg', ''), get(l:v, 'ctermbg', '')) - if !s:low_color - for l:prop in ['ctermfg', 'ctermbg'] - let l:override_key = '256'.l:prop - if has_key(l:v, l:override_key) - exec "hi ".l:group." ".l:prop."=".l:v[l:override_key] - endif - endfor - endif - unlet l:group - unlet l:v - endfor - endfun - call s:load_colors(g:jellybeans_overrides) - delf s:load_colors -endif - -" delete functions {{{ -delf s:X -delf s:rgb -delf s:color -delf s:rgb_color -delf s:rgb_level -delf s:rgb_number -delf s:grey_color -delf s:grey_level -delf s:grey_number -" }}} diff --git a/.vimrc b/.vimrc deleted file mode 100644 index 28f2e9a..0000000 --- a/.vimrc +++ /dev/null @@ -1,357 +0,0 @@ -"" Vundle -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() - -" Plugins -Plugin 'VundleVim/Vundle.vim' -" Plugin 'bling/vim-airline' -Plugin 'chriskempson/base16-vim' -Plugin 'ctrlpvim/ctrlp.vim' -Plugin 'ervandew/supertab' -Plugin 'itchyny/lightline.vim' -Plugin 'NLKNguyen/papercolor-theme' -Plugin 'rust-lang/rust.vim' -Plugin 'scrooloose/syntastic' -Plugin 'tomtom/tcomment_vim' -Plugin 'Valloric/YouCompleteMe' - -call vundle#end() - -set timeoutlen=250 -set ttimeoutlen=200 - -filetype on " detect the type of file -filetype plugin indent on " load filetype plugins -syntax on - -set history=1000 " How many lines of history to remember -set viminfo='100,!,f1,\"100,:40,%,n~/.viminfo - -set isk+=_,$,@,%,#,- " none of these should be word dividers, so make them not be -set hidden -set tabstop=2 -set shiftwidth=2 -set smarttab -set expandtab -set softtabstop=2 -set autoindent -set copyindent -set smartindent " Don't mess with comments -set nojoinspaces - -set autochdir -set nocompatible -set ttyfast -set nofoldenable " disable folding - -" Wordwrap -" set formatoptions=l -" formatoptions: -" c - autowrap COMMENTS using textwidth -" r - insert comment leader (?) on -" o - insert comment leader on 'o' or 'O' -" q - gq formats comments (?) -" n - recon numbered lists -" v - wrap on blanks -" t - autowrap TEXT using textwidth -set fo=croqnvt - -set lbr -set backspace=eol,start,indent -"Backspace and cursor keys wrap to -set whichwrap+=<,>,h,l -set wrap - -"" GUI -set vb t_vb= -set novisualbell -set noerrorbells -set ruler -set number " line numbers -set numberwidth=6 -set lz " lazy redraw -set so=7 "scope -set sidescroll=1 -set scrolloff=10 -set mouse=a -set ttymouse=xterm -set switchbuf=usetab -set showtabline=1 -set selection=exclusive -set shortmess=atI -set wildmenu -set wildmode=list:longest -set wildignore=*.swp,*.bak,*.pyc,*.class -set splitbelow " Preview window - -"" Session -let g:session_autosave = 'no' - -"" Fancy status line. -set laststatus=2 - -"" Powerline -"set rtp+=/home/dln/.vim/bundle/powerline/powerline/bindings/vim - -"" tmux window title -autocmd BufEnter * let &titlestring = expand("%:t") -if &term == "screen" - set t_ts=k - set t_fs=\ -endif -if &term == "screen" || &term == "xterm" - set title -endif -set t_se=23 -set t_ZH= -set t_ZR= - -"" Markers / Signature -let g:SignatureMarkTextHL="Bookmark" - -"" Minibuffer -let g:miniBufExplModSelTarget = 1 -let g:miniBufExplorerMoreThanOne = 0 -let g:miniBufExplModSelTarget = 0 -let g:miniBufExplUseSingleClick = 1 -let g:miniBufExplMapWindowNavVim = 1 -let g:miniBufExplVSplit = 25 -let g:miniBufExplSplitBelow=1 - -"" X clipboard copy paste -map ,v :r!xclip -o - - -"" Searching -set showmatch -set incsearch -set ignorecase -set smartcase -set hlsearch - -"" Use ack for grepping -set grepprg=ag -let g:ackprg='ag -H --nocolor --nogroup' - -"" Bookmarks -let g:showmarks_enable=1 -let g:showmarks_include="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" - -" Errormarker -let errormarker_errorgroup = "ErrorMsg" -let errormarker_warninggroup = "Todo" - -"" Highlighting -map ,H :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' - \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" - \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" - -"" Hide some files -let g:explHideFiles='^\.,.*\.class$,.*\.swp$,.*\.pyc$,.*\.swo$,\.DS_Store$,/tmp/v\d\d*' -let g:explDetailedHelp=1 - -"" Backup -set backup -set backupdir=~/.vim/backup,~/.tmp,~/tmp,/var/tmp,/tmp" -set directory=~/.vim/backup,~/.tmp,~/tmp,/var/tmp,/tmp" -let myvar = strftime("%y%m%d-%H%M") -let myvar = "set backupext=_". myvar -execute myvar -au BufWritePre * let &backupext = substitute(expand("%:p"), "\/", "_", "g") - -"" CtrlP -let g:ctrlp_match_window = 'top' -" let g:ctrlp_custom_ignore = '\v[\/](.DS_Store|.sass-cache|.bundle|.git|.hg|.svn|node_modules|vendor|bower_components)$' -" let g:ctrlp_custom_ignore = '\v[\/]\.(DS_Storegit|hg|svn|optimized|compiled|node_modules|bower_components)$' - -set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.class,*/target/*,*/.git/*" -" let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$' -let g:ctrlp_custom_ignore = 'node_modules$\|.lock$\|.gitkeep$\|tmp/\|bower_components$\|dist$' - - -let g:ctrlp_working_path_mode = 'ra' - -map :CtrlPBuffer -map ,` :CtrlPBuffer -map ,; :CtrlPChange -map ,e :CtrlPRoot -map ,d :CtrlPCurWD -map ,f :CtrlPMRUFiles -map ,g :CtrlPLine -map ,q :CtrlPQuickfix -map ,/ :CtrlPLine -map ,m :CtrlPBookmarkDir -map , :CtrlPBookmarkDirAdd - -"" Key bindings -imap  -inoremap :wa -nnoremap :wa - - -" C-Left, C-right -map [1;5D -map [1;5C -nnoremap b -vnoremap b -nnoremap ghb -inoremap ghb -nnoremap w -vnoremap w -nnoremap ghw -inoremap ghw - -"" Comments -map :TComment -imap - -"" SCM Stuff -let g:SCMDiffCommand = "git" -let VCSCommandDeleteOnHide = 1 -let g:git_branch_status_nogit="" -let g:git_branch_status_around="[]" -let g:git_branch_status_text="" -let g:git_branch_status_head_current=1 - -"" Buffer navigation -map ` :b# - - -"" "Turn off search highlight -map :noh -nmap ,/ :let @/="" - -"" -"" File types -"" - -au BufNewFile,BufRead manifest setlocal ft=json -au BufNewFile,BufRead *.aurora set filetype=python -au BufNewFile,BufRead *.avdl setlocal ft=avro-idl -au BufNewFile,BufRead *.avpr setlocal ft=json -au BufNewFile,BufRead *.cql set syntax=cql -au BufNewFile,BufRead *.go setlocal ft=go -au BufNewFile,BufRead *.g setlocal ft=antlr -au BufNewFile,BufRead *.js set ft=javascript -au BufNewFile,BufRead *.json setfiletype json -au BufNewFile,BufRead *.pig set filetype=pig syntax=pig -au BufNewFile,BufRead *.template setfiletype json -au BufNewFile,BufRead *.thrift setlocal ft=thrift -au BufNewFile,BufRead *.upstart set filetype=upstart -au BufNewFile,BufRead *.upstart.conf set filetype=upstart -au BufNewFile,BufRead SCons* set filetype=python - -"" JavaScript, Json -let g:vim_json_syntax_conceal = 0 - -"" Scala -autocmd BufNewFile,BufAdd,BufRead build.sbt setlocal ft=scala -autocmd BufNewFile,BufAdd,BufRead *.scala setlocal ft=scala -autocmd FileType scala setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=2 - -"" Rust -autocmd FileType rust setlocal expandtab shiftwidth=4 tabstop=4 softtabstop=4 - -"" Clojure -let g:paredit_mode=0 -let g:clj_highlight_builtins=1 " Highlight Clojure's builtins -let g:clj_paren_rainbow=1 " Rainbow parentheses'! - -"" Python -au FileType python - \ setlocal efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%m | - \ setlocal makeprg=python\ % | - \ setlocal tabstop=4 softtabstop=4 shiftwidth=4 | - \ setlocal nosmartindent cinwords=if,elif,else,for,while,try,except,finally,def,class -autocmd BufWritePre *.py normal m`:%s/\s\+$//e `` -autocmd FileType python set omnifunc=pythoncomplete#Complete - -" pydoc integration -let g:pydoc_highlight = 0 -let python_highlight_all = 1 -let g:pcs_check_when_saving = 0 -let g:pymode_lint = 0 -let g:pymode_lint_checker = "pyflakes" - - -" YouCompleteMe -set completefunc=youcompleteme#Complete -set completeopt=preview,menuone - -" tags -set tags=./tags;/ - -" C++ - -" Add highlighting for function definition in C++ -function! EnhanceCppSyntax() - syn match cppFuncDef "::\~\?\zs\h\w*\ze([^)]*\()\s*\(const\)\?\)\?$" - hi def link cppFuncDef Special -endfunction -autocmd Syntax cpp call EnhanceCppSyntax() -autocmd FileType cpp setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=2 - -" HTML -au FileType html - \ set makeprg=tidy\ -qe\ -access\ 3\ % | - \ set errorformat=line\ %l\ column\ %c\ \-\ %m -" let g:html_indent_tags .= '\|p' -" let g:html_indent_tags .= '\|li' - - -au FileType xml - \ set makeprg=tidy\ -qe\ -access\ 3\ % | - \ set errorformat=line\ %l\ column\ %c\ \-\ %m - -"" -"" Color theme -"" -if $TERM =~ '^xterm' - set t_Co=256 -elseif $TERM =~ '^screen' - set t_Co=256 " just guessing -elseif $TERM =~ '^rxvt' - set t_Co=256 -elseif $TERM =~ '^linux' - set t_Co=8 -else - set t_Co=16 -endif - -if &term =~ "xterm" || &term =~ "screen" || &term == "screen" - set t_Co=256 - if has("terminfo") - let &t_Sf=nr2char(27).'[3%p1%dm' - let &t_Sb=nr2char(27).'[4%p1%dm' - else - let &t_Sf=nr2char(27).'[3%dm' - let &t_Sb=nr2char(27).'[4%dm' - endif -endif - -" Show syntax highlight group in the status bar -map ,h :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' -\ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" -\ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" - -set background=light -let g:PaperColor_Light_Override = { 'Background' : '#fefe00' } - -set statusline+=%#warningmsg# -set statusline+=%{SyntasticStatuslineFlag()} -set statusline+=%* - -let g:syntastic_always_populate_loc_list = 1 -let g:syntastic_auto_loc_list = 1 -let g:syntastic_check_on_open = 1 -let g:syntastic_check_on_wq = 0 - -set g:lightline = { - \ 'colorscheme': 'seoul256', - \ 'component': { - \ 'readonly': '%{&readonly?"":""}', - \ } - \ } - -color dln-light - diff --git a/bin/st b/bin/st index 5eb1e7b..fc2e3a1 100755 --- a/bin/st +++ b/bin/st @@ -5,7 +5,7 @@ case `hostname` in exec st.x86_64 -f "Roboto Mono:pixelsize=14" $@ ;; dredd) - exec st.x86_64 -f "Roboto Mono-15" $@ + exec st.dark -f "Roboto Mono-15" $@ ;; esac exec st.x86_64 $@ diff --git a/bin/st.dark b/bin/st.dark new file mode 100755 index 0000000..6356eeb Binary files /dev/null and b/bin/st.dark differ