diff --git a/lua/solarized/config.lua b/lua/solarized/config.lua index 23d83ad..1904788 100644 --- a/lua/solarized/config.lua +++ b/lua/solarized/config.lua @@ -30,6 +30,7 @@ function M.default_config() diagnostic = true, dashboard = true, editor = true, + ref = true, gitsign = true, hop = true, indentblankline = true, diff --git a/lua/solarized/themes/default/editor.lua b/lua/solarized/themes/default/editor.lua index ccd0bb7..ee49783 100644 --- a/lua/solarized/themes/default/editor.lua +++ b/lua/solarized/themes/default/editor.lua @@ -105,7 +105,7 @@ return function(c, config) set_hl('WildMenu', { fg = c.base2, bg = c.base02 }) -- Current match in 'wildmenu' completion. set_hl('WinBar', { link = 'Pmenu' }) -- Window bar of current window. set_hl('WinBarNC', { link = 'WinBar' }) -- Window bar of not-current windows. - set_hl('GitGutterAdd', { fg = c.add }) -- Used for the text of 'add' signs - set_hl('GitGutterChange', { fg = c.change }) -- Used for the text of 'change' signs - set_hl('GitGutterDelete', { fg = c.delete }) -- Used for the text of 'delete' signs + set_hl('GitGutterAdd', { fg = c.add, bg = c.base02 }) -- Used for the text of 'add' signs + set_hl('GitGutterChange', { fg = c.change, bg = c.base02 }) -- Used for the text of 'change' signs + set_hl('GitGutterDelete', { fg = c.delete, bg = c.base02 }) -- Used for the text of 'delete' signs end diff --git a/lua/solarized/themes/default/ref.lua b/lua/solarized/themes/default/ref.lua new file mode 100644 index 0000000..349ebb7 --- /dev/null +++ b/lua/solarized/themes/default/ref.lua @@ -0,0 +1,133 @@ +return function(c, config) + local utils = require('solarized.utils') + local set_hl = utils.set_hl + + set_hl('Refbase03', { fg = c.base03 }) + set_hl('Refbase03u', { fg = c.base03, underline = true }) + set_hl('Refbase03i', { fg = c.base03, italic = true }) + set_hl('Refbase03b', { fg = c.base03, bold = true }) + set_hl('Refbase03bi', { fg = c.base03, bold = true, italic = true }) + set_hl('Refbase03bu', { fg = c.base03, bold = true, underline = true }) + set_hl('Refbase03biu', { fg = c.base03, bold = true, italic = true, underline = true }) + + set_hl('Refbase02', { fg = c.base02 }) + set_hl('Refbase02u', { fg = c.base02, underline = true }) + set_hl('Refbase02i', { fg = c.base02, italic = true }) + set_hl('Refbase02b', { fg = c.base02, bold = true }) + set_hl('Refbase02bi', { fg = c.base02, bold = true, italic = true }) + set_hl('Refbase02bu', { fg = c.base02, bold = true, underline = true }) + set_hl('Refbase02biu', { fg = c.base02, bold = true, italic = true, underline = true }) + + set_hl('Refbase01', { fg = c.base01 }) + set_hl('Refbase01u', { fg = c.base01, underline = true }) + set_hl('Refbase01i', { fg = c.base01, italic = true }) + set_hl('Refbase01b', { fg = c.base01, bold = true }) + set_hl('Refbase01bi', { fg = c.base01, bold = true, italic = true }) + set_hl('Refbase01bu', { fg = c.base01, bold = true, underline = true }) + set_hl('Refbase01biu', { fg = c.base01, bold = true, italic = true, underline = true }) + + set_hl('Refbase00', { fg = c.base00 }) + set_hl('Refbase00u', { fg = c.base00, underline = true }) + set_hl('Refbase00i', { fg = c.base00, italic = true }) + set_hl('Refbase00b', { fg = c.base00, bold = true }) + set_hl('Refbase00bi', { fg = c.base00, bold = true, italic = true }) + set_hl('Refbase00bu', { fg = c.base00, bold = true, underline = true }) + set_hl('Refbase00biu', { fg = c.base00, bold = true, italic = true, underline = true }) + + set_hl('Refbase0', { fg = c.base0 }) + set_hl('Refbase0u', { fg = c.base0, underline = true }) + set_hl('Refbase0i', { fg = c.base0, italic = true }) + set_hl('Refbase0b', { fg = c.base0, bold = true }) + set_hl('Refbase0bi', { fg = c.base0, bold = true, italic = true }) + set_hl('Refbase0bu', { fg = c.base0, bold = true, underline = true }) + set_hl('Refbase0biu', { fg = c.base0, bold = true, italic = true, underline = true }) + + set_hl('Refbase1', { fg = c.base1 }) + set_hl('Refbase1u', { fg = c.base1, underline = true }) + set_hl('Refbase1i', { fg = c.base1, italic = true }) + set_hl('Refbase1b', { fg = c.base1, bold = true }) + set_hl('Refbase1bi', { fg = c.base1, bold = true, italic = true }) + set_hl('Refbase1bu', { fg = c.base1, bold = true, underline = true }) + set_hl('Refbase1biu', { fg = c.base1, bold = true, italic = true, underline = true }) + + set_hl('Refbase2', { fg = c.base2 }) + set_hl('Refbase2u', { fg = c.base2, underline = true }) + set_hl('Refbase2i', { fg = c.base2, italic = true }) + set_hl('Refbase2b', { fg = c.base2, bold = true }) + set_hl('Refbase2bi', { fg = c.base2, bold = true, italic = true }) + set_hl('Refbase2bu', { fg = c.base2, bold = true, underline = true }) + set_hl('Refbase2biu', { fg = c.base2, bold = true, italic = true, underline = true }) + + set_hl('Refbase3', { fg = c.base3 }) + set_hl('Refbase3u', { fg = c.base3, underline = true }) + set_hl('Refbase3i', { fg = c.base3, italic = true }) + set_hl('Refbase3b', { fg = c.base3, bold = true }) + set_hl('Refbase3bi', { fg = c.base3, bold = true, italic = true }) + set_hl('Refbase3bu', { fg = c.base3, bold = true, underline = true }) + set_hl('Refbase3biu', { fg = c.base3, bold = true, italic = true, underline = true }) + + set_hl('Refyellow', { fg = c.yellow }) + set_hl('Refyellowu', { fg = c.yellow, underline = true }) + set_hl('Refyellowi', { fg = c.yellow, italic = true }) + set_hl('Refyellowb', { fg = c.yellow, bold = true }) + set_hl('Refyellowbi', { fg = c.yellow, bold = true, italic = true }) + set_hl('Refyellowbu', { fg = c.yellow, bold = true, underline = true }) + set_hl('Refyellowbiu', { fg = c.yellow, bold = true, italic = true, underline = true }) + + set_hl('Reforange', { fg = c.orange }) + set_hl('Reforangeu', { fg = c.orange, underline = true }) + set_hl('Reforangei', { fg = c.orange, italic = true }) + set_hl('Reforangeb', { fg = c.orange, bold = true }) + set_hl('Reforangebi', { fg = c.orange, bold = true, italic = true }) + set_hl('Reforangebu', { fg = c.orange, bold = true, underline = true }) + set_hl('Reforangebiu', { fg = c.orange, bold = true, italic = true, underline = true }) + + set_hl('Refbase3', { fg = c.base3 }) + set_hl('Refbase3u', { fg = c.base3, underline = true }) + set_hl('Refbase3i', { fg = c.base3, italic = true }) + set_hl('Refbase3b', { fg = c.base3, bold = true }) + set_hl('Refbase3bi', { fg = c.base3, bold = true, italic = true }) + set_hl('Refbase3bu', { fg = c.base3, bold = true, underline = true }) + set_hl('Refbase3biu', { fg = c.base3, bold = true, italic = true, underline = true }) + + set_hl('Refmagenta', { fg = c.magenta }) + set_hl('Refmagentau', { fg = c.magenta, underline = true }) + set_hl('Refmagentai', { fg = c.magenta, italic = true }) + set_hl('Refmagentab', { fg = c.magenta, bold = true }) + set_hl('Refmagentabi', { fg = c.magenta, bold = true, italic = true }) + set_hl('Refmagentabu', { fg = c.magenta, bold = true, underline = true }) + set_hl('Refmagentabiu', { fg = c.magenta, bold = true, italic = true, underline = true }) + + set_hl('Refviolet', { fg = c.violet }) + set_hl('Refvioletu', { fg = c.violet, underline = true }) + set_hl('Refvioleti', { fg = c.violet, italic = true }) + set_hl('Refvioletb', { fg = c.violet, bold = true }) + set_hl('Refvioletbi', { fg = c.violet, bold = true, italic = true }) + set_hl('Refvioletbu', { fg = c.violet, bold = true, underline = true }) + set_hl('Refvioletbiu', { fg = c.violet, bold = true, italic = true, underline = true }) + + set_hl('Refblue', { fg = c.blue }) + set_hl('Refblueu', { fg = c.blue, underline = true }) + set_hl('Refbluei', { fg = c.blue, italic = true }) + set_hl('Refblueb', { fg = c.blue, bold = true }) + set_hl('Refbluebi', { fg = c.blue, bold = true, italic = true }) + set_hl('Refbluebu', { fg = c.blue, bold = true, underline = true }) + set_hl('Refbluebiu', { fg = c.blue, bold = true, italic = true, underline = true }) + + set_hl('Refcyan', { fg = c.cyan }) + set_hl('Refcyanu', { fg = c.cyan, underline = true }) + set_hl('Refcyani', { fg = c.cyan, italic = true }) + set_hl('Refcyanb', { fg = c.cyan, bold = true }) + set_hl('Refcyanbi', { fg = c.cyan, bold = true, italic = true }) + set_hl('Refcyanbu', { fg = c.cyan, bold = true, underline = true }) + set_hl('Refcyanbiu', { fg = c.cyan, bold = true, italic = true, underline = true }) + + set_hl('Refgreen', { fg = c.green }) + set_hl('Refgreenu', { fg = c.green, underline = true }) + set_hl('Refgreeni', { fg = c.green, italic = true }) + set_hl('Refgreenb', { fg = c.green, bold = true }) + set_hl('Refgreenbi', { fg = c.green, bold = true, italic = true }) + set_hl('Refgreenbu', { fg = c.green, bold = true, underline = true }) + set_hl('Refgreenbiu', { fg = c.green, bold = true, italic = true, underline = true }) + +end diff --git a/vimrc b/vimrc index acf48ee..dca9c9d 100644 --- a/vimrc +++ b/vimrc @@ -24,6 +24,8 @@ EOF " plugins call plug#begin('~/.vim/plugged') +Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } +Plug 'junegunn/fzf.vim' Plug 'airblade/vim-gitgutter' Plug 'godlygeek/tabular' Plug 'itchyny/lightline.vim' @@ -171,3 +173,5 @@ local lspconfig = require('lspconfig') lspconfig.gopls.setup{} lspconfig.jedi_language_server.setup{} EOF + +let g:gsed_command = '/Users/gl6/.homebrew/bin/gsed'