*

Automated-commit-by: dots
Signed-off-by: Robert Günzler <r@gnzler.io>

11 files changed, 102 insertions, 94 deletions

diff --git a/.config/nvim/lua/config/diagnostics.lua b/.config/nvim/lua/config/diagnostics.lua
index 6314b83..158e3e4 100644
--- a/.config/nvim/lua/config/diagnostics.lua
+++ b/.config/nvim/lua/config/diagnostics.lua
@@ -23,7 +23,9 @@ vim.diagnostic.config({
   underline = {
     severity = { min = vim.diagnostic.severity.WARN },
   },
-  float = false,
+  float = {
+    source = true,
+  },
   virtual_text = false,
   virtual_lines = false,
 })
@@ -34,16 +36,7 @@ vim.api.nvim_set_hl(0, 'DiagnosticUnderlineWarn', commonhl)
 vim.api.nvim_set_hl(0, 'DiagnosticUnderlineInfo', commonhl)
 vim.api.nvim_set_hl(0, 'DiagnosticUnderlineHint', commonhl)
 
-vim.keymap.set('n', '[d', function()
-  vim.diagnostic.jump({ count = 1, float = true })
-end, { desc = 'diagnostic: next' })
-
-vim.keymap.set('n', ']d', function()
-  vim.diagnostic.jump({ count = -1, float = true })
-end, { desc = 'diagnostic: prev' })
-
 vim.keymap.set('n', 'DD', vim.diagnostic.open_float, { desc = 'diagnostic: current line' })
-
 vim.keymap.set('n', '<leader>d', '<nop>', { desc = "diagnostics" })
 vim.keymap.set('n', '<leader>dd', vim.diagnostic.open_float, { desc = 'diagnostic: current line' })
 vim.keymap.set('n', '<leader>dv', function()
diff --git a/.config/nvim/lua/config/filetypes.lua b/.config/nvim/lua/config/filetypes.lua
index f1428d2..f3657db 100644
--- a/.config/nvim/lua/config/filetypes.lua
+++ b/.config/nvim/lua/config/filetypes.lua
@@ -1,5 +1,6 @@
 vim.filetype.add({
   pattern = {
+    ['^/etc/portage/package.*/$'] = 'oil',
     ['todo.txt'] = 'todotxt',
-  }
+  },
 })
diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
index 9c00f7b..a93b8fd 100644
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -18,10 +18,10 @@ map(
   { desc = 'Open file under cursor' }
 )
 
