updates

Signed-off-by: blob42 <contact@blob42.xyz>

lua/core/mappings.lua

@@ -292,13 +292,6 @@ M.general = { --{{{
         ["<leader>tS"] = { "<cmd> TSDisable highlight <CR>", "disable treesitter higlights" },
 
 
-        ["<leader>tp"] = {
-            function()
-                vim.cmd("TSPlaygroundToggle")
-            end,
-            "Treesitter playground"
-        },
-
         -- Moving lines around
         ["<M-Down>"] = { "<cmd>:m +1<CR>==", "move line up" },
         ["<M-Up>"] = { "<cmd>:m .-2<CR>==", "move line up" },
@@ -343,12 +336,16 @@ M.general = { --{{{
         end, "TS swap left with sibling", opts = { expr = true } },
 
         -- quickfix
-        ["]e"] = { "<cmd> cn <CR>", "quickfix next error" },
+        ["]e"] = { "<cmd> cn <CR>", "quickfix next" },
-        ["[e"] = { "<cmd> cp <CR>", "quickfix previous error" },
+        ["[e"] = { "<cmd> cp <CR>", "quickfix previous" },
+        ["<Right>k"] = { "<cmd> cn <CR>", "quickfix next" },
+        ["<Left>k"] = { "<cmd> cp <CR>", "quickfix previous" },
 
         -- loclist
-        ["]l"] = { "<cmd> lne <CR>", "loclist next error" },
+        ["]l"] = { "<cmd> lne <CR>", "loclist next" },
-        ["[l"] = { "<cmd> lp <CR>", "loclist previous error" },
+        ["[l"] = { "<cmd> lp <CR>", "loclist previous" },
+        ["<Right>l"] = { "<cmd> lne <CR>", "loclist next" },
+        ["<Left>l"] = { "<cmd> lp <CR>", "loclist previous" },
 
 
         -- Tabularize mappings
@@ -409,6 +406,7 @@ M.general = { --{{{
         ["<leader>A"] = { "<cmd>ArgWrap<CR>", "arg wrap" },
 
 
+        -- LSP {{{
         -- TODO: move to lspconfig section
         -- ["<leader>lsp"] = { "<cmd> lua require('custom.plugins.configs.navigator').enable()<CR>", "lsp enable"},
         ["<leader>lsp"] = { function()
@@ -416,7 +414,7 @@ M.general = { --{{{
                     require('rustaceanvim.lsp').start()
                 else
                     vim.cmd("LspStart")
-                end 
+	    end 
         end, "lsp enable" },
         -- ["<M-s><M-s>"] = { "<cmd> LspStart<CR>", "lsp enable" },
         ["<M-s><M-s>"] = { function()
@@ -430,7 +428,7 @@ M.general = { --{{{
         ["<M-t><M-t>"] = {function()
             local bufnr = vim.api.nvim_get_current_buf()
             -- get all clients for buffer
-            local clients = vim.lsp.get_active_clients({
+            local clients = vim.lsp.get_clients({
                 bufnr = bufnr
             })
 
@@ -451,8 +449,9 @@ M.general = { --{{{
             end
 
         end, "lsp disable" },
-        ["<leader>lst"] = { "<cmd> LspStop<CR>", "lsp disable" },
+        ["<leader>lst"] = { "<cmd> LspStop<CR>", "lsp disable" },-- }}}
-
+       ["<Right>j"] = {function() vim.diagnostic.jump({count=1}) end,"diagnostic next" },
+        ["<Left>j"] = {function() vim.diagnostic.jump({count=-1}) end,"diagnostic previous" },
         -- My custom commands
         ["<leader>gB"] = {"<cmd> GitBlob<CR>"},
 
@@ -690,7 +689,7 @@ M.nvimtree = { --{{{
 
     n = {
         -- toggle
-        ["<Left>"] = { "<cmd> NvimTreeToggle <CR>", "toggle nvimtree" },
+        ["<Left><Left>"] = { "<cmd> NvimTreeToggle <CR>", "toggle nvimtree" },
     },
 } --}}}
 
@@ -924,7 +923,7 @@ M.blankline = { --{{{
 M.aerial = {
     plugin = true,
     n = {
-        ["<Right>"] = { "<cmd> AerialToggle right<CR>" },
+        ["<Right><Right>"] = { "<cmd> AerialToggle right<CR>" },
     }
 }
 

lua/custom/plugins/configs/navigator.lua

@@ -97,17 +97,17 @@ local config = {
     --TODO: toggle diagnostics
     {
         key = ']d',
-        func = vim.diagnostic.goto_next,
+        func = function() vim.diagnostic.jump {count=1} end,
         desc = 'next diagnostics',
     },
     {
         key = '[d',
-        func = vim.diagnostic.goto_prev,
+        func = function() vim.diagnostic.jump {count=-1} end,
         desc = 'prev diagnostics',
     },
     {
         key = ']O',
-        func = vim.diagnostic.set_loclist,
+        func = vim.diagnostic.setloclist,
         desc = 'diagnostics set loclist',
     },
     { key = ']r', func = require('navigator.treesitter').goto_next_usage, desc = 'lsp goto_next_usage' },

lua/custom/plugins/configs/rustaceanvim.lua

@@ -1,6 +1,9 @@
 local M = {}
 
 local config = {
+    inlay_hints = {
+        highlight = "NonText"
+    },
     server = {
         cmd = {"run-rust-analyzer"},
         auto_attach = false,

lua/custom/plugins/configs/zk.lua

@@ -14,7 +14,7 @@ local opts = {
             -- etc, see `:h vim.lsp.start_client()`
             on_attach = function(client, bufnr)
                 vim.keymap.set("n", "K", "<cmd> lua vim.lsp.buf.hover()<CR>", { desc = "zk lsp hover"})
-                vim.keymap.set("v", "<leader>za", ":'<,'> vim.lsp.buf.range_code_action()<CR>", { desc = { "zk range code action"}})
+                vim.keymap.set("v", "<leader>za", ":'<,'> vim.lsp.buf.range_code_action()<CR>", { desc = "zk range code action" })
             end
         },
 

lua/custom/plugins/init.lua

@@ -84,15 +84,16 @@ return {
             require("syntax-tree-surfer").setup()
         end
     },
-    -- Treesitter dev/exploration tool
+    -- Treesitter dev/exploration tool 
+    -- NOTE: builtin in neovim :InspectTree
     -- https://git.blob42.xyz/blob42/playground/commit/460fe1b3e3b2971c52c5f02a7dbbb132f1f30584
-    ["nvim-treesitter/playground"] = {
+    -- ["nvim-treesitter/playground"] = {
-    -- ["https://git.blob42.xyz/blob42/playground"] = {
+    -- -- ["https://git.blob42.xyz/blob42/playground"] = {
-        lock = false,
+    --     lock = false,
-        -- opt = true,
+    --     -- opt = true,
-        cmd = { "TSPlayground*" },
+    --     cmd = { "TSPlayground*" },
-        -- commit = "460fe1b3e3b2971c52c5f02a7dbbb132f1f30584",
+    --     -- commit = "460fe1b3e3b2971c52c5f02a7dbbb132f1f30584",
-    },
+    -- },
 
     ["nvim-treesitter/nvim-treesitter-context"] = {
         lock = false,
@@ -773,7 +774,7 @@ return {
     ['stevearc/aerial.nvim'] = {
         -- lock = true,
         after = { "base46" },
-        keys = { "<Right>" },
+        keys = { "<Right><Right>" },
         cmd = { "Aerial*" },
         config = function()
             require("core.utils").load_mappings "aerial"

lua/custom/plugins/nvchadui.lua

@@ -136,7 +136,7 @@ return {
         local lsp_status = ""
         local dap_status = ""
         if rawget(vim, "lsp") then
-            for _, client in ipairs(vim.lsp.get_active_clients()) do
+            for _, client in ipairs(vim.lsp.get_clients()) do
                 if client.attached_buffers[vim.api.nvim_get_current_buf()] then
                     lsp_status = (vim.o.columns > 100 and "%#St_LspStatus#" .. "[" .. client.name .. "]") or "%#St_LspStatus#" .. " "
                 end

plugin/spike/autocmd.lua

@@ -17,4 +17,16 @@ local function dwm()
     })
 end
 
+local function xremap()
+    local group = augroup('xremap', {})
+    autocmd({'BufWritePost'}, {
+        group = group,
+        pattern = '*/.config/xremap/*.yml',
+        callback = function()
+            vim.system({"systemctl", "--user", "restart", "xremap"}):wait()
+        end
+    })
+end
+
 dwm()
+xremap()