commit 2672913126d98ea1ac10fa7a32b41fcbfe7cf2f6
parent 7dffacba3ce16e3f8429fffcdacb2fef81758a03
Author: Tomas Nemec <nemi@skaut.cz>
Date: Fri, 25 Nov 2022 15:42:04 +0100
update
Diffstat:
3 files changed, 68 insertions(+), 39 deletions(-)
diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua
@@ -52,7 +52,7 @@ map('n', '<space>wo', 'git_worktrees')
map('n', '<space>wi', 'create_git_worktree')
map('n', '<space>n', 'edit_neovim')
-require('tms.colors').update(function(t)
- t.Group.new('TelescopeSelection', nil, t.dimm(t.groups.Normal.bg, 0.05))
- t.Group.new('TelescopeMatching', nil, nil, t.styles.underline + t.styles.bold)
-end)
+-- require('tms.colors').update(function(t)
+-- t.Group.new('TelescopeSelection', nil, t.dimm(t.groups.Normal.bg, 0.05))
+-- t.Group.new('TelescopeMatching', nil, nil, t.styles.underline + t.styles.bold)
+-- end)
diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua
@@ -99,10 +99,10 @@ require'nvim-treesitter.configs'.setup {
vim.api.nvim_create_user_command('TSHRefresh', 'write|TSBufEnable highlight', {})
vim.keymap.set('n', '<leader>su', '<cmd>TSHRefresh<cr>')
-require('tms.colors').update(function(t)
- t.Group.new('TSDefinition', t.colors.none, t.colors.none)
- t.Group.new('TSCurentScope', t.colors.none, t.colors.none)
- t.Group.new('TSDefinitionUsage', t.colors.none, t.dimm(t.groups.Normal.bg, 0.03))
- -- context
- t.Group.new('TreesitterContext', t.colors.none, t.dimm(t.groups.Normal.bg, 0.06))
-end)
+-- require('tms.colors').update(function(t)
+-- t.Group.new('TSDefinition', t.colors.none, t.colors.none)
+-- t.Group.new('TSCurentScope', t.colors.none, t.colors.none)
+-- t.Group.new('TSDefinitionUsage', t.colors.none, t.dimm(t.groups.Normal.bg, 0.03))
+-- -- context
+-- t.Group.new('TreesitterContext', t.colors.none, t.dimm(t.groups.Normal.bg, 0.06))
+-- end)
diff --git a/colors/base16.lua b/colors/base16.lua
@@ -1,26 +1,26 @@
+-- start color
-- base16-nvim (https://github.com/wincent/base16-nvim)
-- by Greg Hurrell (https://github.com/wincent)
-- based on
-- base16-vim (https://github.com/chriskempson/base16-vim)
-- by Chris Kempson (https://github.com/chriskempson)
--- Nord scheme by arcticicestudio
-
-local gui00 = "#2E3440"
-local gui01 = "#3B4252"
-local gui02 = "#434C5E"
-local gui03 = "#4C566A"
-local gui04 = "#D8DEE9"
-local gui05 = "#E5E9F0"
-local gui06 = "#ECEFF4"
-local gui07 = "#8FBCBB"
-local gui08 = "#BF616A"
-local gui09 = "#D08770"
-local gui0A = "#EBCB8B"
-local gui0B = "#A3BE8C"
-local gui0C = "#88C0D0"
-local gui0D = "#81A1C1"
-local gui0E = "#B48EAD"
-local gui0F = "#5E81AC"
+-- Gruvbox dark, hard scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+local gui00 = '#1d2021'
+local gui01 = '#3c3836'
+local gui02 = '#504945'
+local gui03 = '#665c54'
+local gui04 = '#bdae93'
+local gui05 = '#d5c4a1'
+local gui06 = '#ebdbb2'
+local gui07 = '#fbf1c7'
+local gui08 = '#fb4934'
+local gui09 = '#fe8019'
+local gui0A = '#fabd2f'
+local gui0B = '#b8bb26'
+local gui0C = '#8ec07c'
+local gui0D = '#83a598'
+local gui0E = '#d3869b'
+local gui0F = '#d65d0e'
local cterm00 = 0
local cterm03 = 8
@@ -43,7 +43,7 @@ vim.cmd [[
highlight clear
syntax reset
]]
-vim.g.colors_name = "base16-nord"
+vim.g.colors_name = 'base16-gruvbox-dark-hard'
-- Vim editor colors fg bg ctermfg ctermbg attr guisp
vim.api.nvim_set_hl(0, 'Normal', { fg = gui05, bg = gui00, ctermfg = cterm05, ctermbg = cterm00 })
@@ -139,15 +139,15 @@ vim.api.nvim_set_hl(0, 'cssClassName', { fg = gui0E, ctermfg = cterm0E })
vim.api.nvim_set_hl(0, 'cssColor', { fg = gui0C, ctermfg = cterm0C })
-- Diff highlighting
-vim.api.nvim_set_hl(0, 'DiffAdd', { fg = gui0B, bg = gui01, ctermfg = cterm0B, ctermbg = cterm01 })
-vim.api.nvim_set_hl(0, 'DiffChange', { fg = gui03, bg = gui01, ctermfg = cterm03, ctermbg = cterm01 })
-vim.api.nvim_set_hl(0, 'DiffDelete', { fg = gui08, bg = gui01, ctermfg = cterm08, ctermbg = cterm01 })
-vim.api.nvim_set_hl(0, 'DiffText', { fg = gui0D, bg = gui01, ctermfg = cterm0D, ctermbg = cterm01 })
-vim.api.nvim_set_hl(0, 'DiffAdded', { fg = gui0B, bg = gui00, ctermfg = cterm0B, ctermbg = cterm00 })
-vim.api.nvim_set_hl(0, 'DiffFile', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
-vim.api.nvim_set_hl(0, 'DiffNewFile', { fg = gui0B, bg = gui00, ctermfg = cterm0B, ctermbg = cterm00 })
-vim.api.nvim_set_hl(0, 'DiffLine', { fg = gui0D, bg = gui00, ctermfg = cterm0D, ctermbg = cterm00 })
-vim.api.nvim_set_hl(0, 'DiffRemoved', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffAdd', { fg = gui0B, bg = gui01, ctermfg = cterm0B, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'DiffChange', { fg = gui03, bg = gui01, ctermfg = cterm03, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'DiffDelete', { fg = gui08, bg = gui01, ctermfg = cterm08, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'DiffText', { fg = gui0D, bg = gui01, ctermfg = cterm0D, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'DiffAdded', { fg = gui0B, bg = gui00, ctermfg = cterm0B, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffFile', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffNewFile', { fg = gui0B, bg = gui00, ctermfg = cterm0B, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffLine', { fg = gui0D, bg = gui00, ctermfg = cterm0D, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffRemoved', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
-- Git highlighting
vim.api.nvim_set_hl(0, 'gitcommitOverflow', { fg = gui08, ctermfg = cterm08 })
@@ -280,3 +280,32 @@ vim.api.nvim_set_hl(0, 'StartifySpecial', { fg = gui03, ctermfg = cterm03 })
vim.api.nvim_set_hl(0, 'javaOperator', { fg = gui0D, ctermfg = cterm0D })
-- vim: filetype=lua
+-- end color
+
+vim.api.nvim_set_hl(0, 'LineNr', { fg = gui03, bg = gui00, ctermfg = cterm03, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'SignColumn', { fg = gui03, bg = gui00, ctermfg = cterm03, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'CursorLine', { bg = gui00, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'StatusLine', { fg = gui04, bg = gui01, ctermfg = cterm05, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'TreesitterContext', { bg = gui01, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'NormalFloat', {})
+vim.api.nvim_set_hl(0, 'WinSeparator', {})
+vim.api.nvim_set_hl(0, 'FloatBorder', {})
+
+vim.api.nvim_set_hl(0, 'Beacon', { bg = 'fg' })
+
+-- Diff highlighting
+vim.api.nvim_set_hl(0, 'DiffAdd', { fg = gui0B, bg = gui00, ctermfg = cterm0B, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffChange', { fg = gui03, bg = gui00, ctermfg = cterm03, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffDelete', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffText', { fg = gui0D, bg = gui00, ctermfg = cterm0D, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffAdded', { fg = gui0B, bg = gui00, ctermfg = cterm0B, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffFile', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffNewFile', { fg = gui0B, bg = gui00, ctermfg = cterm0B, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffLine', { fg = gui0D, bg = gui00, ctermfg = cterm0D, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'DiffRemoved', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
+
+-- GitGutter highlighting
+vim.api.nvim_set_hl(0, 'GitGutterAdd', { fg = gui0B, bg = gui00, ctermfg = cterm0B, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'GitGutterChange', { fg = gui0D, bg = gui00, ctermfg = cterm0D, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'GitGutterDelete', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'GitGutterChangeDelete', { fg = gui0E, bg = gui00, ctermfg = cterm0E, ctermbg = cterm00 })
