updated: treesitter colorscheme

diff --git a/lua/huck/map.lua b/lua/huck/map.lua
index 173f44466d631cd9daa5ee5f634acd81fd434e26..c6576485d6c5a21fe5c55a7102299556aba6c5c2 100644 (file)
--- a/lua/huck/map.lua
+++ b/lua/huck/map.lua
@@ -40,7 +40,9 @@ vim.keymap.set('n', 'K', 'Jx')
 -- quick config editing
 vim.keymap.set('n', '<LEADER>=', '<CMD>tabnew ~/.config/nvim/init.lua<CR>')
 vim.keymap.set('n', '<LEADER>q', '<CMD>Lazy<CR>')
-vim.keymap.set('n', '<LEADER>Q', '<CMD>source %<CR>')
+vim.keymap.set('n', '<LEADER>Q', '<CMD>Mason<CR>')
+vim.keymap.set('n', '<LEADER>%', '<CMD>so %<CR>')
+vim.keymap.set('n', '<LEADER>?', '<CMD>TSHighlightCapturesUnderCursor<CR>')
 
 -- better terminal movement keys
 vim.keymap.set('t', '<ESC>', [[<C-\><C-n>]])

diff --git a/lua/huck/settings.lua b/lua/huck/settings.lua
index 2e36778a32cd4eb1c5981c6870a231f35d2ad864..aafaeab92432786c73f2b700159dd4ba44815912 100644 (file)
--- a/lua/huck/settings.lua
+++ b/lua/huck/settings.lua
@@ -37,7 +37,6 @@ vim.o.history = 10000
 vim.o.showmatch = true
 
 vim.o.autochdir = true
--- vim.o.browsedir = 'buffer'
 vim.o.cdhome = true
 
 vim.o.wrapscan = true

diff --git a/lua/huck/theme.lua b/lua/huck/theme.lua
index 0e876c90b60f8c0067369b58953d42292ff6dbd5..34891a3d40d44d166193bf7d32e0619f46430d13 100644 (file)
--- a/lua/huck/theme.lua
+++ b/lua/huck/theme.lua
@@ -105,7 +105,7 @@ highlight("FloatShadowThrough", nil, dark_grey, nil, nil)
 
 -- spelling
 highlight("SpellBad", red, black, underline, red)
-highlight("SpellCap", cyan, black, underline, cyan)
+highlight("SpellCap", blue, black, underline, blue)
 highlight("SpellRare", green, black, underline, green)
 highlight("SpellLocal", magenta, black, underline, magenta)
 
@@ -159,21 +159,13 @@ highlight("Boolean", magenta, black, bold, nil)
 highlight("Function", dark_blue, black, bold, nil)
 highlight("Identifier", blue, black, nil, nil)
 
-highlight("@character.special", white, black, bold, nil)
-highlight("@variable", blue, black, nil, nil)
-highlight("@variable.builtin", blue, black, nil, nil)
-highlight("@module", blue, black, bold, nil)
-highlight("@module.builtin", blue, black, bold, nil)
-highlight("@type.builtin", blue, black, bold, nil)
-highlight("@function.macro", dark_yellow, black, bold, nil)
-
 highlight("Conditional", dark_green, black, "italic,bold", nil)
 highlight("Repeat", dark_green, black, "italic,bold", nil)
 
 highlight("Label", dark_green, black, nil, nil)
 highlight("Statement", dark_green, black, nil, nil)
-highlight("Operator", dark_green, black, bold, nil)
-highlight("Keyword", dark_green, black, bold, nil)
+highlight("Operator", dark_green, black, "bold", nil)
+highlight("Keyword", dark_green, black, "bold", nil)
 
 highlight("PreProc", yellow, black, bold, nil)
 highlight("Include", yellow, black, bold, nil)
@@ -192,6 +184,108 @@ highlight("Delimiter", dark_yellow, black, nil, nil)
 highlight("SpecialComment", yellow, black, italic, nil)
 highlight("Debug", dark_yellow, black, nil, nil)
 
