toggle diagnostics severity

after/plugin/diagnostics.lua

@@ -0,0 +1 @@
+require 'spike.diagnostics'.set_diagnostics_level(vim.diagnostic.severity.WARN)

after/plugin/grapple.lua

@@ -0,0 +1,6 @@
+local ok, grapple = pcall(require, "grapple")
+if not ok then 
+    vim.notify("missing module grapple", vim.log.levels.WARN)
+    return
+end
+

init.lua

@@ -26,5 +26,5 @@ end
 
 -- pcall(require, "custom")
 
-local vimscriptsfolder = vim.env.XDG_CONFIG_HOME .. "/nvim/myvimscript" -- relative to .config/nvim dir
+local vimscriptsfolder = vim.env["XDG_CONFIG_HOME"] .. "/nvim/myvimscript" -- relative to .config/nvim dir
 vim.opt.runtimepath:prepend(vimscriptsfolder)

lua/core/mappings.lua

@@ -90,6 +90,10 @@ M.general = { --{{{
         ["<BS>d"] = { "<cmd>DelayTrainToggle<CR>", "disable delay train" },
 
 
+        ["<leader>dge"] = { "<CMD> lua require'spike.diagnostics'.set_diagnostics_level(1)<CR>", "diagnostic severity level error"},
+        ["<leader>dgw"] = { "<CMD> lua require'spike.diagnostics'.set_diagnostics_level(2)<CR>", "diagnostic severity level warning"},
+        ["<leader>dgi"] = { "<CMD> lua require'spike.diagnostics'.set_diagnostics_level(3)<CR>", "diagnostic severity level info"},
+        ["<leader>dgh"] = { "<CMD> lua require'spike.diagnostics'.set_diagnostics_level(4)<CR>", "diagnostic severity level hint"},
 
         -- update nvchad
         -- ["<leader>uu"] = { "<cmd> :NvChadUpdate <CR>", "update nvchad" },
@@ -369,7 +373,12 @@ M.general = { --{{{
 
     -- operator pending
     o = {
-        ["S"] = {"<Plug>(leap-forward-to)"},
+        ["S"] = { "<Plug>(leap-forward-to)" },
+    },
+
+    -- select mode (with completion)
+    s = {
+        ["<BS>"] = {"<BS>i"},  -- delete and go to insert mode
     },
 
     -- visual exclusive mode (ignore select)
@@ -391,10 +400,10 @@ M.general = { --{{{
         ["L"] = { "<cmd>STSSelectChildNode<CR>", "select prev sibling node" },
 
         -- swap nodes tip: start first with master/child node selection then use these
-        ["<M-Up>"] = { "<cmd>STSSwapPrevVisual<CR>", "select prev sibling node" },
-        ["<M-Left>"] = { "<cmd>STSSwapPrevVisual<CR>", "select prev sibling node" },
-        ["<M-Down>"] = { "<cmd>STSSwapNextVisual<CR>", "select next sibling node" },
-        ["<M-Right>"] = { "<cmd>STSSwapNextVisual<CR>", "select next sibling node" },
+        ["<M-Up>"] = { "<cmd>STSSwapPrevVisual<CR>", "swap prev sibling node" },
+        ["<M-Left>"] = { "<cmd>STSSwapPrevVisual<CR>", "swap prev sibling node" },
+        ["<M-Down>"] = { "<cmd>STSSwapNextVisual<CR>", "swap next sibling node" },
+        ["<M-Right>"] = { "<cmd>STSSwapNextVisual<CR>", "swap next sibling node" },
 
     }, -- }}}
 } --}}}
@@ -926,8 +935,8 @@ M.golang = {
 M["todo-comments"] = {
     plugin = true,
     n = {
-        ["]t"] = {"<cmd> lua require'todo-comments'.jump_next()<CR>", "jump to next todo"},
-        ["[t"] = {"<cmd> lua require'todo-comments'.jump_prev()<CR>", "jump to prev todo"}
+        ["]t"] = { "<cmd> lua require'todo-comments'.jump_next()<CR>", "jump to next todo" },
+        ["[t"] = { "<cmd> lua require'todo-comments'.jump_prev()<CR>", "jump to prev todo" }
     }
 }
 
@@ -942,21 +951,38 @@ M.gitsigns = {
             "Git stage buffer",
         },
         ["<leader>gR"] = { "<cmd> lua require'gitsigns'.reset_buffer_index()<CR>",
-            "Git stage buffer",
+            "Git reset buffer index",
         },
         ["<leader>gp"] = { "<cmd> lua require'gitsigns'.preview_hunk()<CR>",
-            "Git stage buffer",
+            "Git preview hunk",
         },
-        ["<leader>gu"] = {"<cmd> lua require'gitsigns'.undo_stage_hunk()<CR>",
+        ["<leader>gu"] = { "<cmd> lua require'gitsigns'.undo_stage_hunk()<CR>",
             "Git undo stage hunk",
         },
-        ["]h"] = { "<cmd> lua require'gitsigns'.next_hunk()<CR>", 
+        ["]h"] = { "<cmd> lua require'gitsigns'.next_hunk()<CR>",
             "Git next hunk",
         },
-        ["[h"] = { "<cmd> lua require'gitsigns'.prev_hunk()<CR>", 
+        ["[h"] = { "<cmd> lua require'gitsigns'.prev_hunk()<CR>",
             "Git prev hunk",
         }
     }
 }
 
+M.grapple = {
+    plugin = true,
+    n = {
+        [",J"] = { "<cmd> lua require'grapple'.cycle_forward()<CR>" },
+        [",K"] = { "<cmd> lua require'grapple'.cycle_backward()<CR>" },
+        [",T"] = { "<cmd> GrappleTag<CR>"},
+        [",N"] = { function()
+            vim.ui.input({ prompt = "tag: " }, function(input)
+                require("grapple").tag({ name = input })
+            end)
+        end, "grapple tag with name" },
+        [",,m"] = { "<cmd> lua require'grapple'.select({name='mappings'})<CR>" },
+        [",,p"] = { "<cmd> lua require'grapple'.select({name='plugins'})<CR>" },
+        [",,P"] = { "<cmd> lua require'grapple'.select({name='Plugins'})<CR>" },
+    }
+}
+
 return M

lua/custom/chadrc.lua

@@ -17,6 +17,10 @@ M.ui = {
     theme = "gruvbox_material",
     theme_toggle = { "gruvbox_material", "gruvbox_light" },
     hl_override = {
+        IndentBlanklineContextChar = {
+            fg = "yellow",
+            nocombine = true,
+        },
         Comment = {
             fg = "light_grey"
         },

lua/custom/init.lua

@@ -9,8 +9,7 @@
 -- if character under cursor is number
 -- use normal C-x or close window
 
--- local vimscriptsfolder = vim.env.XDG_CONFIG_HOME .. "/nvim/myvimscript" -- relative to .config/nvim dir
--- vim.opt.runtimepath:prepend(vimscriptsfolder)
+--
 
 
 -- highlights {

lua/custom/plugins/configs/navigator.lua

@@ -48,7 +48,7 @@ local config = {
     { key = '<Space>D', func = vim.lsp.buf.type_definition, desc = 'lsp type_definition' },
     { key = 'gL', func = require('navigator.diagnostics').show_diagnostics, desc = 'lsp show_diagnostics' },
     { key = 'gG', func = require('navigator.diagnostics').show_buf_diagnostics, desc = 'lsp show_buf_diagnostics' },
-    -- { key = '<Leader>dt', func = require('navigator.diagnostics').toggle_diagnostics, desc = 'lsp toggle_diagnostics' },
+    { key = '<Leader>dt', func = require('navigator.diagnostics').toggle_diagnostics, desc = 'lsp toggle_diagnostics' },
     { key = '<Leader>td', func = require('spike.diagnostics').toggle, desc = 'lsp toggle_diagnostics' },
     { key = ']d', func = vim.diagnostic.goto_next, desc = 'lsp next diagnostics' },
     { key = '[d', func = vim.diagnostic.goto_prev, desc = 'lsp prev diagnostics' },
@@ -140,7 +140,7 @@ local config = {
         source = true
       }, -- show virtual for diagnostic message
       update_in_insert = false, -- update diagnostic message in insert mode
-      severity_sort = { reverse = true },
+      severity_sort = { reverse = false },
     },
 
     diagnostic_scrollbar_sign = false,

lua/custom/plugins/configs/plantuml.lua

@@ -17,11 +17,11 @@ M.lazy_load_module = function()
                     vim.defer_fn(function()
                         require("packer").loader("plantuml-syntax")
                     end,0)
+                    return
                 end
             end
 
             firstline = vim.api.nvim_buf_get_lines(0,0,1,true)[1]
-            P(firstline)
             if firestline ~= "" and firstline:match("^@startuml%s*") then
                 vim.defer_fn(function()
                     require("packer").loader("plantuml-syntax")

lua/custom/plugins/init.lua

@@ -300,6 +300,20 @@ return {
         end
     }, -- }}}
 
+    ["cbochs/grapple.nvim"] = {
+        setup = function()
+            require("core.utils").load_mappings "grapple"
+        end,
+        config = function()
+            require("grapple").setup({
+            -- Your configuration goes here
+            -- Leave empty to use the default configuration
+            -- Please see the Configuration section below for more information
+            save_path = vim.fn.stdpath("data") .. "/" .. "grapple.json",
+
+        })
+        end
+    },
     -- tmux helpers
     ["christoomey/vim-tmux-navigator"] = {
         cond = function()
@@ -416,6 +430,8 @@ return {
                     "mason",
                     "guihua*",
                     "terminal*",
+                    "db*",
+                    "aerial*",
                 },
             })
         end
@@ -646,12 +662,19 @@ return {
         ft = {"plantuml"},
     },
     ["scrooloose/vim-slumlord"] = {
-        ft = {"plantuml"},
-    }
+        opt = true,
+        -- ft = {"plantuml"},
+    },
 
     -- sql tools
     -- https://github.com/tpope/vim-dadbod
     -- https://github.com/kristijanhusak/vim-dadbod-ui
+    ["tpope/vim-dadbod"] = {
+        ft = "sql",
+    },
+    ["kristijanhusak/vim-dadbod-ui"] = {
+        after = {"vim-dadbod"},
+    }
 
 
 }

lua/spike/diagnostics.lua

@@ -2,13 +2,15 @@ M = {}
 M.shown = true
 
 -- toggle diagnostics with show/hide
-M.toggle = function ()
-  if M.shown  then
-    M.shown = false
-    return vim.diagnostic.hide()
-  end
-  M.shown = true
-  vim.diagnostic.show()
+M.toggle = function()
+    if M.shown then
+        M.shown = false
+        return vim.diagnostic.hide()
+    end
+
+
+    M.shown = true
+    vim.diagnostic.show()
 end
 
 -- my customized attach
@@ -16,4 +18,46 @@ end
 -- end
 
 
+-- return M
+--
+local orig_diag_virt_handler = vim.diagnostic.handlers.virtual_text
+local ns = vim.api.nvim_create_namespace("my_diagnostics")
+
+local filter_diagnostics = function(diagnostics, level)
+    local filtered_diag = {}
+    for _, d in ipairs(diagnostics) do
+        if d.severity <= level then
+            table.insert(filtered_diag, 0, d)
+        end
+    end
+    return filtered_diag
+end
+
+--NOTE:  apply diagnostics filter to current buffer / all buffers
+M.set_diagnostics_level = function(level)
+    -- hide all diagnostics
+    vim.diagnostic.hide(nil, 0) 
+
+    -- vim.diagnostic.reset()
+    vim.diagnostic.handlers.virtual_text = {
+        show = function(_, bufnr, _, opts)
+            -- get all diagnostics for local buffer
+            local diagnostics = vim.diagnostic.get(bufnr)
+            filtered = filter_diagnostics(diagnostics, level)
+            -- filter diags based on severity
+            orig_diag_virt_handler.show(ns, bufnr, filtered, opts)
+        end,
+        hide = function(_, bufnr)
+            orig_diag_virt_handler.hide(ns, bufnr)
+        end
+    }
+
+    local diags = vim.diagnostic.get(0)
+    if #diags > 0 then
+        filtered = filter_diagnostics(diags, level)
+        vim.diagnostic.show(ns, 0, filtered)
+    end
+
+end
+
 return M

mysnippets/lua.lua

@@ -1,11 +1,6 @@
 ---@diagnostic disable: undefined-global
 
 return {
-
-        s("testluasnip", {
-            t"Hello lua snippet"
-        }),
-
         s({ trig = "lm", dscr = "local lua module"},
             fmt([[
 local M = {{}}