-vim.api.nvim_create_autocmd({'BufEnter', 'BufWinEnter'}, {
+vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWinEnter' }, {
   group = vim.api.nvim_create_augroup('bufclose', {}),
   callback = function()
-    if vim.list_contains({'help', 'nofile', 'quickfix'}, vim.bo.buftype) then
+    if vim.list_contains({ 'help', 'nofile', 'quickfix' }, vim.bo.buftype) then
       map('', 'q', '<cmd>close<cr>', { desc = 'Close buffer', buffer = 0 })
     end
   end,
@@ -34,3 +34,8 @@ map('n', '<leader><leader>x', function()
 end, { desc = 'source current file' })
 
 map('n', '<leader>a', '<cmd>edit #<cr>', { desc = 'open alternative file' })
+
+-- yank buffer name
+map('n', ';yb', [[<cmd>let @+ = expand('%')<cr>]], { desc = 'yank buffer name' })
+map('n', ';yn', [[<cmd>let @+ = expand('%:t')<cr>]], { desc = 'yank filename' })
+map('n', ';yp', [[<cmd>let @+ = expand('%:p')<cr>]], { desc = 'yank path' })
diff --git a/.config/nvim/lua/config/lsp.lua b/.config/nvim/lua/config/lsp.lua
index 282a3dc..b168014 100644
--- a/.config/nvim/lua/config/lsp.lua
+++ b/.config/nvim/lua/config/lsp.lua
@@ -1,4 +1,6 @@
-if not vim.lsp.enable then return end
+if not vim.lsp.enable then
+  return
+end
 
 local lsp = vim.lsp
 
@@ -7,6 +9,8 @@ lsp.enable({
   'ccls',
   'clangd',
   'gopls',
+  'harper_ls',
+  'pylsp',
   'rust_analyzer',
   'superhtml',
   'tinymist',
@@ -14,17 +18,21 @@ lsp.enable({
   'zls',
 })
 
-local capabilities = nil
+local capabilities = {}
 if pcall(require, 'blink.cmp') then
   capabilities = require('blink.cmp').get_lsp_capabilities()
 end
 
 lsp.config('*', {
-  root_markers = {'.git'},
-  capabilities = capabilities
+  root_markers = { '.git' },
+  capabilities = vim.tbl_deep_extend('error', capabilities, {
+    textDocument = {
+      semanticTokens = { multilineTokenSupport = true },
+    },
+  }),
 })
 
-vim.api.nvim_create_autocmd({'LspAttach'}, {
+vim.api.nvim_create_autocmd({ 'LspAttach' }, {
   group = vim.api.nvim_create_augroup('lspattach', {}),
   callback = function(args)
     local client = assert(vim.lsp.get_client_by_id(args.data.client_id))
@@ -36,7 +44,7 @@ vim.api.nvim_create_autocmd({'LspAttach'}, {
     vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { desc = 'goto declaration' })
     vim.keymap.set('n', 'gT', vim.lsp.buf.type_definition, { desc = 'goto type definition' })
     vim.keymap.set('n', 'gR', vim.lsp.buf.references, { desc = 'show references' })
-    vim.keymap.set('n', 'ga', vim.lsp.buf.code_action, { desc = 'show code actions' })
+    vim.keymap.set({ 'n', 'v' }, 'ga', vim.lsp.buf.code_action, { desc = 'show code actions' })
     vim.keymap.set('n', 'grr', vim.lsp.buf.rename, { desc = 'rename' })
 
     if client:supports_method('textDocument/implementation') then
@@ -44,20 +52,24 @@ vim.api.nvim_create_autocmd({'LspAttach'}, {
     end
 
     if client:supports_method('textDocument/completion') then
-      vim.lsp.completion.enable(true, client.id, args.buf, {autotrigger = false})
+      vim.lsp.completion.enable(true, client.id, args.buf, { autotrigger = false })
     end
 
     if client:supports_method('textDocument/formatting') then
-    vim.keymap.set('n', '<leader>f', vim.lsp.buf.format, { desc = 'format' })
+      vim.keymap.set('n', '<leader>f', vim.lsp.buf.format, { desc = 'format' })
     end
 
-    if not client:supports_method('textDocument/willSaveWaitUntil')
-        and client:supports_method('textDocument/formatting') then
-      vim.api.nvim_create_autocmd({'BufWritePre'}, {
+    if
+      not client:supports_method('textDocument/willSaveWaitUntil')
+      and client:supports_method('textDocument/formatting')
+    then
+      vim.api.nvim_create_autocmd({ 'BufWritePre' }, {
         group = vim.api.nvim_create_augroup('lspattach', {}),
         buffer = args.buf,
         callback = function()
-          if vim.b.nofmt then return end
+          if vim.b.nofmt then
+            return
+          end
           vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 })
         end,
       })
diff --git a/.config/nvim/lua/plugins/colorizer.lua b/.config/nvim/lua/plugins/colorizer.lua
index 2608ae6..c949058 100644
--- a/.config/nvim/lua/plugins/colorizer.lua
+++ b/.config/nvim/lua/plugins/colorizer.lua
@@ -4,12 +4,14 @@ return {
     -- 'norcalli/nvim-colorizer.lua',
     lazy = false,
     opts = {
-      name = true,
-      RRGGBB = true,
-      RRGGBBAA = true,
-      rgb_fn = true,
-      hsl_fn = true,
-      mode = 'background',
+      options = {
+        display = {
+          mode = 'background',
+        },
+        parsers = {
+          css = true,
+        },
+      },
     },
   },
 }
diff --git a/.config/nvim/lua/plugins/gentoo.lua b/.config/nvim/lua/plugins/gentoo.lua
index 470e6de..15ef3aa 100644
--- a/.config/nvim/lua/plugins/gentoo.lua
+++ b/.config/nvim/lua/plugins/gentoo.lua
@@ -1,15 +1,18 @@
 return {
   {
-    'gentoo/gentoo-syntax',
-    -- ft = { 'ebuild' },
-    -- init = function()
-    --   vim.api.nvim_create_autocmd('LspAttach', {
-    --     callback = function(args)
-    --       if vim.opt.filetype == 'ebuild' then
-    --         vim.lsp.stop_client(vim.lsp.get_clients({ bufnr = args.bufnr }))
-    --       end
-    --     end,
-    --   })
-    -- end,
+    'https://github.com/gentoo/gentoo-syntax',
+    lazy = false,
+    init = function()
+      vim.api.nvim_create_autocmd({ 'BufEnter' }, {
+        pattern = { '*/portage/package.*/' },
+        group = vim.api.nvim_create_augroup('gentoo-syntax-oil', {}),
+        callback = function(args)
+          -- HACK: this should not be necessary
+          vim.defer_fn(function()
+            vim.opt_local.filetype = 'oil'
+          end, 50)
+        end,
+      })
+    end,
   },
 }
diff --git a/.config/nvim/lua/plugins/git.lua b/.config/nvim/lua/plugins/git.lua
index 04f0c9f..d1e3f7b 100644
--- a/.config/nvim/lua/plugins/git.lua
+++ b/.config/nvim/lua/plugins/git.lua
@@ -1,6 +1,7 @@
 return {
   {
     'lewis6991/gitsigns.nvim',
+    lazy = false,
     opts = {
       debug_mode = false,
     },
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index aebf3c4..311f1bc 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -2,5 +2,28 @@ return {
   {
     'neovim/nvim-lspconfig',
     version = '^2.0',
-  }
+  },
+  {
+    'nvimtools/none-ls.nvim',
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+      'gbprod/none-ls-shellcheck.nvim',
+    },
+    config = function()
+      local nls = require('null-ls')
+      nls.setup({
+        sources = {
+          -- nls.builtins.code_actions.impl,
+          -- nls.builtins.completions.spell,
+
+          nls.builtins.formatting.stylua,
+          nls.builtins.formatting.shfmt,
+          nls.builtins.formatting.buf,
+
+          require("none-ls-shellcheck.diagnostics"),
+          require("none-ls-shellcheck.code_actions"),
+        },
+      })
+    end,
+  },
 }
diff --git a/.config/nvim/lua/plugins/mini.lua b/.config/nvim/lua/plugins/mini.lua
index 74cd962..fb4c9a6 100644
--- a/.config/nvim/lua/plugins/mini.lua
+++ b/.config/nvim/lua/plugins/mini.lua
@@ -2,7 +2,7 @@ return {
   {
     'echasnovski/mini.align',
     version = false,
-    lazy = true,
+    lazy = false,
     opts = {},
   },
   {
diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
index e064a8b..0978eb7 100644
--- a/.config/nvim/lua/plugins/treesitter.lua
+++ b/.config/nvim/lua/plugins/treesitter.lua
@@ -1,19 +1,26 @@
 return {
   {
     'nvim-treesitter/nvim-treesitter',
-    branch = 'master',
+    branch = 'main',
     lazy = false,
-    dependencies = {
-      { 'nvim-treesitter/nvim-treesitter-refactor', lazy = false },
-      { 'nvim-treesitter/nvim-treesitter-textobjects', lazy = false },
-      -- { 'nvim-treesitter/playground', cmd = { 'TSPlayground' } },
-    },
     build = ':TSUpdate',
     config = function(_, opts)
-      require('nvim-treesitter.configs').setup(opts)
-
-      -- use bash parser for gentoo ebuilds
-      vim.treesitter.language.register('bash', 'ebuild')
+      -- enable indent
+      vim.api.nvim_create_autocmd('FileType', {
+        callback = function()
+          pcall(vim.treesitter.start)
+          vim.bo.indentexpr = [[v:lua.require'nvim-treesitter'.indentexpr()]]
+        end,
+      })
+      -- auto-install
+      local already_installed = require('nvim-treesitter').get_installed()
+      local parsers_installable = vim
+        .iter(opts.ensure_installed)
+        :filter(function(parser)
+          return not vim.tbl_contains(already_installed, parser)
+        end)
+        :totable()
+      require('nvim-treesitter').install(parsers_installable)
     end,
     opts = {
       ensure_installed = {
@@ -31,7 +38,6 @@ return {
         'html',
         'javascript',
         'json',
-        'jsonc',
         'lua',
         'make',
         'markdown',
@@ -51,43 +57,6 @@ return {
         'yaml',
         'zig',
       },
-      highlight = {
-        enable = true,
-        additional_vim_regex_highlighting = { 'markdown' },
-      },
-      indent = {
-        enable = true,
-      },
-      refactor = {
-        navigation = {
-          enable = true,
-        },
-        smart_rename = {
-          enable = true,
-        },
-      },
-      textobjects = {
-        select = {
-          enable = true,
-          keymaps = {
-            ['ib'] = '@block.inner',
-            ['ab'] = '@block.outer',
-            -- ['ic'] = '@conditional.inner',
-            -- ['ac'] = '@conditional.outer',
-            ['if'] = '@function.inner',
-            ['af'] = '@function.outer',
-            ['il'] = '@loop.inner',
-            ['al'] = '@loop.outer',
-            ['is'] = '@scopename.inner',
-            ['as'] = '@scopename.outer',
-            ['ic'] = '@comment.inner',
-            ['ac'] = '@comment.outer',
-          },
-          selection_mode = {
-            ['@comment.outer'] = 'V',
-          },
-        },
-      },
     },
   },
 }
diff --git a/.config/nvim/lua/plugins/whichkey.lua b/.config/nvim/lua/plugins/whichkey.lua
index dc21eda..cb89df4 100644
--- a/.config/nvim/lua/plugins/whichkey.lua
+++ b/.config/nvim/lua/plugins/whichkey.lua
@@ -3,8 +3,7 @@ return {
     'folke/which-key.nvim',
     event = 'VeryLazy',
     opts = {
-      sort = { 'alphanum' },
-      icons = { separator = '→ ', group = '🞱 ' },
+      icons = { separator = '→ ', group = ' +' },
     },
   },
 }