From d5a279bce8798e9c264f741093b2ca48d709cf37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= Date: Fri, 10 Feb 2023 16:33:28 +0100 Subject: [PATCH] nvim: styles and Overseer --- dot_config/nvim/lua/configs/colors.lua | 2 +- dot_config/nvim/lua/configs/options.lua | 2 +- .../nvim/lua/configs/packages/colors.lua | 5 ++ dot_config/nvim/lua/configs/packages/misc.lua | 41 +++++++++++--- .../nvim/lua/configs/packages/null-ls.lua | 56 ++++++++++--------- dot_config/nvim/queries/php/highlights.scm | 6 +- dot_config/private_vifm/vifmrc | 2 +- 7 files changed, 73 insertions(+), 41 deletions(-) diff --git a/dot_config/nvim/lua/configs/colors.lua b/dot_config/nvim/lua/configs/colors.lua index c7894ae..3135dc4 100644 --- a/dot_config/nvim/lua/configs/colors.lua +++ b/dot_config/nvim/lua/configs/colors.lua @@ -142,7 +142,7 @@ function M:hl(group, fg, bg, styles, opts) o.ctermbg = self.pallete[bg][2] end - for _, st in pairs(styles) do + for _, st in pairs(styles or {}) do o[st] = true end diff --git a/dot_config/nvim/lua/configs/options.lua b/dot_config/nvim/lua/configs/options.lua index 92ef3b2..b525a61 100644 --- a/dot_config/nvim/lua/configs/options.lua +++ b/dot_config/nvim/lua/configs/options.lua @@ -60,7 +60,7 @@ function M.setup() vim.api.nvim_create_autocmd('FileType', { - pattern = { 'qf', 'man', 'help', 'tsplayground' }, + pattern = { 'qf', 'man', 'help', 'tsplayground', 'checkhealth', 'OverseerList' }, callback = function(args) local buf = args.buf local bo = vim.bo[buf] diff --git a/dot_config/nvim/lua/configs/packages/colors.lua b/dot_config/nvim/lua/configs/packages/colors.lua index 40e3723..3fa531c 100644 --- a/dot_config/nvim/lua/configs/packages/colors.lua +++ b/dot_config/nvim/lua/configs/packages/colors.lua @@ -70,6 +70,9 @@ function M.config() link('@type.qualifier', 'Keyword') link('@storageclass', 'Keyword') + + link('@tag.attribute', 'Identifier') + link('@tag.delimiter', 'Delimiter') end -- }}} local function normalizeTroubleHighlight() -- {{{ @@ -157,6 +160,8 @@ function M.config() gr:hl('DiagnosticVirtualTextInfo', 'info', nil, { 'italic', }) gr:hl('DiagnosticVirtualTextHint', 'hint', nil, { 'italic', }) + gr:hl('@attribute', 'aqua') + -- gr:hl('GitSignsAddLine', nil, 'faded_green', {}) -- vim.fn.sign_define('GitSignsAdd', { text = '│', texthl = 'GitSignsAdd', linehl = 'GitSignsAddLine', culhl='CursorLine' }) end, diff --git a/dot_config/nvim/lua/configs/packages/misc.lua b/dot_config/nvim/lua/configs/packages/misc.lua index e7ebfb5..2cc8d54 100644 --- a/dot_config/nvim/lua/configs/packages/misc.lua +++ b/dot_config/nvim/lua/configs/packages/misc.lua @@ -4,13 +4,13 @@ return { cmd = 'ColorizerToggle', }, - { 'AndrewRadev/linediff.vim', cmd = 'Linediff' }, + { 'AndrewRadev/linediff.vim', cmd = 'Linediff' }, { 'lukas-reineke/indent-blankline.nvim', config = true, opts = { show_current_context = true, show_current_context_start = false, - }}, - { 'echasnovski/mini.trailspace', version = '*', config = function() require('mini.trailspace').setup({}) end }, + } }, + { 'echasnovski/mini.trailspace', version = '*', config = function() require('mini.trailspace').setup({}) end }, -- stolen from LazyVim { @@ -30,6 +30,31 @@ return { end, }, + { 'stevearc/overseer.nvim', + config = true, + cmd = { + 'OverseerBuild', + 'OverseerClearCache', + 'OverseerClose', + 'OverseerDeleteBundle', + 'OverseerInfo', + 'OverseerLoadBundle', + 'OverseerOpen', + 'OverseerQuickAction', + 'OverseerRun', + 'OverseerRunCmd', + 'OverseerSaveBundle', + 'OverseerTaskAction', + 'OverseerToggle', + }, + keys = { + { 'xx', 'OverseerToggle', desc = 'Overseer toggle' }, + { 'xi', 'OverseerInfo', desc = 'Overseer info' }, + { 'xa', 'OverseerTaskAction', desc = 'Overseer action' }, + { 'xr', 'OverseerRun', desc = 'Overseer run' }, + } + }, + { 'numToStr/Comment.nvim', @@ -42,7 +67,7 @@ return { 'vlada-dudr/vdebug', lazy = true, keys = { - { '', desc = 'Start Vdebug' }, + { '', desc = 'Start Vdebug' }, { '', desc = 'Vdebug breakpoint' }, }, }, @@ -52,8 +77,8 @@ return { { 'andymass/vim-matchup', event = 'BufRead', config = function() - vim.g.matchup_matchparen_offscreen = {} - end }, + vim.g.matchup_matchparen_offscreen = {} + end }, { 'echasnovski/mini.surround', @@ -73,7 +98,7 @@ return { end, }, - { 'fpob/nette.vim', ft = 'nette', }, + { 'fpob/nette.vim', ft = 'nette', }, { 'ziglang/zig.vim', ft = 'zig', }, { @@ -87,7 +112,7 @@ return { lazy = true, cmd = { 'Trouble', 'TroubleToggle', }, keys = { - { 'tt', 'TroubleToggle', desc = 'Trouble toggle', }, + { 'tt', 'TroubleToggle', desc = 'Trouble toggle', }, { 'td', 'Trouble document_diagnostics', desc = 'Trouble toggle', }, }, config = { diff --git a/dot_config/nvim/lua/configs/packages/null-ls.lua b/dot_config/nvim/lua/configs/packages/null-ls.lua index a416eef..36b7abd 100644 --- a/dot_config/nvim/lua/configs/packages/null-ls.lua +++ b/dot_config/nvim/lua/configs/packages/null-ls.lua @@ -23,34 +23,36 @@ function M.config() nls.builtins.formatting.phpcsfixer.with({ extra_args = { '--rules', - vim.fn.json_encode({ - ['@Symfony'] = true, - nullable_type_declaration_for_default_null_value = true, - array_syntax = { syntax = 'short' }, - fully_qualified_strict_types = false, - binary_operator_spaces = { - default = 'single_space', - operators = { - ['=>'] = 'align_single_space_minimal', - ['='] = 'align_single_space_minimal', - ['??='] = 'align_single_space_minimal', - ['^='] = 'align_single_space_minimal', - ['|='] = 'align_single_space_minimal', - ['+='] = 'align_single_space_minimal', - ['%='] = 'align_single_space_minimal', - ['&='] = 'align_single_space_minimal', - ['**='] = 'align_single_space_minimal', - ['*='] = 'align_single_space_minimal', - ['-='] = 'align_single_space_minimal', - ['.='] = 'align_single_space_minimal', - ['/='] = 'align_single_space_minimal', - ['<<='] = 'align_single_space_minimal', - ['<='] = 'align_single_space_minimal', - ['>='] = 'align_single_space_minimal', - ['>>='] = 'align_single_space_minimal' - }, + [[{ + "@Symfony": true, + "fully_qualified_strict_types": false, + "array_syntax": { + "syntax": "short" }, - }), + "nullable_type_declaration_for_default_null_value": true, + "binary_operator_spaces": { + "default": "single_space", + "operators": { + ">>=": "align_single_space_minimal", + "<<=": "align_single_space_minimal", + "/=": "align_single_space_minimal", + "*=": "align_single_space_minimal", + "^=": "align_single_space_minimal", + "%=": "align_single_space_minimal", + "=>": "align_single_space_minimal", + "|=": "align_single_space_minimal", + ".=": "align_single_space_minimal", + "<=": "align_single_space_minimal", + ">=": "align_single_space_minimal", + "+=": "align_single_space_minimal", + "**=": "align_single_space_minimal", + "&=": "align_single_space_minimal", + "=": "align_single_space_minimal", + "-=": "align_single_space_minimal", + "??=": "align_single_space_minimal" + } + } + }]] }, }), nls.builtins.diagnostics.shellcheck, diff --git a/dot_config/nvim/queries/php/highlights.scm b/dot_config/nvim/queries/php/highlights.scm index df82730..2829054 100644 --- a/dot_config/nvim/queries/php/highlights.scm +++ b/dot_config/nvim/queries/php/highlights.scm @@ -26,12 +26,14 @@ (scoped_call_expression scope: [(name) (qualified_name)] @type) (class_constant_access_expression - . [(name) (qualified_name)] @type + (relative_scope) (name) @constant) (trait_declaration name: (name) @type) (use_declaration (name) @type) +(relative_scope) @type + ; Functions, methods, constructors @@ -87,8 +89,6 @@ ; Variables -(relative_scope) @variable.builtin - ((name) @constant (#vim-match? @constant "^_?[A-Z][A-Z\d_]*$")) ((name) @constant.builtin diff --git a/dot_config/private_vifm/vifmrc b/dot_config/private_vifm/vifmrc index 7b622e7..c3ce48d 100644 --- a/dot_config/private_vifm/vifmrc +++ b/dot_config/private_vifm/vifmrc @@ -11,7 +11,7 @@ " If you would like to use another vi clone such as Elvis or Vile " you will need to change this setting. -set vicmd=vim +set vicmd=nvim " set vicmd=elvis\ -G\ termcap " set vicmd=vile