From 8784b4890c71cb478befb91ec413002510c8d85e Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Sun, 1 Oct 2023 16:26:22 +0200 Subject: [PATCH] update ibl --- lua/plex/plugins/editor.lua | 106 ++++++++++++++++++++++++++---------- lua/plex/plugins/ui.lua | 71 +++++++++++++++--------- 2 files changed, 120 insertions(+), 57 deletions(-) diff --git a/lua/plex/plugins/editor.lua b/lua/plex/plugins/editor.lua index f0fdf65..a0d392a 100644 --- a/lua/plex/plugins/editor.lua +++ b/lua/plex/plugins/editor.lua @@ -6,9 +6,9 @@ local is_windows = vim.loop.os_uname().sysname == 'Windows_NT' return { ----------------------------------------------------------------------------- - { 'nmac427/guess-indent.nvim', lazy = false, priority = 50, config = true }, - { 'tweekmonster/helpful.vim', cmd = 'HelpfulVersion' }, - { 'lambdalisue/suda.vim', lazy = false, event = 'BufRead' }, + { 'nmac427/guess-indent.nvim', lazy = false, priority = 50, config = true }, + { 'tweekmonster/helpful.vim', cmd = 'HelpfulVersion' }, + { 'lambdalisue/suda.vim', lazy = false, event = 'BufRead' }, ----------------------------------------------------------------------------- { @@ -17,9 +17,9 @@ return { cond = not is_windows, -- stylua: ignore keys = { - { '', 'TmuxNavigateLeft', mode = { 'n', 't' }, silent = true, desc = 'Jump to left pane' }, - { '', 'TmuxNavigateDown', mode = { 'n', 't' }, silent = true, desc = 'Jump to lower pane' }, - { '', 'TmuxNavigateUp', mode = { 'n', 't' }, silent = true, desc = 'Jump to upper pane' }, + { '', 'TmuxNavigateLeft', mode = { 'n', 't' }, silent = true, desc = 'Jump to left pane' }, + { '', 'TmuxNavigateDown', mode = { 'n', 't' }, silent = true, desc = 'Jump to lower pane' }, + { '', 'TmuxNavigateUp', mode = { 'n', 't' }, silent = true, desc = 'Jump to upper pane' }, { '', 'TmuxNavigateRight', mode = { 'n', 't' }, silent = true, desc = 'Jump to right pane' }, }, init = function() @@ -189,16 +189,16 @@ return { 'ggandor/leap.nvim', -- stylua: ignore keys = { - { 'gl', '(leap-forward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap forward to' }, - { 'gL', '(leap-backward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap backward to' }, + { 'gl', '(leap-forward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap forward to' }, + { 'gL', '(leap-backward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap backward to' }, { 'wgl', '(leap-from-window)', mode = { 'n', 'x', 'o' }, desc = 'Leap to windows' }, }, - config = function () + config = function() local leap = require('leap') leap.opts.case_sensitive = false leap.opts.safe_labels = { 'f', 'n', 'u', 't', 'g', 'ö', 'w', 'b', 'm' } leap.opts.labels = { 'a', 's', 'f', 'n', 'j', 'k', 'r', 'e', 'r', 'm', - 'ö', 'b', 'v', 'u', 'z', 'w', '2', '3', '4', '5', '6', + 'ö', 'b', 'v', 'u', 'z', 'w', '2', '3', '4', '5', '6', '7', '8', '9' } end, }, @@ -286,15 +286,32 @@ return { dependencies = 'nvim-telescope/telescope.nvim', -- stylua: ignore keys = { - { ']t', function() require('todo-comments').jump_next() end, desc = 'Next todo comment' }, - { '[t', function() require('todo-comments').jump_prev() end, desc = 'Previous todo comment' }, - { 'dt', 'TodoTelescope', desc = 'todo' }, - { 'xt', 'TodoTrouble', desc = 'Todo (Trouble)' }, - { 'xT', 'TodoTrouble keywords=TODO,FIX,FIXME', desc = 'Todo/Fix/Fixme (Trouble)' }, - { 'St', 'TodoTelescope', desc = 'Todo' }, - { 'ST', 'TodoTelescope keywords=TODO,FIX,FIXME', desc = 'Todo/Fix/Fixme' }, + { ']t', function() require('todo-comments').jump_next() end, desc = 'Next todo comment' }, + { '[t', function() require('todo-comments').jump_prev() end, desc = 'Previous todo comment' }, + { 'dt', 'TodoTelescope', desc = 'todo' }, + { 'xt', 'TodoTrouble', desc = 'Todo (Trouble)' }, + { 'xT', 'TodoTrouble keywords=TODO,FIX,FIXME', desc = 'Todo/Fix/Fixme (Trouble)' }, + { 'St', 'TodoTelescope', desc = 'Todo' }, + { 'ST', 'TodoTelescope keywords=TODO,FIX,FIXME', desc = 'Todo/Fix/Fixme' }, + }, + opts = { + signs = true, + keywords = { + FIX = { + icon = " ", -- icon used for the sign, and in search results + color = "error", -- can be a hex color, or a named color (see below) + alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, -- a set of other keywords that all map to this FIX keywords + -- signs = false, -- configure signs for some keywords individually + }, + TODO = { icon = " ", color = "info" }, + HACK = { icon = " ", color = "warning" }, + SECURITY = { icon = "󰒃 ", color = "warning" }, + WARN = { icon = " ", color = "warning", alt = { "WARNING", "XXX" } }, + PERF = { icon = " ", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" } }, + NOTE = { icon = " ", color = "hint", alt = { "INFO" } }, + TEST = { icon = "⏲ ", color = "test", alt = { "TESTING", "PASSED", "FAILED" } }, + }, }, - opts = { signs = false }, }, ----------------------------------------------------------------------------- @@ -304,12 +321,24 @@ return { opts = { use_diagnostic_signs = true }, -- stylua: ignore keys = { - { 'e', 'TroubleToggle document_diagnostics', noremap = true, desc = 'Document Diagnostics' }, - { 'r', 'TroubleToggle workspace_diagnostics', noremap = true, desc = 'Workspace Diagnostics' }, - { 'xx', 'TroubleToggle document_diagnostics', desc = 'Document Diagnostics (Trouble)' }, + { + 'e', + 'TroubleToggle document_diagnostics', + noremap = true, + desc = + 'Document Diagnostics' + }, + { + 'r', + 'TroubleToggle workspace_diagnostics', + noremap = true, + desc = + 'Workspace Diagnostics' + }, + { 'xx', 'TroubleToggle document_diagnostics', desc = 'Document Diagnostics (Trouble)' }, { 'xX', 'TroubleToggle workspace_diagnostics', desc = 'Workspace Diagnostics (Trouble)' }, - { 'xQ', 'TroubleToggle quickfix', desc = 'Quickfix List (Trouble)' }, - { 'xL', 'TroubleToggle loclist', desc = 'Location List (Trouble)' }, + { 'xQ', 'TroubleToggle quickfix', desc = 'Quickfix List (Trouble)' }, + { 'xL', 'TroubleToggle loclist', desc = 'Location List (Trouble)' }, { '[q', function() @@ -414,7 +443,7 @@ return { end local mappings = { - { '-', pick_window, desc = 'Pick window' }, + { '-', pick_window, desc = 'Pick window' }, { 'wp', pick_window, desc = 'Pick window' }, { 'ww', swap_window, desc = 'Swap picked window' }, } @@ -451,12 +480,23 @@ return { cmd = { 'ZkNew', 'ZkNotes', 'ZkTags', 'ZkMatch' }, -- stylua: ignore keys = { - { 'zn', "ZkNew { title = vim.fn.input('Title: ') }", desc = 'Zk New' }, - { 'zo', "ZkNotes { sort = { 'modified' } }", desc = 'Zk Notes' }, - { 'zt', 'ZkTags', desc = 'Zk Tags' }, + { 'zn', "ZkNew { title = vim.fn.input('Title: ') }", desc = 'Zk New' }, + { 'zo', "ZkNotes { sort = { 'modified' } }", desc = 'Zk Notes' }, + { 'zt', 'ZkTags', desc = 'Zk Tags' }, { 'zf', "ZkNotes { sort = { 'modified' }, match = vim.fn.input('Search: ') }", desc = 'Zk Search' }, - { 'zf', ":'<,'>ZkMatch", mode = 'x', desc = 'Zk Match' }, - { 'zb', 'ZkBacklinks', desc = 'Zk Backlinks' }, + { + 'zf', + ":'<,'>ZkMatch", + mode = 'x', + desc = + 'Zk Match' + }, + { + 'zb', + 'ZkBacklinks', + desc = + 'Zk Backlinks' + }, { 'zl', 'ZkLinks', desc = 'Zk Links' }, }, opts = { picker = 'telescope' }, @@ -468,7 +508,13 @@ return { -- stylua: ignore keys = { { 'Sp', function() require('spectre').toggle() end, desc = 'Spectre', }, - { 'Sp', function() require('spectre').open_visual({ select_word = true }) end, mode = 'x', desc = 'Spectre Word' }, + { + 'Sp', + function() require('spectre').open_visual({ select_word = true }) end, + mode = 'x', + desc = + 'Spectre Word' + }, }, opts = { mapping = { diff --git a/lua/plex/plugins/ui.lua b/lua/plex/plugins/ui.lua index 63917cb..b1b5281 100644 --- a/lua/plex/plugins/ui.lua +++ b/lua/plex/plugins/ui.lua @@ -5,9 +5,11 @@ return { ----------------------------------------------------------------------------- { 'nvim-tree/nvim-web-devicons', lazy = false }, - { 'MunifTanjim/nui.nvim', lazy = false }, + { 'MunifTanjim/nui.nvim', lazy = false }, { - 'akinsho/bufferline.nvim', lazy = false, version = "*", + 'akinsho/bufferline.nvim', + lazy = false, + version = "*", dependencies = 'nvim-tree/nvim-web-devicons' }, @@ -22,12 +24,24 @@ return { }, -- stylua: ignore keys = { - { '', function() require('noice').redirect(tostring(vim.fn.getcmdline())) end, mode = 'c', desc = 'Redirect Cmdline' }, - { 'Snl', function() require('noice').cmd('last') end, desc = 'Noice Last Message' }, - { 'Snh', function() require('noice').cmd('history') end, desc = 'Noice History' }, - { 'Sna', function() require('noice').cmd('all') end, desc = 'Noice All' }, - { '', function() if not require('noice.lsp').scroll(4) then return '' end end, silent = true, expr = true, desc = 'Scroll forward', mode = {'i', 'n', 's'} }, - { '', function() if not require('noice.lsp').scroll(-4) then return '' end end, silent = true, expr = true, desc = 'Scroll backward', mode = {'i', 'n', 's'}}, + { '', function() require('noice').redirect(tostring(vim.fn.getcmdline())) end, mode = 'c', + desc = + 'Redirect Cmdline' }, + { 'Snl', function() require('noice').cmd('last') end, desc = + 'Noice Last Message' }, + { 'Snh', function() require('noice').cmd('history') end, desc = + 'Noice History' }, + { 'Sna', function() require('noice').cmd('all') end, desc = 'Noice All' }, + { '', function() if not require('noice.lsp').scroll(4) then return '' end end, silent = true, + expr = true, + desc = + 'Scroll forward', mode = { + 'i', 'n', 's' } }, + { '', function() if not require('noice.lsp').scroll(-4) then return '' end end, silent = true, + expr = true, + desc = + 'Scroll backward', mode = { + 'i', 'n', 's' } }, }, ---@type NoiceConfig opts = { @@ -141,7 +155,7 @@ return { else vim.b.navic_winbar = true vim.opt_local.winbar = '%#NavicIconsFile# %t %* ' - .. "%{%v:lua.require'nvim-navic'.get_location()%}" + .. "%{%v:lua.require'nvim-navic'.get_location()%}" end end, desc = 'Toggle structure panel', @@ -224,30 +238,33 @@ return { keys = { { 'ue', 'IndentBlanklineToggle' }, }, + main = "ibl", opts = { - show_trailing_blankline_indent = false, + remove_blankline_trail = false, disable_with_nolist = true, show_foldtext = false, char_priority = 100, show_current_context = true, show_current_context_start = false, - filetype_exclude = { - 'lspinfo', - 'checkhealth', - 'git', - 'gitcommit', - 'help', - 'man', - 'lazy', - 'alpha', - 'dashboard', - 'terminal', - 'TelescopePrompt', - 'TelescopeResults', - 'neo-tree', - 'Outline', - 'mason', - 'Trouble', + exclude = { + filetypes = { + 'lspinfo', + 'checkhealth', + 'git', + 'gitcommit', + 'help', + 'man', + 'lazy', + 'alpha', + 'dashboard', + 'terminal', + 'TelescopePrompt', + 'TelescopeResults', + 'neo-tree', + 'Outline', + 'mason', + 'Trouble', + } }, }, },