+-- tree sitter
+highlight("@variable", blue, black, nil, nil)
+highlight("@variable.builtin", blue, black, bold, nil)
+highlight("@variable.parameter", blue, black, nil, nil)
+highlight("@variable.member", blue, black, nil, nil)
+
+highlight("@constant", white, black, "bold", nil)
+highlight("@constant.builtin", dark_yellow, black, "bold", nil)
+highlight("@constant.macro", yellow, black, "bold,italic", nil)
+
+highlight("@module", blue, black, nil, nil)
+highlight("@module.builtin", blue, black, "bold", nil)
+
+highlight("@label", green, black, "bold", nil)
+
+highlight("@string", white, black, "italic", nil)
+highlight("@string.documentation", light_grey, black, "italic", nil)
+highlight("@string.regexp", yellow, black, nil, nil)
+highlight("@string.escape", yellow, black, nil, nil)
+highlight("@string.special", cyan, black, nil, nil)
+highlight("@string.special.symbol", blue, black, "bold", nil)
+highlight("@string.special.path", dark_blue, black, "underline", nil)
+highlight("@string.special.url", blue, black, "underline", nil)
+
+highlight("@character", white, black, "bold", nil)
+highlight("@character.special", dark_green, black, "bold", nil)
+
+highlight("@boolean", magenta, black, "bold", nil)
+
+highlight("@number", white, black, "bold", nil)
+highlight("@number.float", white, black, "bold", nil)
+
+highlight("@type", blue, black, "bold", nil)
+highlight("@type.builtin", blue, black, "bold", nil)
+highlight("@type.definition", blue, black, "bold", nil)
+highlight("@type.qualifier", green, black, "bold", nil)
+
+highlight("@attribute", dark_yellow, black, "bold", nil)
+
+highlight("@property", cyan, black, nil, nil)
+
+highlight("@function", dark_blue, black, "bold", nil)
+highlight("@function.builtin", dark_green, black, "bold", nil)
+highlight("@function.call", dark_blue, black, "bold", nil)
+highlight("@function.macro", dark_yellow, black, "bold", nil)
+highlight("@function.method", dark_blue, black, "bold", nil)
+highlight("@function.method.call", dark_blue, black, "bold", nil)
+
+highlight("@constructor", dark_yellow, black, "bold", nil)
+
+highlight("@operator", dark_green, black, "bold", nil)
+
+highlight("@keyword", dark_green, black, "bold", nil)
+highlight("@keyword.coroutine", dark_green, black, "bold", nil)
+highlight("@keyword.function", dark_green, black, "bold", nil)
+highlight("@keyword.operator", dark_green, black, "bold", nil)
+highlight("@keyword.import", dark_green, black, "bold", nil)
+highlight("@keyword.storage", dark_green, black, "bold", nil)
+highlight("@keyword.repeat", dark_green, black, "bold", nil)
+highlight("@keyword.return", dark_green, black, "bold", nil)
+highlight("@keyword.debug", yellow, black, "bold", nil)
+highlight("@keyword.exception", dark_green, black, "bold", nil)
+highlight("@keyword.conditional", dark_green, black, "bold", nil)
+highlight("@keyword.conditional.ternary", dark_green, black, "bold", nil)
+highlight("@keyword.directive", yellow, black, "bold", nil)
+highlight("@keyword.directive.define", yellow, black, "bold", nil)
+
+highlight("@punctuation.delimiter", dark_yellow, black, nil, nil)
+highlight("@punctuation.bracket", dark_yellow, black, nil, nil)
+highlight("@punctuation.special", dark_yellow, black, nil, nil)
+
+highlight("@comment", grey, black, nil, nil)
+highlight("@comment.documentation", light_grey, black, nil, nil)
+highlight("@comment.error", red, black, "bold", nil)
+highlight("@comment.warning", yellow, black, "bold", nil)
+highlight("@comment.todo", dark_yellow, black, "bold", nil)
+highlight("@comment.note", dark_cyan, black, "bold", nil)
+
+highlight("@markup.strong", nil, nil, "bold", nil)
+highlight("@markup.italic", nil, nil, "italic", nil)
+highlight("@markup.strikethrough", nil, nil, "strikethrough", nil)
+highlight("@markup.underline", nil, nil, "underline", nil)
+highlight("@markup.heading", dark_green, black, "bold", nil)
+highlight("@markup.quote", light_grey, black, "italic", nil)
+highlight("@markup.math", white, black, nil, nil)
+highlight("@markup.link", blue, black, nil, nil)
+highlight("@markup.link.label", blue, black, nil, nil)
+highlight("@markup.link.url", blue, black, "underline", nil)
+highlight("@markup.raw", light_grey, black, nil, nil)
+highlight("@markup.raw.block", light_grey, black, nil, nil)
+highlight("@markup.list", yellow, black, "bold", nil)
+highlight("@markup.list.checked", grey, black, "bold", nil)
+highlight("@markup.list.unchecked", yellow, black, "bold", nil)
+
+highlight("@diff.plus", black, green, nil, nil)
+highlight("@diff.minus", black, red, nil, nil)
+highlight("@diff.delta", black, magenta, nil, nil)
+
+highlight("@tag", blue, black, nil, nil)
+highlight("@tag.attribute", white, black, nil, nil)
+highlight("@tag.delimiter", yellow, black, nil, nil)
+
 -- diff
 highlight("Added", black, green, nil, nil)
 highlight("Removed", black, red, nil, nil)

diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 41eddd8ec8421fc25fd870b7cf08eefbcce5d940..0ec33b073d93724c1f430f0b331b2e736fc74ce0 100644 (file)
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -9,8 +9,20 @@ return {
             require('nvim-treesitter.configs').setup {
                 sync_install = true,
                 auto_install = true,
-                highlight = { enable = true },
-                indent = { enable = false },
+                highlight = {
+                    enable = true,
+                    additional_vim_regex_highlighting = false,
+                },
+                indent = { enable = true },
+                incremental_selection = {
+                    enable = true,
+                    keymaps = {
+                        init_selection = "gnn",
+                        node_incremental = "grn",
+                        scope_incremental = "grc",
+                        node_decremental = "grm",
+                    },
+                }
             }
         end
     },