diff --git a/modules/cli/nvim/lua/plugins/colorscheme.lua b/modules/cli/nvim/lua/plugins/colorscheme.lua index 8968ae1..94d8cbf 100644 --- a/modules/cli/nvim/lua/plugins/colorscheme.lua +++ b/modules/cli/nvim/lua/plugins/colorscheme.lua @@ -48,7 +48,7 @@ return { init = function() -- keep vim's default behavior of checking the terminal's colors -- Only use lumen to detect runtime changes (that's why VeryLazy is used). - vim.g.lumen_startup_overwrite = 0 + -- vim.g.lumen_startup_overwrite = 0 end }, } diff --git a/modules/cli/nvim/lua/plugins/ui.lua b/modules/cli/nvim/lua/plugins/ui.lua index 511401d..71c40eb 100644 --- a/modules/cli/nvim/lua/plugins/ui.lua +++ b/modules/cli/nvim/lua/plugins/ui.lua @@ -202,7 +202,7 @@ return { { "folke/trouble.nvim", keys = { - { "lw", "Trouble diagnostics", desc = "Diagnostics" }, + { "lw", "Trouble cascade", desc = "Diagnostics" }, { "lt", "TroubleToggle", desc = "Toogle trouble window" }, }, opts = { @@ -210,7 +210,34 @@ return { auto_preview = false, cycle_results = false, use_diagnostic_signs = true, - severity = vim.diagnostic.severity.ERORR, + follow = false, + icons = { + indent = { + middle = " ", + last = " ", + top = " ", + ws = "│ ", + }, + }, + modes = { + diagnostics = { + groups = { + { "filename", format = "{file_icon} {basename:Title} {count}" }, + }, + }, + cascade = { + mode = "diagnostics", -- inherit from diagnostics mode + filter = function(items) + local severity = vim.diagnostic.severity.HINT + for _, item in ipairs(items) do + severity = math.min(severity, item.severity) + end + return vim.tbl_filter(function(item) + return item.severity == severity + end, items) + end, + }, + } }, }, diff --git a/modules/cli/nvim/lua/settings.lua b/modules/cli/nvim/lua/settings.lua index 2ea2211..5508ada 100644 --- a/modules/cli/nvim/lua/settings.lua +++ b/modules/cli/nvim/lua/settings.lua @@ -93,7 +93,7 @@ keymap({ "n", "x" }, "P", '"+P', "Past line from system clipboard") keymap("n", "", "cnextzz", "Next quickfix") keymap("n", "", "cprevzz", "Prev quickfix") -keymap("n", "c", "cclose", "Close quickfix") +keymap("n", "q", "cclose", "Close quickfix") keymap("t", "", "", "+windows") keymap("t", "", "", "Normal mode") @@ -115,3 +115,4 @@ vim.api.nvim_create_autocmd('TextYankPost', { }) vim.g.zig_fmt_autosave = 0 +vim.g.omni_sql_no_default_maps = 1