commit 34fb7bfd1bece8f4ca1ece5b9f220cbeb43a0d08
parent 70f2b754dcfc0f5469de08439f60513d83c00f34
Author: Tomas Nemec <nemi@skaut.cz>
Date: Thu, 15 Dec 2022 15:09:37 +0100
update
Diffstat:
14 files changed, 417 insertions(+), 602 deletions(-)
diff --git a/after/plugin/git.lua b/after/plugin/git.lua
@@ -1,100 +1,93 @@
-if vim.g.loaded_git_messenger == 1 then
- vim.g.git_messenger_floating_win_opts = {border = 'single'}
- vim.keymap.set('n', '<leader>gm', '<plug>(git-messenger)',
- {desc = 'Git Message'})
-end
-
if vim.g.loaded_fugitive then
- vim.keymap.set('n', '<leader>gg', '<cmd>G<cr>', {desc = 'Git Status'})
- vim.keymap
- .set('n', '<leader>gc', '<cmd>G commit<cr>', {desc = 'Git Commit'})
- vim.keymap
- .set('n', '<leader>gb', '<cmd>Git blame<cr>', {desc = 'Git Blame'})
+ vim.keymap.set('n', '<leader>gg', '<cmd>G<cr>', { desc = 'Git Status' })
+ vim.keymap.set('n', '<leader>gc', '<cmd>G commit<cr>', { desc = 'Git Commit' })
+ vim.keymap.set('n', '<leader>gb', '<cmd>Git blame<cr>', { desc = 'Git Blame' })
end
local has_igit, igit = pcall(require, 'igit')
if has_igit then
- igit.setup({
- command = 'IG'
- -- branch = { open_cmd = 'botright' },
- -- log = { open_cmd = 'botright' },
- -- status = { open_cmd = 'botright' },
- })
+ igit.setup({
+ command = 'IG',
+ -- branch = { open_cmd = 'botright' },
+ -- log = { open_cmd = 'botright' },
+ -- status = { open_cmd = 'botright' },
+ })
end
local has_gsigns, gsigns = pcall(require, 'gitsigns')
if has_gsigns then
- local get_theme = function()
- local dark_theme = {
- add = '│',
- change = '│',
- delete = '│',
- topdelete = '‾',
- changedel = '│'
- }
- local light_theme = {
- add = ' ',
- change = ' ',
- delete = ' ',
- topdelete = ' ',
- changedel = ' '
- }
- local theme = dark_theme
- if vim.opt.background:get() == 'light' then theme = light_theme end
- return theme
+ local get_theme = function()
+ local dark_theme = { add = '│', change = '│', delete = '│', topdelete = '‾', changedel = '│' }
+ local light_theme = { add = ' ', change = ' ', delete = ' ', topdelete = ' ', changedel = ' ' }
+ local theme = dark_theme
+ if vim.opt.background:get() == 'light' then
+ theme = light_theme
end
+ return theme
+ end
- local theme = get_theme()
- gsigns.setup {
- signs = {
- add = {
- text = theme.add
- -- text = ' ',
- },
- change = {
- text = theme.change
- -- text = ' ',
- },
- delete = {
- text = theme.delete
- -- text = ' ',
- },
- topdelete = {
- -- text = ' ',
- },
- changedelete = {
- text = theme.changedel
- -- text = ' ',
- }
- },
- keymaps = {}
- }
+ local theme = get_theme()
+ gsigns.setup {
+ signs = {
+ add = {
+ text = theme.add,
+ -- text = ' ',
+ },
+ change = {
+ text = theme.change,
+ -- text = ' ',
+ },
+ delete = {
+ text = theme.delete,
+ -- text = ' ',
+ },
+ topdelete = {
+ -- text = ' ',
+ },
+ changedelete = {
+ text = theme.changedel,
+ -- text = ' ',
+ },
+ },
+ keymaps = {},
+ }
- vim.keymap.set('n', '>c', function() gsigns.next_hunk() end,
- {desc = 'Git Next Hunk'})
- vim.keymap.set('n', '>[', function() gsigns.next_hunk() end,
- {desc = 'Git Next Hunk'})
- vim.keymap.set('n', '<c', function() gsigns.prev_hunk() end,
- {desc = 'Git Previous Hunk'})
- vim.keymap.set('n', '<[', function() gsigns.prev_hunk() end,
- {desc = 'Git Previous Hunk'})
- vim.keymap.set('n', '<leader>hs', function() gsigns.stage_hunk() end,
- {desc = 'Git Stage Hunk'})
- vim.keymap.set('n', '<leader>hu', function() gsigns.undo_stage_hunk() end,
- {desc = 'Git Undo Stage Hunk'})
- vim.keymap.set('n', '<leader>hr', function() gsigns.reset_hunk() end,
- {desc = 'Git Reset Hunk'})
- vim.keymap.set('n', '<leader>hR', function() gsigns.reset_buffer() end,
- {desc = 'Git Reset Buffer'})
- vim.keymap.set('n', '<leader>hp', function() gsigns.preview_hunk() end,
- {desc = 'Git Preview Hunk'})
- vim.keymap.set('n', '<leader>hb',
- function() gsigns.toggle_current_line_blame() end,
- {desc = 'Git Toggle Blame Line'})
- vim.keymap.set('n', '<leader>hl', function() gsigns.toggle_linehl() end,
- {desc = 'Git Highlight Lines'})
- vim.keymap.set('n', '<leader>hn', function() gsigns.toggle_numhl() end,
- {desc = 'Git Highlight Num'})
- vim.keymap.set('o', 'ig', ':<C-U>lua require("gitsigns").select_hunk()<cr>')
- vim.keymap.set('x', 'ig', ':<C-U>lua require("gitsigns").select_hunk()<cr>')
+ vim.keymap.set('n', '>c', function()
+ gsigns.next_hunk()
+ end, { desc = 'Git Next Hunk' })
+ vim.keymap.set('n', '>[', function()
+ gsigns.next_hunk()
+ end, { desc = 'Git Next Hunk' })
+ vim.keymap.set('n', '<c', function()
+ gsigns.prev_hunk()
+ end, { desc = 'Git Previous Hunk' })
+ vim.keymap.set('n', '<[', function()
+ gsigns.prev_hunk()
+ end, { desc = 'Git Previous Hunk' })
+ vim.keymap.set('n', '<leader>hs', function()
+ gsigns.stage_hunk()
+ end, { desc = 'Git Stage Hunk' })
+ vim.keymap.set('n', '<leader>hu', function()
+ gsigns.undo_stage_hunk()
+ end, { desc = 'Git Undo Stage Hunk' })
+ vim.keymap.set('n', '<leader>hr', function()
+ gsigns.reset_hunk()
+ end, { desc = 'Git Reset Hunk' })
+ vim.keymap.set('n', '<leader>hR', function()
+ gsigns.reset_buffer()
+ end, { desc = 'Git Reset Buffer' })
+ vim.keymap.set('n', '<leader>hp', function()
+ gsigns.preview_hunk()
+ end, { desc = 'Git Preview Hunk' })
+ vim.keymap.set('n', '<leader>hb', function()
+ gsigns.toggle_current_line_blame()
+ end, { desc = 'Git Toggle Blame Line' })
+ vim.keymap.set('n', '<leader>hl', function()
+ gsigns.toggle_linehl()
+ end, { desc = 'Git Highlight Lines' })
+ vim.keymap.set('n', '<leader>hn', function()
+ gsigns.toggle_numhl()
+ end, { desc = 'Git Highlight Num' })
+ vim.keymap.set('o', 'ig', ':<C-U>lua require("gitsigns").select_hunk()<cr>')
+ vim.keymap.set('x', 'ig', ':<C-U>lua require("gitsigns").select_hunk()<cr>')
end
diff --git a/colors/base16.lua b/colors/base16.lua
@@ -5,6 +5,7 @@
-- base16-vim (https://github.com/chriskempson/base16-vim)
-- by Chris Kempson (https://github.com/chriskempson)
-- 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"
@@ -46,446 +47,238 @@ vim.cmd [[
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
-})
-vim.api.nvim_set_hl(0, 'Bold', {bold = true})
-vim.api.nvim_set_hl(0, 'Debug', {fg = gui08, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'Directory', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'Error', {
- fg = gui00,
- bg = gui08,
- ctermfg = cterm00,
- ctermbg = cterm08
-})
-vim.api.nvim_set_hl(0, 'ErrorMsg', {
- fg = gui08,
- bg = gui00,
- ctermfg = cterm08,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'Exception', {fg = gui08, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'FoldColumn', {
- fg = gui0C,
- bg = gui01,
- ctermfg = cterm0C,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'Folded', {
- fg = gui03,
- bg = gui01,
- ctermfg = cterm03,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'IncSearch', {
- fg = gui01,
- bg = gui09,
- ctermfg = cterm01,
- ctermbg = cterm09
-})
+vim.api.nvim_set_hl(0, 'Normal', { fg = gui05, bg = gui00, ctermfg = cterm05, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'Bold', { bold = true })
+vim.api.nvim_set_hl(0, 'Debug', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'Directory', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'Error', { fg = gui00, bg = gui08, ctermfg = cterm00, ctermbg = cterm08 })
+vim.api.nvim_set_hl(0, 'ErrorMsg', { fg = gui08, bg = gui00, ctermfg = cterm08, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'Exception', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'FoldColumn', { fg = gui0C, bg = gui01, ctermfg = cterm0C, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'Folded', { fg = gui03, bg = gui01, ctermfg = cterm03, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'IncSearch', { fg = gui01, bg = gui09, ctermfg = cterm01, ctermbg = cterm09 })
vim.api.nvim_set_hl(0, 'Italic', {})
-vim.api.nvim_set_hl(0, 'Macro', {fg = gui08, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'MatchParen', {bg = gui03, ctermbg = cterm03})
-vim.api.nvim_set_hl(0, 'ModeMsg', {fg = gui0B, ctermfg = cterm0B})
-vim.api.nvim_set_hl(0, 'MoreMsg', {fg = gui0B, ctermfg = cterm0B})
-vim.api.nvim_set_hl(0, 'Question', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'Search', {
- fg = gui01,
- bg = gui0A,
- ctermfg = cterm01,
- ctermbg = cterm0A
-})
-vim.api.nvim_set_hl(0, 'Substitute', {
- fg = gui01,
- bg = gui0A,
- ctermfg = cterm01,
- ctermbg = cterm0A
-})
-vim.api.nvim_set_hl(0, 'SpecialKey', {fg = gui03, ctermfg = cterm03})
-vim.api.nvim_set_hl(0, 'TooLong', {fg = gui08, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'Underlined', {fg = gui08, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'Visual', {bg = gui02, ctermbg = cterm02})
-vim.api.nvim_set_hl(0, 'VisualNOS', {fg = gui08, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'WarningMsg', {fg = gui08, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'WildMenu', {fg = gui08, bg = gui0A, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'Title', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'Conceal', {
- fg = gui0D,
- bg = gui00,
- ctermfg = cterm0D,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'Cursor', {
- fg = gui00,
- bg = gui05,
- ctermfg = cterm00,
- ctermbg = cterm05
-})
-vim.api.nvim_set_hl(0, 'NonText', {fg = gui03, ctermfg = cterm03})
-vim.api.nvim_set_hl(0, 'LineNr', {
- fg = gui03,
- bg = gui01,
- ctermfg = cterm03,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'SignColumn', {
- fg = gui03,
- bg = gui01,
- ctermfg = cterm03,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'StatusLine', {
- fg = gui04,
- bg = gui02,
- ctermfg = cterm04,
- ctermbg = cterm02
-})
-vim.api.nvim_set_hl(0, 'StatusLineNC', {
- fg = gui03,
- bg = gui01,
- ctermfg = cterm03,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'VertSplit', {
- fg = gui02,
- bg = gui02,
- ctermfg = cterm02,
- ctermbg = cterm02
-})
-vim.api.nvim_set_hl(0, 'ColorColumn', {bg = gui01, ctermbg = cterm01})
-vim.api.nvim_set_hl(0, 'CursorColumn', {bg = gui01, ctermbg = cterm01})
-vim.api.nvim_set_hl(0, 'CursorLine', {bg = gui01, ctermbg = cterm01})
-vim.api.nvim_set_hl(0, 'CursorLineNr', {
- fg = gui04,
- bg = gui01,
- ctermfg = cterm04,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'QuickFixLine', {bg = gui01, ctermbg = cterm01})
-vim.api.nvim_set_hl(0, 'PMenu', {
- fg = gui05,
- bg = gui01,
- ctermfg = cterm05,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'PMenuSel', {
- fg = gui01,
- bg = gui05,
- ctermfg = cterm01,
- ctermbg = cterm05
-})
-vim.api.nvim_set_hl(0, 'TabLine', {
- fg = gui03,
- bg = gui01,
- ctermfg = cterm03,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'TabLineFill', {
- fg = gui03,
- bg = gui01,
- ctermfg = cterm03,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'TabLineSel', {
- fg = gui0B,
- bg = gui01,
- ctermfg = cterm0B,
- ctermbg = cterm01
-})
+vim.api.nvim_set_hl(0, 'Macro', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'MatchParen', { bg = gui03, ctermbg = cterm03 })
+vim.api.nvim_set_hl(0, 'ModeMsg', { fg = gui0B, ctermfg = cterm0B })
+vim.api.nvim_set_hl(0, 'MoreMsg', { fg = gui0B, ctermfg = cterm0B })
+vim.api.nvim_set_hl(0, 'Question', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'Search', { fg = gui01, bg = gui0A, ctermfg = cterm01, ctermbg = cterm0A })
+vim.api.nvim_set_hl(0, 'Substitute', { fg = gui01, bg = gui0A, ctermfg = cterm01, ctermbg = cterm0A })
+vim.api.nvim_set_hl(0, 'SpecialKey', { fg = gui03, ctermfg = cterm03 })
+vim.api.nvim_set_hl(0, 'TooLong', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'Underlined', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'Visual', { bg = gui02, ctermbg = cterm02 })
+vim.api.nvim_set_hl(0, 'VisualNOS', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'WarningMsg', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'WildMenu', { fg = gui08, bg = gui0A, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'Title', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'Conceal', { fg = gui0D, bg = gui00, ctermfg = cterm0D, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'Cursor', { fg = gui00, bg = gui05, ctermfg = cterm00, ctermbg = cterm05 })
+vim.api.nvim_set_hl(0, 'NonText', { fg = gui03, ctermfg = cterm03 })
+vim.api.nvim_set_hl(0, 'LineNr', { fg = gui03, bg = gui01, ctermfg = cterm03, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'SignColumn', { fg = gui03, bg = gui01, ctermfg = cterm03, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'StatusLine', { fg = gui04, bg = gui02, ctermfg = cterm04, ctermbg = cterm02 })
+vim.api.nvim_set_hl(0, 'StatusLineNC', { fg = gui03, bg = gui01, ctermfg = cterm03, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'VertSplit', { fg = gui02, bg = gui02, ctermfg = cterm02, ctermbg = cterm02 })
+vim.api.nvim_set_hl(0, 'ColorColumn', { bg = gui01, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'CursorColumn', { bg = gui01, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'CursorLine', { bg = gui01, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'CursorLineNr', { fg = gui04, bg = gui01, ctermfg = cterm04, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'QuickFixLine', { bg = gui01, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'PMenu', { fg = gui05, bg = gui01, ctermfg = cterm05, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'PMenuSel', { fg = gui01, bg = gui05, ctermfg = cterm01, ctermbg = cterm05 })
+vim.api.nvim_set_hl(0, 'TabLine', { fg = gui03, bg = gui01, ctermfg = cterm03, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'TabLineFill', { fg = gui03, bg = gui01, ctermfg = cterm03, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'TabLineSel', { fg = gui0B, bg = gui01, ctermfg = cterm0B, ctermbg = cterm01 })
-- Standard syntax highlighting
-vim.api.nvim_set_hl(0, 'Boolean', {fg = gui09, ctermfg = cterm09})
-vim.api.nvim_set_hl(0, 'Character', {fg = gui08, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'Comment', {fg = gui03, ctermfg = cterm03})
-vim.api.nvim_set_hl(0, 'Conditional', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'Constant', {fg = gui09, ctermfg = cterm09})
-vim.api.nvim_set_hl(0, 'Define', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'Delimiter', {fg = gui0F, ctermfg = cterm0F})
-vim.api.nvim_set_hl(0, 'Float', {fg = gui09, ctermfg = cterm09})
-vim.api.nvim_set_hl(0, 'Function', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'Identifier', {fg = gui08, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'Include', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'Keyword', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'Label', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'Number', {fg = gui09, ctermfg = cterm09})
-vim.api.nvim_set_hl(0, 'Operator', {fg = gui05, ctermfg = cterm05})
-vim.api.nvim_set_hl(0, 'PreProc', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'Repeat', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'Special', {fg = gui0C, ctermfg = cterm0C})
-vim.api.nvim_set_hl(0, 'SpecialChar', {fg = gui0F, ctermfg = cterm0F})
-vim.api.nvim_set_hl(0, 'Statement', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'StorageClass', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'String', {fg = gui0B, ctermfg = cterm0B})
-vim.api.nvim_set_hl(0, 'Structure', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'Tag', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'Todo', {
- fg = gui0A,
- bg = gui01,
- ctermfg = cterm0A,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'Type', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'Typedef', {fg = gui0A, ctermfg = cterm0A})
+vim.api.nvim_set_hl(0, 'Boolean', { fg = gui09, ctermfg = cterm09 })
+vim.api.nvim_set_hl(0, 'Character', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'Comment', { fg = gui03, ctermfg = cterm03 })
+vim.api.nvim_set_hl(0, 'Conditional', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'Constant', { fg = gui09, ctermfg = cterm09 })
+vim.api.nvim_set_hl(0, 'Define', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'Delimiter', { fg = gui0F, ctermfg = cterm0F })
+vim.api.nvim_set_hl(0, 'Float', { fg = gui09, ctermfg = cterm09 })
+vim.api.nvim_set_hl(0, 'Function', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'Identifier', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'Include', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'Keyword', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'Label', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'Number', { fg = gui09, ctermfg = cterm09 })
+vim.api.nvim_set_hl(0, 'Operator', { fg = gui05, ctermfg = cterm05 })
+vim.api.nvim_set_hl(0, 'PreProc', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'Repeat', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'Special', { fg = gui0C, ctermfg = cterm0C })
+vim.api.nvim_set_hl(0, 'SpecialChar', { fg = gui0F, ctermfg = cterm0F })
+vim.api.nvim_set_hl(0, 'Statement', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'StorageClass', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'String', { fg = gui0B, ctermfg = cterm0B })
+vim.api.nvim_set_hl(0, 'Structure', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'Tag', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'Todo', { fg = gui0A, bg = gui01, ctermfg = cterm0A, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'Type', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'Typedef', { fg = gui0A, ctermfg = cterm0A })
-- C highlighting
-vim.api.nvim_set_hl(0, 'cOperator', {fg = gui0C, ctermfg = cterm0C})
-vim.api.nvim_set_hl(0, 'cPreCondit', {fg = gui0E, ctermfg = cterm0E})
+vim.api.nvim_set_hl(0, 'cOperator', { fg = gui0C, ctermfg = cterm0C })
+vim.api.nvim_set_hl(0, 'cPreCondit', { fg = gui0E, ctermfg = cterm0E })
-- C# highlighting
-vim.api.nvim_set_hl(0, 'csClass', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'csAttribute', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'csModifier', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'csType', {fg = gui08, ctermfg = cterm08})
-vim.api
- .nvim_set_hl(0, 'csUnspecifiedStatement', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'csContextualStatement', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'csNewDecleration', {fg = gui08, ctermfg = cterm08})
+vim.api.nvim_set_hl(0, 'csClass', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'csAttribute', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'csModifier', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'csType', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'csUnspecifiedStatement', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'csContextualStatement', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'csNewDecleration', { fg = gui08, ctermfg = cterm08 })
-- CSS highlighting
-vim.api.nvim_set_hl(0, 'cssBraces', {fg = gui05, ctermfg = cterm05})
-vim.api.nvim_set_hl(0, 'cssClassName', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'cssColor', {fg = gui0C, ctermfg = cterm0C})
+vim.api.nvim_set_hl(0, 'cssBraces', { fg = gui05, ctermfg = cterm05 })
+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})
-vim.api.nvim_set_hl(0, 'gitcommitSummary', {fg = gui0B, ctermfg = cterm0B})
-vim.api.nvim_set_hl(0, 'gitcommitComment', {fg = gui03, ctermfg = cterm03})
-vim.api.nvim_set_hl(0, 'gitcommitUntracked', {fg = gui03, ctermfg = cterm03})
-vim.api.nvim_set_hl(0, 'gitcommitDiscarded', {fg = gui03, ctermfg = cterm03})
-vim.api.nvim_set_hl(0, 'gitcommitSelected', {fg = gui03, ctermfg = cterm03})
-vim.api.nvim_set_hl(0, 'gitcommitHeader', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'gitcommitSelectedType', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'gitcommitUnmergedType', {fg = gui0D, ctermfg = cterm0D})
-vim.api
- .nvim_set_hl(0, 'gitcommitDiscardedType', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'gitcommitBranch',
- {fg = gui09, ctermfg = cterm09, bold = true})
-vim.api
- .nvim_set_hl(0, 'gitcommitUntrackedFile', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'gitcommitUnmergedFile',
- {fg = gui08, ctermfg = cterm08, bold = true})
-vim.api.nvim_set_hl(0, 'gitcommitDiscardedFile',
- {fg = gui08, ctermfg = cterm08, bold = true})
-vim.api.nvim_set_hl(0, 'gitcommitSelectedFile',
- {fg = gui0B, ctermfg = cterm0B, bold = true})
+vim.api.nvim_set_hl(0, 'gitcommitOverflow', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'gitcommitSummary', { fg = gui0B, ctermfg = cterm0B })
+vim.api.nvim_set_hl(0, 'gitcommitComment', { fg = gui03, ctermfg = cterm03 })
+vim.api.nvim_set_hl(0, 'gitcommitUntracked', { fg = gui03, ctermfg = cterm03 })
+vim.api.nvim_set_hl(0, 'gitcommitDiscarded', { fg = gui03, ctermfg = cterm03 })
+vim.api.nvim_set_hl(0, 'gitcommitSelected', { fg = gui03, ctermfg = cterm03 })
+vim.api.nvim_set_hl(0, 'gitcommitHeader', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'gitcommitSelectedType', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'gitcommitUnmergedType', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'gitcommitDiscardedType', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'gitcommitBranch', { fg = gui09, ctermfg = cterm09, bold = true })
+vim.api.nvim_set_hl(0, 'gitcommitUntrackedFile', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'gitcommitUnmergedFile', { fg = gui08, ctermfg = cterm08, bold = true })
+vim.api.nvim_set_hl(0, 'gitcommitDiscardedFile', { fg = gui08, ctermfg = cterm08, bold = true })
+vim.api.nvim_set_hl(0, 'gitcommitSelectedFile', { fg = gui0B, ctermfg = cterm0B, bold = true })
-- GitGutter highlighting
-vim.api.nvim_set_hl(0, 'GitGutterAdd', {
- fg = gui0B,
- bg = gui01,
- ctermfg = cterm0B,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'GitGutterChange', {
- fg = gui0D,
- bg = gui01,
- ctermfg = cterm0D,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'GitGutterDelete', {
- fg = gui08,
- bg = gui01,
- ctermfg = cterm08,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'GitGutterChangeDelete', {
- fg = gui0E,
- bg = gui01,
- ctermfg = cterm0E,
- ctermbg = cterm01
-})
+vim.api.nvim_set_hl(0, 'GitGutterAdd', { fg = gui0B, bg = gui01, ctermfg = cterm0B, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'GitGutterChange', { fg = gui0D, bg = gui01, ctermfg = cterm0D, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'GitGutterDelete', { fg = gui08, bg = gui01, ctermfg = cterm08, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'GitGutterChangeDelete', { fg = gui0E, bg = gui01, ctermfg = cterm0E, ctermbg = cterm01 })
-- HTML highlighting
-vim.api.nvim_set_hl(0, 'htmlBold', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'htmlItalic', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'htmlEndTag', {fg = gui05, ctermfg = cterm05})
-vim.api.nvim_set_hl(0, 'htmlTag', {fg = gui05, ctermfg = cterm05})
+vim.api.nvim_set_hl(0, 'htmlBold', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'htmlItalic', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'htmlEndTag', { fg = gui05, ctermfg = cterm05 })
+vim.api.nvim_set_hl(0, 'htmlTag', { fg = gui05, ctermfg = cterm05 })
-- JavaScript highlighting
-vim.api.nvim_set_hl(0, 'javaScript', {fg = gui05, ctermfg = cterm05})
-vim.api.nvim_set_hl(0, 'javaScriptBraces', {fg = gui05, ctermfg = cterm05})
-vim.api.nvim_set_hl(0, 'javaScriptNumber', {fg = gui09, ctermfg = cterm09})
+vim.api.nvim_set_hl(0, 'javaScript', { fg = gui05, ctermfg = cterm05 })
+vim.api.nvim_set_hl(0, 'javaScriptBraces', { fg = gui05, ctermfg = cterm05 })
+vim.api.nvim_set_hl(0, 'javaScriptNumber', { fg = gui09, ctermfg = cterm09 })
-- pangloss/vim-javascript highlighting
-vim.api.nvim_set_hl(0, 'jsOperator', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'jsStatement', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'jsReturn', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'jsThis', {fg = gui08, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'jsClassDefinition', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'jsFunction', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'jsFuncName', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'jsFuncCall', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'jsClassFuncName', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'jsClassMethodType', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'jsRegexpString', {fg = gui0C, ctermfg = cterm0C})
-vim.api.nvim_set_hl(0, 'jsGlobalObjects', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'jsGlobalNodeObjects', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'jsExceptions', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'jsBuiltins', {fg = gui0A, ctermfg = cterm0A})
+vim.api.nvim_set_hl(0, 'jsOperator', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'jsStatement', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'jsReturn', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'jsThis', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'jsClassDefinition', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'jsFunction', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'jsFuncName', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'jsFuncCall', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'jsClassFuncName', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'jsClassMethodType', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'jsRegexpString', { fg = gui0C, ctermfg = cterm0C })
+vim.api.nvim_set_hl(0, 'jsGlobalObjects', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'jsGlobalNodeObjects', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'jsExceptions', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'jsBuiltins', { fg = gui0A, ctermfg = cterm0A })
-- LSP highlighting
-vim.api.nvim_set_hl(0, 'LspDiagnosticsDefaultError',
- {fg = gui08, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'LspDiagnosticsDefaultWarning',
- {fg = gui09, ctermfg = cterm09})
-vim.api.nvim_set_hl(0, 'LspDiagnosticsDefaultHnformation',
- {fg = gui05, ctermfg = cterm05})
-vim.api.nvim_set_hl(0, 'LspDiagnosticsDefaultHint',
- {fg = gui03, ctermfg = cterm03})
+vim.api.nvim_set_hl(0, 'LspDiagnosticsDefaultError', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'LspDiagnosticsDefaultWarning', { fg = gui09, ctermfg = cterm09 })
+vim.api.nvim_set_hl(0, 'LspDiagnosticsDefaultHnformation', { fg = gui05, ctermfg = cterm05 })
+vim.api.nvim_set_hl(0, 'LspDiagnosticsDefaultHint', { fg = gui03, ctermfg = cterm03 })
-- Mail highlighting
-vim.api.nvim_set_hl(0, 'mailQuoted1', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'mailQuoted2', {fg = gui0B, ctermfg = cterm0B})
-vim.api.nvim_set_hl(0, 'mailQuoted3', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'mailQuoted4', {fg = gui0C, ctermfg = cterm0C})
-vim.api.nvim_set_hl(0, 'mailQuoted5', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'mailQuoted6', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'mailURL', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'mailEmail', {fg = gui0D, ctermfg = cterm0D})
+vim.api.nvim_set_hl(0, 'mailQuoted1', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'mailQuoted2', { fg = gui0B, ctermfg = cterm0B })
+vim.api.nvim_set_hl(0, 'mailQuoted3', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'mailQuoted4', { fg = gui0C, ctermfg = cterm0C })
+vim.api.nvim_set_hl(0, 'mailQuoted5', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'mailQuoted6', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'mailURL', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'mailEmail', { fg = gui0D, ctermfg = cterm0D })
-- Markdown highlighting
-vim.api.nvim_set_hl(0, 'markdownCode', {fg = gui0B, ctermfg = cterm0B})
-vim.api.nvim_set_hl(0, 'markdownError', {
- fg = gui05,
- bg = gui00,
- ctermfg = cterm05,
- ctermbg = cterm00
-})
-vim.api.nvim_set_hl(0, 'markdownCodeBlock', {fg = gui0B, ctermfg = cterm0B})
-vim.api.nvim_set_hl(0, 'markdownHeadingDelimiter',
- {fg = gui0D, ctermfg = cterm0D})
+vim.api.nvim_set_hl(0, 'markdownCode', { fg = gui0B, ctermfg = cterm0B })
+vim.api.nvim_set_hl(0, 'markdownError', { fg = gui05, bg = gui00, ctermfg = cterm05, ctermbg = cterm00 })
+vim.api.nvim_set_hl(0, 'markdownCodeBlock', { fg = gui0B, ctermfg = cterm0B })
+vim.api.nvim_set_hl(0, 'markdownHeadingDelimiter', { fg = gui0D, ctermfg = cterm0D })
-- NERDTree highlighting
-vim.api.nvim_set_hl(0, 'NERDTreeDirSlash', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'NERDTreeExecFile', {fg = gui05, ctermfg = cterm05})
+vim.api.nvim_set_hl(0, 'NERDTreeDirSlash', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'NERDTreeExecFile', { fg = gui05, ctermfg = cterm05 })
-- PHP highlighting
-vim.api.nvim_set_hl(0, 'phpMemberSelector', {fg = gui05, ctermfg = cterm05})
-vim.api.nvim_set_hl(0, 'phpComparison', {fg = gui05, ctermfg = cterm05})
-vim.api.nvim_set_hl(0, 'phpParent', {fg = gui05, ctermfg = cterm05})
-vim.api.nvim_set_hl(0, 'phpMethodsVar', {fg = gui0C, ctermfg = cterm0C})
+vim.api.nvim_set_hl(0, 'phpMemberSelector', { fg = gui05, ctermfg = cterm05 })
+vim.api.nvim_set_hl(0, 'phpComparison', { fg = gui05, ctermfg = cterm05 })
+vim.api.nvim_set_hl(0, 'phpParent', { fg = gui05, ctermfg = cterm05 })
+vim.api.nvim_set_hl(0, 'phpMethodsVar', { fg = gui0C, ctermfg = cterm0C })
-- Python highlighting
-vim.api.nvim_set_hl(0, 'pythonOperator', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'pythonRepeat', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'pythonInclude', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'pythonStatement', {fg = gui0E, ctermfg = cterm0E})
+vim.api.nvim_set_hl(0, 'pythonOperator', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'pythonRepeat', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'pythonInclude', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'pythonStatement', { fg = gui0E, ctermfg = cterm0E })
-- Ruby highlighting
-vim.api.nvim_set_hl(0, 'rubyAttribute', {fg = gui0D, ctermfg = cterm0D})
-vim.api.nvim_set_hl(0, 'rubyConstant', {fg = gui0A, ctermfg = cterm0A})
-vim.api.nvim_set_hl(0, 'rubyInterpolationDelimiter',
- {fg = gui0F, ctermfg = cterm0F})
-vim.api.nvim_set_hl(0, 'rubyRegexp', {fg = gui0C, ctermfg = cterm0C})
-vim.api.nvim_set_hl(0, 'rubySymbol', {fg = gui0B, ctermfg = cterm0B})
-vim.api.nvim_set_hl(0, 'rubyStringDelimiter', {fg = gui0B, ctermfg = cterm0B})
+vim.api.nvim_set_hl(0, 'rubyAttribute', { fg = gui0D, ctermfg = cterm0D })
+vim.api.nvim_set_hl(0, 'rubyConstant', { fg = gui0A, ctermfg = cterm0A })
+vim.api.nvim_set_hl(0, 'rubyInterpolationDelimiter', { fg = gui0F, ctermfg = cterm0F })
+vim.api.nvim_set_hl(0, 'rubyRegexp', { fg = gui0C, ctermfg = cterm0C })
+vim.api.nvim_set_hl(0, 'rubySymbol', { fg = gui0B, ctermfg = cterm0B })
+vim.api.nvim_set_hl(0, 'rubyStringDelimiter', { fg = gui0B, ctermfg = cterm0B })
-- SASS highlighting
-vim.api.nvim_set_hl(0, 'sassidChar', {fg = gui08, ctermfg = cterm08})
-vim.api.nvim_set_hl(0, 'sassClassChar', {fg = gui09, ctermfg = cterm09})
-vim.api.nvim_set_hl(0, 'sassInclude', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'sassMixing', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'sassMixinName', {fg = gui0D, ctermfg = cterm0D})
+vim.api.nvim_set_hl(0, 'sassidChar', { fg = gui08, ctermfg = cterm08 })
+vim.api.nvim_set_hl(0, 'sassClassChar', { fg = gui09, ctermfg = cterm09 })
+vim.api.nvim_set_hl(0, 'sassInclude', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'sassMixing', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'sassMixinName', { fg = gui0D, ctermfg = cterm0D })
-- Signify highlighting
-vim.api.nvim_set_hl(0, 'SignifySignAdd', {
- fg = gui0B,
- bg = gui01,
- ctermfg = cterm0B,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'SignifySignChange', {
- fg = gui0D,
- bg = gui01,
- ctermfg = cterm0D,
- ctermbg = cterm01
-})
-vim.api.nvim_set_hl(0, 'SignifySignDelete', {
- fg = gui08,
- bg = gui01,
- ctermfg = cterm08,
- ctermbg = cterm01
-})
+vim.api.nvim_set_hl(0, 'SignifySignAdd', { fg = gui0B, bg = gui01, ctermfg = cterm0B, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'SignifySignChange', { fg = gui0D, bg = gui01, ctermfg = cterm0D, ctermbg = cterm01 })
+vim.api.nvim_set_hl(0, 'SignifySignDelete', { fg = gui08, bg = gui01, ctermfg = cterm08, ctermbg = cterm01 })
-- Spelling highlighting
-vim.api.nvim_set_hl(0, 'SpellBad', {undercurl = true})
-vim.api.nvim_set_hl(0, 'SpellLocal', {undercurl = true})
-vim.api.nvim_set_hl(0, 'SpellCap', {undercurl = true})
-vim.api.nvim_set_hl(0, 'SpellRare', {undercurl = true})
+vim.api.nvim_set_hl(0, 'SpellBad', { undercurl = true })
+vim.api.nvim_set_hl(0, 'SpellLocal', { undercurl = true })
+vim.api.nvim_set_hl(0, 'SpellCap', { undercurl = true })
+vim.api.nvim_set_hl(0, 'SpellRare', { undercurl = true })
-- Startify highlighting
-vim.api.nvim_set_hl(0, 'StartifyBracket', {fg = gui03, ctermfg = cterm03})
-vim.api.nvim_set_hl(0, 'StartifyFile', {fg = gui07, ctermfg = cterm07})
-vim.api.nvim_set_hl(0, 'StartifyFooter', {fg = gui03, ctermfg = cterm03})
-vim.api.nvim_set_hl(0, 'StartifyHeader', {fg = gui0B, ctermfg = cterm0B})
-vim.api.nvim_set_hl(0, 'StartifyNumber', {fg = gui09, ctermfg = cterm09})
-vim.api.nvim_set_hl(0, 'StartifyPath', {fg = gui03, ctermfg = cterm03})
-vim.api.nvim_set_hl(0, 'StartifySection', {fg = gui0E, ctermfg = cterm0E})
-vim.api.nvim_set_hl(0, 'StartifySelect', {fg = gui0C, ctermfg = cterm0C})
-vim.api.nvim_set_hl(0, 'StartifySlash', {fg = gui03, ctermfg = cterm03})
-vim.api.nvim_set_hl(0, 'StartifySpecial', {fg = gui03, ctermfg = cterm03})
+vim.api.nvim_set_hl(0, 'StartifyBracket', { fg = gui03, ctermfg = cterm03 })
+vim.api.nvim_set_hl(0, 'StartifyFile', { fg = gui07, ctermfg = cterm07 })
+vim.api.nvim_set_hl(0, 'StartifyFooter', { fg = gui03, ctermfg = cterm03 })
+vim.api.nvim_set_hl(0, 'StartifyHeader', { fg = gui0B, ctermfg = cterm0B })
+vim.api.nvim_set_hl(0, 'StartifyNumber', { fg = gui09, ctermfg = cterm09 })
+vim.api.nvim_set_hl(0, 'StartifyPath', { fg = gui03, ctermfg = cterm03 })
+vim.api.nvim_set_hl(0, 'StartifySection', { fg = gui0E, ctermfg = cterm0E })
+vim.api.nvim_set_hl(0, 'StartifySelect', { fg = gui0C, ctermfg = cterm0C })
+vim.api.nvim_set_hl(0, 'StartifySlash', { fg = gui03, ctermfg = cterm03 })
+vim.api.nvim_set_hl(0, 'StartifySpecial', { fg = gui03, ctermfg = cterm03 })
-- Java highlighting
-vim.api.nvim_set_hl(0, 'javaOperator', {fg = gui0D, ctermfg = cterm0D})
+vim.api.nvim_set_hl(0, 'javaOperator', { fg = gui0D, ctermfg = cterm0D })
-- vim: filetype=lua
-- end color
@@ -502,7 +295,6 @@ vim.api.nvim_set_hl(0, 'SignColumn', {
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,
@@ -598,31 +390,31 @@ vim.api.nvim_set_hl(0, 'GitGutterChangeDelete', {
ctermbg = cterm00
})
-local highlights = {
- ['@string.regex'] = {link = 'String', default = true},
- -- ['@string.special'] = { link = 'SpecialChar', default = true },
- -- ['@parameter.reference'] = { link = '@parameter', default = true },
- ['@annotation'] = {link = 'PreProc', default = true},
- ['@attribute'] = {link = 'PreProc', default = true},
- -- ['@namespace'] = { link = 'Include', default = true },
- ['@symbol'] = {link = 'Identifier', default = true},
- -- ['@keyword.operator'] = { link = '@operator', default = true },
- ['@variable.builtin'] = {link = 'Special', default = true},
- ['@text.strong'] = {bold = true, default = true},
- ['@text.emphasis'] = {italic = true, default = true},
- ['@text.strike'] = {strikethrough = true},
- ['@text.math'] = {link = 'Special', default = true},
- -- ['@text.reference'] = { link = 'Constant', default = true },
- ['@text.environment'] = {link = 'Macro', default = true},
- ['@text.environment.name'] = {link = 'Type', default = true},
- -- ['@text.title'] = { link = 'Title', default = true },
- -- ['@text.literal'] = { link = 'String', default = true },
- -- ['@text.uri'] = { link = 'Underlined', default = true },
- ['@text.note'] = {link = 'SpecialComment', default = true},
- ['@text.warning'] = {link = 'Todo', default = true},
- ['@text.danger'] = {link = 'WarningMsg', default = true}
- -- ['@tag'] = { link = 'Label', default = true },
- -- ['@tag.delimiter'] = { link = 'Delimiter', default = true },
- -- ['@tag.attribute'] = { link = '@property', default = true },
-}
-for group, hl_map in pairs(highlights) do vim.api.nvim_set_hl(0, group, hl_map) end
+-- local highlights = {
+-- ['@string.regex'] = {link = 'String', default = true},
+-- -- ['@string.special'] = { link = 'SpecialChar', default = true },
+-- -- ['@parameter.reference'] = { link = '@parameter', default = true },
+-- ['@annotation'] = {link = 'PreProc', default = true},
+-- ['@attribute'] = {link = 'PreProc', default = true},
+-- -- ['@namespace'] = { link = 'Include', default = true },
+-- ['@symbol'] = {link = 'Identifier', default = true},
+-- -- ['@keyword.operator'] = { link = '@operator', default = true },
+-- ['@variable.builtin'] = {link = 'Special', default = true},
+-- ['@text.strong'] = {bold = true, default = true},
+-- ['@text.emphasis'] = {italic = true, default = true},
+-- ['@text.strike'] = {strikethrough = true},
+-- ['@text.math'] = {link = 'Special', default = true},
+-- -- ['@text.reference'] = { link = 'Constant', default = true },
+-- ['@text.environment'] = {link = 'Macro', default = true},
+-- ['@text.environment.name'] = {link = 'Type', default = true},
+-- -- ['@text.title'] = { link = 'Title', default = true },
+-- -- ['@text.literal'] = { link = 'String', default = true },
+-- -- ['@text.uri'] = { link = 'Underlined', default = true },
+-- ['@text.note'] = {link = 'SpecialComment', default = true},
+-- ['@text.warning'] = {link = 'Todo', default = true},
+-- ['@text.danger'] = {link = 'WarningMsg', default = true}
+-- -- ['@tag'] = { link = 'Label', default = true },
+-- -- ['@tag.delimiter'] = { link = 'Delimiter', default = true },
+-- -- ['@tag.attribute'] = { link = '@property', default = true },
+-- }
+-- for group, hl_map in pairs(highlights) do vim.api.nvim_set_hl(0, group, hl_map) end
diff --git a/compiler/lua.lua b/compiler/lua.lua
@@ -7,5 +7,5 @@ if vim.fn.exists('current_compiler') then
end
vim.g.current_compiler = 'lua'
-vim.opt_local.makeprg = 'lua %:S'
-vim.opt_local.errorformat = 'lua: %f:%l: %m'
+vim.bo.makeprg = 'lua %:S'
+vim.bo.errorformat = 'lua: %f:%l: %m'
diff --git a/ftplugin/dart.lua b/ftplugin/dart.lua
@@ -1,13 +1,26 @@
-vim.g.dart_style_guide = 2
-vim.g.dart_html_in_string = true
+vim.bo.comments = [[sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,:///,://]]
+vim.bo.commentstring = '//%s'
+vim.bo.includeexpr = [[v:lua.require('tms.ft.dart.package').package_path(v:fname)]]
+vim.opt_local.isfname:append{ ':' }
+vim.opt_local.iskeyword:append{ '$' }
+vim.b.undo_ftplugin = 'setl com< cms< inex< isf<'
+
+local full_path = vim.fn.expand('%:p')
+if string.find(full_path, '%.pub%-cache') then
+ vim.bo.modifiable = false
+end
+
+if vim.fn.getline(1):match('^#!.*dcli') then
+ vim.cmd [[comp dcli]]
+else
+ vim.cmd [[comp dart]]
+end
vim.lsp.start(require'tms.lsp'.make_opts('dartls'))
if pcall(require, 'dart-tools') then
local dt_lsp = require('dart-tools.lsp')
-
local dt_req = require('dart-tools.lsp.request')
-
local ddebug = require('tms.ft.dart.debug')
local cmd_opts = {}
@@ -49,9 +62,3 @@ if pcall(require, 'dart-tools') then
end, opts('Dart Convert To Block'))
vim.keymap.set('n', '<leader>ad', dt_lsp.super, opts('Dart Go to Super Definition'))
end
-
-if vim.fn.getline(1):match('^#!.*dcli') then
- vim.cmd [[comp dcli]]
-else
- vim.cmd [[comp dart]]
-end
diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim
@@ -1,26 +0,0 @@
-if exists('b:did_ftplugin')
- finish
-endif
-let b:did_ftplugin = 1
-
-" Enable automatic indentation (2 spaces) if variable g:dart_style_guide is set
-if exists('g:dart_style_guide')
- setlocal expandtab
- setlocal shiftwidth=2
- setlocal softtabstop=2
-
- setlocal formatoptions-=t
-endif
-
-" Set 'comments' to format dashed lists in comments.
-setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,:///,://
-
-setlocal commentstring=//%s
-let s:win_sep = (has('win32') || has('win64')) ? '/' : ''
-let &l:errorformat = '%f:%l:%c:\ %m'
-
-setlocal includeexpr=dart#resolveUri(v:fname)
-setlocal isfname+=:
-setlocal iskeyword+=$
-
-let b:undo_ftplugin = 'setl et< fo< sw< sts< com< cms< inex< isf<'
diff --git a/ftplugin/lua.lua b/ftplugin/lua.lua
@@ -1,2 +1,3 @@
vim.cmd [[comp lua]]
-vim.bo.syntax = 'ON'
+vim.treesitter.start()
+-- vim.bo.syntax = 'ON'
diff --git a/init.lua b/init.lua
@@ -1,6 +1,5 @@
vim.g.mapleader = ','
vim.g.loaded_matchparen = 1
-vim.g.ts_highlight_lua = true
require('tms.first_load')
require('impatient')
vim.cmd('colorscheme base16')
diff --git a/lua/plugins.lua b/lua/plugins.lua
@@ -46,7 +46,6 @@ return packer.startup({
use 'karb94/neoscroll.nvim'
use { 'sidebar-nvim/sidebar.nvim', requires = { 'kyazdani42/nvim-web-devicons' } }
-- use { 'kevinhwang91/nvim-ufo', requires = { 'kevinhwang91/promise-async' } }
- use 'milisims/foldhue.nvim'
use 'elihunter173/dirbuf.nvim'
use 'norcalli/nvim-terminal.lua'
@@ -73,7 +72,6 @@ return packer.startup({
use { 'lewis6991/gitsigns.nvim', requires = { 'nvim-lua/plenary.nvim' } }
use 'sindrets/diffview.nvim'
use 'tpope/vim-fugitive'
- use 'rhysd/git-messenger.vim'
use 'ThePrimeagen/git-worktree.nvim'
use 'rhysd/conflict-marker.vim'
diff --git a/lua/tms/autocmd.lua b/lua/tms/autocmd.lua
@@ -1,17 +1,9 @@
-vim.api.nvim_create_autocmd('BufEnter', { pattern = 'vifm:*', command = 'startinsert' })
-vim.api.nvim_create_autocmd('WinEnter', { command = 'setlocal cursorline' })
-vim.api.nvim_create_autocmd('WinLeave', { command = 'setlocal nocursorline' })
vim.api.nvim_create_autocmd('TextYankPost', {
pattern = '*',
callback = function()
require('vim.highlight').on_yank()
end,
})
-vim.api.nvim_create_autocmd('ColorScheme', {
- callback = function()
- require('tms.u.reload').colors()
- end,
-})
vim.api.nvim_create_autocmd('BufEnter', {
pattern = '*',
callback = function(opt)
diff --git a/lua/tms/ft/dart/package.lua b/lua/tms/ft/dart/package.lua
@@ -0,0 +1,90 @@
+local M = {}
+
+local function readfile(path)
+ local file = io.open(path, 'rb')
+ if not file then
+ return nil
+ end
+ local content = file:read('*a')
+ file:close()
+ return content
+end
+
+function M.config_path()
+ return vim.fn.getcwd() .. '/.dart_tool/package_config.json'
+end
+
+function M.config()
+ local config_path = M.config_path()
+ if vim.fn.filereadable(config_path) then
+ local content = readfile(config_path)
+ local json = vim.fn.json_decode(content)
+ if not json or not json.packages then
+ return nil
+ end
+ return json
+ end
+ vim.notify('cannot find package_config.json file', vim.log.levels.ERROR)
+ return nil
+end
+
+function M.packages()
+ local config = M.config()
+ if not config then
+ return nil
+ end
+
+ if config.configVersion ~= 2 then
+ vim.notify('unsupported version of package_config.json', vim.log.levels.ERROR)
+ return nil
+ end
+
+ local dart_tool_dir = vim.fs.dirname(M.config_path())
+
+ local packages_map = {}
+ for _, package in pairs(config.packages) do
+ local uri = package.rootUri
+ local package_uri = package.packageUri
+ local lib_dir
+ if string.find(uri, '^file:/') then
+ uri = string.gsub(uri, '^file://', '', 1)
+ lib_dir = vim.fn.resolve(uri .. '/' .. package_uri)
+ else
+ lib_dir = vim.fn.resolve(dart_tool_dir .. '/' .. uri .. '/' .. package_uri)
+ end
+
+ packages_map[package.name] = lib_dir
+ end
+
+ return packages_map
+end
+
+function M.package_path(uri)
+ if not string.find(uri, 'package:') then
+ return nil
+ end
+ local package_name = string.match(uri, '^package:(.+)/.*')
+ if not package_name then
+ return nil
+ end
+
+ local packages = M.packages()
+ if not packages then
+ return nil
+ end
+
+ local package_lib = packages[package_name]
+ if not package_lib then
+ vim.notify('no package mapping for ' .. package_name, vim.log.levels.ERROR)
+ return nil
+ end
+
+ -- HACK localhost%25 - wtf?
+ print(package_lib)
+ package_lib = string.gsub(package_lib, 'localhost%%25', 'localhost%%')
+
+ local package_lib_escaped = string.gsub(package_lib, '%%', '%%%%')
+ return string.gsub(uri, 'package:' .. package_name, package_lib_escaped)
+end
+
+return M;
diff --git a/lua/tms/ft/dart/path_mapping.lua b/lua/tms/ft/dart/path_mapping.lua
@@ -26,7 +26,7 @@ M.load = function()
if string.find(package.rootUri, 'file://') then
package_path = string.sub(package.rootUri, 8) .. '/' .. package.packageUri;
else
- package_path = package.rootUri .. package.packageUri;
+ lckage_path = package.rootUri .. package.packageUri;
end
result['/packages/' .. package.name .. '/'] = package_path;
end
diff --git a/lua/tms/keymap.lua b/lua/tms/keymap.lua
@@ -1,5 +1,4 @@
--- forget visual
-vim.keymap.set('n', 'Q', '<nop>', {})
+vim.keymap.set('n', 'Q', '<nop>', {}) -- forget visual
vim.keymap.set('n', '<esc>', '<cmd>nohl<cr>', { silent = true })
vim.keymap.set('n', 'gA', 'ga', {})
vim.keymap.set('n', 'Y', 'y$', {})
@@ -42,16 +41,6 @@ vim.keymap.set('n', '<leader>l', '<cmd>call ToggleList("Location List", "l")<cr>
vim.keymap.set('n', '<leader>L', '<cmd>lexpr []|lclose<cr>', {})
-- file operation
vim.keymap.set('n', 'cp', require'tms.p.rename_file'.rename_file, { desc = 'Rename File (Change Path)' })
--- <leader>c is for lsp rename
--- fold
-vim.keymap.set('n', 'zH', 'zM', {})
-vim.keymap.set('n', 'zh', 'zm', {})
-vim.keymap.set('n', 'zj', 'zo', {})
-vim.keymap.set('n', 'zJ', 'zO', {})
-vim.keymap.set('n', 'zk', 'zc', {})
-vim.keymap.set('n', 'zK', 'zC', {})
-vim.keymap.set('n', 'zl', 'zr', {})
-vim.keymap.set('n', 'zL', 'zR', {})
-- remap double usage
vim.keymap.set('n', 'y.', 'yy', {})
vim.keymap.set('n', 'z.', 'mmz.`m', {})
diff --git a/lua/tms/options.lua b/lua/tms/options.lua
@@ -1,44 +1,34 @@
vim.opt.exrc = true
-vim.opt.secure = true
vim.opt.clipboard = 'unnamedplus'
vim.opt.completeopt = 'menu,menuone,noselect'
-vim.opt.equalalways = false
+-- vim.opt.equalalways = false -- exp
vim.opt.grepprg = 'rg --vimgrep --no-heading --smart-case'
vim.opt.grepformat = '%f:%l:%c:%m'
-vim.opt.hidden = true
-vim.opt.ignorecase = true
+vim.opt.ignorecase = true -- use `/C` to force case
vim.opt.inccommand = 'split'
-vim.opt.incsearch = true
-vim.opt.mouse = 'a'
vim.opt.pumheight = 5
-vim.opt.shiftround = true
-vim.opt.shortmess = vim.opt.shortmess + 'c'
-vim.opt.showbreak = '>\\ '
-vim.opt.cursorline = true
+-- vim.opt.shortmess = vim.opt.shortmess + 'c' -- exp
+vim.opt.showbreak = '>\\'
vim.opt.showmode = false
vim.opt.smartcase = true
vim.opt.splitbelow = true
vim.opt.splitright = true
vim.opt.termguicolors = true
vim.opt.updatetime = 100
-vim.opt.writebackup = false
vim.opt.expandtab = true
+vim.opt.tabstop = 2
vim.opt.shiftwidth = 2
+-- vim.opt.softtabstop = -1 -- exp
vim.opt.smartindent = true
-vim.opt.softtabstop = -1
+vim.opt.breakindent = true
vim.opt.swapfile = false
-vim.opt.tabstop = 2
vim.opt.undofile = true
-vim.opt.foldlevel = 999
-vim.opt.foldmethod = 'indent'
-vim.opt.list = false
vim.opt.laststatus = 3
vim.opt.statusline = ' '
vim.opt.winbar = '%=%m %f'
vim.opt.ruler = false
vim.opt.listchars = { space = '·', tab = '» ', extends = '›', precedes = '‹', nbsp = '_', trail = '_', eol = '$' }
-vim.opt.fillchars = { eob = '•', fold = ' ' }
-vim.opt.number = false
+vim.opt.fillchars = { eob = '•' }
vim.opt.scrolloff = 5
vim.opt.sidescrolloff = 5
vim.opt.signcolumn = 'yes:1'
diff --git a/lua/tms/u/reload.lua b/lua/tms/u/reload.lua
@@ -1,10 +0,0 @@
-local M = {}
-
-M.colors = function()
- -- package.loaded['colors'] = nil
- -- package.loaded['my-default'] = nil
- -- require('colors')
- -- require('colorbuddy').colorscheme('my-default')
-end
-
-return M
