From 8eda59f57f1d065019315822b8f818031474a697 Mon Sep 17 00:00:00 2001 From: EsVagy42 Date: Sat, 15 Mar 2025 04:33:43 +0000 Subject: [PATCH] Added mini.map --- config/default.nix | 58 ++++++++------- config/mini.nix | 136 +++++++++++++++++----------------- config/treesitter-context.nix | 5 +- 3 files changed, 105 insertions(+), 94 deletions(-) diff --git a/config/default.nix b/config/default.nix index 3af840f..97bc956 100644 --- a/config/default.nix +++ b/config/default.nix @@ -21,32 +21,38 @@ }; globals = { mapleader = " "; }; extraConfigLua = '' - vim.keymap.set("n", "pb", ":Pick buffers", {desc = "Pick buffers"}) - vim.keymap.set("n", "pd", ":Pick diagnostic", {desc = "Pick diagnostic"}) - vim.keymap.set("n", "pe", ":Pick explorer", {desc = "Pick explorer"}) - vim.keymap.set("n", "pf", ":Pick files", {desc = "Pick files"}) - vim.keymap.set("n", "pg", ":Pick grep_live", {desc = "Pick grep live"}) - vim.keymap.set("n", "ph", ":Pick git_hunks", {desc = "Pick git hunks"}) - vim.keymap.set("n", "pl", ":Pick lsp", {desc = "Pick lsp"}) - vim.keymap.set("n", "pm", ":Pick marks", {desc = "Pick marks"}) - vim.keymap.set({"n", "v"}, "de", function() require("dapui").eval() end, {desc = "Debug eval"}) - vim.keymap.set("n", "", function() require("dap").continue() end, {desc = "Debug continue"}) - vim.keymap.set("n", "", function() require("dap").step_over() end, {desc = "Debug step over"}) - vim.keymap.set("n", "", function() require("dap").step_into() end, {desc = "Debug step into"}) - vim.keymap.set("n", "", function() require("dap").step_out() end, {desc = "Debug step out"}) - vim.keymap.set("n", "db", function() require("dap").toggle_breakpoint() end, {desc = "Debug toggle breakpoint"}) - vim.keymap.set("n", "dB", function() require("dap").set_breakpoint() end, {desc = "Debug set breakpoint"}) - vim.keymap.set("n", "dl", function() require("dap").set_breakpoint(nil, nil, vim.fn.input('Log point message:')) end, {desc = "Debug set logpoint"}) - vim.keymap.set("n", "dr", function() require("dap").repl.open() end, {desc = "Debug repl open"}) - vim.keymap.set("n", "dp", function() require("dap").run_last() end, {desc = "Debug run last"}) - vim.keymap.set("n", "dc", function () dapui.close() require("dap").terminate() end, {desc = "Close Dap-UI"}) - vim.keymap.set("n", "a", "lua vim.lsp.buf.code_action()", {desc = "Apply code action"}) - vim.keymap.set("n", "u", "UndotreeToggle", {desc = "Toggle undo tree"}) + vim.keymap.set("n", "pb", ":Pick buffers", {desc = "Pick buffers"}) + vim.keymap.set("n", "pd", ":Pick diagnostic", {desc = "Pick diagnostic"}) + vim.keymap.set("n", "pe", ":Pick explorer", {desc = "Pick explorer"}) + vim.keymap.set("n", "pf", ":Pick files", {desc = "Pick files"}) + vim.keymap.set("n", "pg", ":Pick grep_live", {desc = "Pick grep live"}) + vim.keymap.set("n", "ph", ":Pick git_hunks", {desc = "Pick git hunks"}) + vim.keymap.set("n", "pl", ":Pick lsp", {desc = "Pick lsp"}) + vim.keymap.set("n", "pm", ":Pick marks", {desc = "Pick marks"}) + vim.keymap.set({"n", "v"}, "de", function() require("dapui").eval() end, {desc = "Debug eval"}) + vim.keymap.set("n", "", function() require("dap").continue() end, {desc = "Debug continue"}) + vim.keymap.set("n", "", function() require("dap").step_over() end, {desc = "Debug step over"}) + vim.keymap.set("n", "", function() require("dap").step_into() end, {desc = "Debug step into"}) + vim.keymap.set("n", "", function() require("dap").step_out() end, {desc = "Debug step out"}) + vim.keymap.set("n", "db", function() require("dap").toggle_breakpoint() end, {desc = "Debug toggle breakpoint"}) + vim.keymap.set("n", "dB", function() require("dap").set_breakpoint() end, {desc = "Debug set breakpoint"}) + vim.keymap.set("n", "dl", function() require("dap").set_breakpoint(nil, nil, vim.fn.input('Log point message:')) end, {desc = "Debug set logpoint"}) + vim.keymap.set("n", "dr", function() require("dap").repl.open() end, {desc = "Debug repl open"}) + vim.keymap.set("n", "dp", function() require("dap").run_last() end, {desc = "Debug run last"}) + vim.keymap.set("n", "dc", function () dapui.close() require("dap").terminate() end, {desc = "Close Dap-UI"}) + vim.keymap.set("n", "a", "lua vim.lsp.buf.code_action()", {desc = "Apply code action"}) + vim.keymap.set("n", "u", "UndotreeToggle", {desc = "Toggle undo tree"}) + vim.keymap.set('n', 'mc', MiniMap.close, {desc = "Map close"}) + vim.keymap.set('n', 'mf', MiniMap.toggle_focus, {desc = "Map toggle focus"}) + vim.keymap.set('n', 'mo', MiniMap.open, {desc = "Map open"}) + vim.keymap.set('n', 'mr', MiniMap.refresh, {desc = "Map refresh"}) + vim.keymap.set('n', 'ms', MiniMap.toggle_side, {desc = "Map toggle side"}) + vim.keymap.set('n', 'mt', MiniMap.toggle, {desc = "Map toggle"}) - local imap_expr = function(lhs, rhs) - vim.keymap.set('i', lhs, rhs, { expr = true }) - end - imap_expr('', [[pumvisible() ? "\" : "\"]]) - imap_expr('', [[pumvisible() ? "\" : "\"]]) + local imap_expr = function(lhs, rhs) + vim.keymap.set('i', lhs, rhs, { expr = true }) + end + imap_expr('', [[pumvisible() ? "\" : "\"]]) + imap_expr('', [[pumvisible() ? "\" : "\"]]) ''; } diff --git a/config/mini.nix b/config/mini.nix index 362699a..8da4345 100644 --- a/config/mini.nix +++ b/config/mini.nix @@ -55,89 +55,91 @@ starter = { }; statusline = { }; tabline = { }; + map = { }; }; luaConfig.post = '' - local miniclue = require('mini.clue') - miniclue.setup({ - triggers = { - -- Leader triggers - { mode = 'n', keys = '' }, - { mode = 'x', keys = '' }, + local miniclue = require('mini.clue') + miniclue.setup({ + triggers = { + -- Leader triggers + { mode = 'n', keys = '' }, + { mode = 'x', keys = '' }, - -- Built-in completion - { mode = 'i', keys = '' }, + -- Built-in completion + { mode = 'i', keys = '' }, - -- `g` key - { mode = 'n', keys = 'g' }, - { mode = 'x', keys = 'g' }, + -- `g` key + { mode = 'n', keys = 'g' }, + { mode = 'x', keys = 'g' }, - -- Marks - { mode = 'n', keys = "'" }, - { mode = 'n', keys = '`' }, - { mode = 'x', keys = "'" }, - { mode = 'x', keys = '`' }, + -- Marks + { mode = 'n', keys = "'" }, + { mode = 'n', keys = '`' }, + { mode = 'x', keys = "'" }, + { mode = 'x', keys = '`' }, - -- Registers - { mode = 'n', keys = '"' }, - { mode = 'x', keys = '"' }, - { mode = 'i', keys = '' }, - { mode = 'c', keys = '' }, + -- Registers + { mode = 'n', keys = '"' }, + { mode = 'x', keys = '"' }, + { mode = 'i', keys = '' }, + { mode = 'c', keys = '' }, - -- Window commands - { mode = 'n', keys = '' }, + -- Window commands + { mode = 'n', keys = '' }, - -- `z` key - { mode = 'n', keys = 'z' }, - { mode = 'x', keys = 'z' }, + -- `z` key + { mode = 'n', keys = 'z' }, + { mode = 'x', keys = 'z' }, - { mode = 'n', keys = 's'}, - { mode = 'x', keys = 's'}, + { mode = 'n', keys = 's'}, + { mode = 'x', keys = 's'}, - { mode = 'n', keys = ']'}, - { mode = 'x', keys = ']'}, - { mode = 'n', keys = '['}, - { mode = 'x', keys = '['}, + { mode = 'n', keys = ']'}, + { mode = 'x', keys = ']'}, + { mode = 'n', keys = '['}, + { mode = 'x', keys = '['}, - { mode = 'n', keys = 'i'}, - { mode = 'x', keys = 'i'}, - { mode = 'n', keys = 'a'}, - { mode = 'x', keys = 'a'}, - }, + { mode = 'n', keys = 'i'}, + { mode = 'x', keys = 'i'}, + { mode = 'n', keys = 'a'}, + { mode = 'x', keys = 'a'}, + }, - clues = { - -- Enhance this by adding descriptions for mapping groups - miniclue.gen_clues.builtin_completion(), - miniclue.gen_clues.g(), - miniclue.gen_clues.marks(), - miniclue.gen_clues.registers(), - miniclue.gen_clues.windows(), - miniclue.gen_clues.z(), - {mode = 'n', keys = 'p', desc = 'Pick'}, - {mode = 'n', keys = 'd', desc = 'Debug'}, - }, + clues = { + -- Enhance this by adding descriptions for mapping groups + miniclue.gen_clues.builtin_completion(), + miniclue.gen_clues.g(), + miniclue.gen_clues.marks(), + miniclue.gen_clues.registers(), + miniclue.gen_clues.windows(), + miniclue.gen_clues.z(), + {mode = 'n', keys = 'p', desc = 'Pick'}, + {mode = 'n', keys = 'd', desc = 'Debug'}, + {mode = 'n', keys = 'm', desc = 'Map'}, + }, - window = { - config = {}, - delay = 500, - scroll_down = ''; - scroll_up = ''; - }, - }) + window = { + config = {}, + delay = 500, + scroll_down = ''; + scroll_up = ''; + }, + }) - local hipatterns = require('mini.hipatterns') - hipatterns.setup({ - highlighters = { - -- Highlight standalone 'FIXME', 'HACK', 'TODO', 'NOTE' - fixme = { pattern = '%f[%w]()FIXME()%f[%W]', group = 'MiniHipatternsFixme' }, - hack = { pattern = '%f[%w]()HACK()%f[%W]', group = 'MiniHipatternsHack' }, - todo = { pattern = '%f[%w]()TODO()%f[%W]', group = 'MiniHipatternsTodo' }, - note = { pattern = '%f[%w]()NOTE()%f[%W]', group = 'MiniHipatternsNote' }, + local hipatterns = require('mini.hipatterns') + hipatterns.setup({ + highlighters = { + -- Highlight standalone 'FIXME', 'HACK', 'TODO', 'NOTE' + fixme = { pattern = '%f[%w]()FIXME()%f[%W]', group = 'MiniHipatternsFixme' }, + hack = { pattern = '%f[%w]()HACK()%f[%W]', group = 'MiniHipatternsHack' }, + todo = { pattern = '%f[%w]()TODO()%f[%W]', group = 'MiniHipatternsTodo' }, + note = { pattern = '%f[%w]()NOTE()%f[%W]', group = 'MiniHipatternsNote' }, - -- Highlight hex color strings (`#rrggbb`) using that color - hex_color = hipatterns.gen_highlighter.hex_color(), - }, - }) + -- Highlight hex color strings (`#rrggbb`) using that color + hex_color = hipatterns.gen_highlighter.hex_color(), + }, + }) ''; }; }; diff --git a/config/treesitter-context.nix b/config/treesitter-context.nix index 9371139..3e05c00 100644 --- a/config/treesitter-context.nix +++ b/config/treesitter-context.nix @@ -1 +1,4 @@ -{ plugins = { treesitter-context = { enable = true; }; }; } +{ plugins = { treesitter-context = { + enable = true; + settings.zindex = 5; +}; }; }