diff --git a/lazy-lock.json b/lazy-lock.json index e4f9128..3966c3a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,7 +8,6 @@ "codecompanion.nvim": { "branch": "main", "commit": "f85078a8e0a44159c8653ef507511a38fb9b2a6d" }, "conform.nvim": { "branch": "master", "commit": "dca1a190aa85f9065979ef35802fb77131911106" }, "copilot.vim": { "branch": "release", "commit": "a12fd5672110c8aa7e3c8419e28c96943ca179be" }, - "dashboard-nvim": { "branch": "master", "commit": "f787e3462c2ee2b6117b17c1aa4ddf66cb6f57fe" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, @@ -16,6 +15,7 @@ "grug-far.nvim": { "branch": "main", "commit": "21790e59dd0109a92a70cb874dd002af186314f5" }, "gruvbox.nvim": { "branch": "main", "commit": "154eb5ff5b96d0641307113fa385eaf0d36d9796" }, "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, + "komau.vim": { "branch": "master", "commit": "f7c7a00c0cbb67ed269b565a4ada47d96dce14f3" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" }, "mason.nvim": { "branch": "main", "commit": "e54f5bf5f12c560da31c17eee5b3e1bd369f3ff9" }, diff --git a/lua/config/remap.lua b/lua/config/remap.lua index 4b82288..6bf6a95 100644 --- a/lua/config/remap.lua +++ b/lua/config/remap.lua @@ -301,16 +301,16 @@ map("n", "", "j", { desc = "Go to Lower Window", remap = true }) map("n", "", "k", { desc = "Go to Upper Window", remap = true }) map("n", "", "l", { desc = "Go to Right Window", remap = true }) -map("n", "", "resize +2", { desc = "Increase Window Height" }) -map("n", "", "resize -2", { desc = "Decrease Window Height" }) -map("n", "", "vertical resize -2", { desc = "Decrease Window Width" }) -map("n", "", "vertical resize +2", { desc = "Increase Window Width" }) +map("n", "", "resize +8", { desc = "Increase Window Height" }) +map("n", "", "resize -8", { desc = "Decrease Window Height" }) +map("n", "", "vertical resize -8", { desc = "Decrease Window Width" }) +map("n", "", "vertical resize +8", { desc = "Increase Window Width" }) -- Resize window using arrow keys -map("n", "", "resize +2", { desc = "Increase Window Height" }) -map("n", "", "resize -2", { desc = "Decrease Window Height" }) -map("n", "", "vertical resize -2", { desc = "Decrease Window Width" }) -map("n", "", "vertical resize +2", { desc = "Increase Window Width" }) +map("n", "", "resize +8", { desc = "Increase Window Height" }) +map("n", "", "resize -8", { desc = "Decrease Window Height" }) +map("n", "", "vertical resize -8", { desc = "Decrease Window Width" }) +map("n", "", "vertical resize +8", { desc = "Increase Window Width" }) -- quit map("n", "qq", "qa", { desc = "Quit All" }) diff --git a/lua/plugins/help.lua b/lua/plugins/help.lua index fbf422e..ec8be5a 100644 --- a/lua/plugins/help.lua +++ b/lua/plugins/help.lua @@ -2,67 +2,50 @@ -- │ Usage help │ -- ╰────────────╯ return { - { - "nvim-mini/mini.clue", - opts = { - triggers = { - -- Leader triggers - { mode = 'n', keys = '' }, - { mode = 'x', keys = '' }, + { + "nvim-mini/mini.clue", + opts = { + 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" }, + }, - 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(), - }, - } - }, - -- Breaks LSP attach - -- { - -- "folke/which-key.nvim", - -- event = "VeryLazy", - -- opts = function() - -- return require("plugins.opts.whichKey") - -- end, - -- keys = { - -- { - -- "?", - -- function() - -- require("which-key").show({ global = false }) - -- end, - -- desc = "Buffer Local Keymaps (which-key)", - -- }, - -- }, - -- } + 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(), + }, + }, + }, } diff --git a/lua/plugins/ia.lua b/lua/plugins/ia.lua deleted file mode 100644 index e9b2415..0000000 --- a/lua/plugins/ia.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - { - "github/copilot.vim", - enabled = true, - }, - { - "olimorris/codecompanion.nvim", - enabled = true, - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - }, - opts = { - opts = { - log_level = "DEBUG", -- or "TRACE" - }, - }, - }, -} diff --git a/lua/plugins/navigation.lua b/lua/plugins/navigation.lua deleted file mode 100644 index 97aeadd..0000000 --- a/lua/plugins/navigation.lua +++ /dev/null @@ -1,2 +0,0 @@ -return { -} diff --git a/lua/plugins/preview.lua b/lua/plugins/preview.lua index 5962eca..854a1d3 100644 --- a/lua/plugins/preview.lua +++ b/lua/plugins/preview.lua @@ -1,14 +1,4 @@ return { - -- { - -- "toppair/peek.nvim", - -- event = { "VeryLazy" }, - -- build = "deno task --quiet build:fast", - -- config = function() - -- require("peek").setup() - -- vim.api.nvim_create_user_command("PeekOpen", require("peek").open, {}) - -- vim.api.nvim_create_user_command("PeekClose", require("peek").close, {}) - -- end, - -- }, { "norcalli/nvim-colorizer.lua", init = function(_, opts) diff --git a/lua/plugins/search.lua b/lua/plugins/search.lua index a25c9d3..87dd00b 100644 --- a/lua/plugins/search.lua +++ b/lua/plugins/search.lua @@ -29,25 +29,56 @@ return { end end, }, - { 'mbbill/undotree' }, + { "mbbill/undotree" }, { "folke/flash.nvim", event = "VeryLazy", ---@type Flash.Config opts = {}, keys = { - { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, - { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, - { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, - { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, - { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, + { + "s", + mode = { "n", "x", "o" }, + function() + require("flash").jump() + end, + desc = "Flash", + }, + { + "S", + mode = { "n", "x", "o" }, + function() + require("flash").treesitter() + end, + desc = "Flash Treesitter", + }, + { + "r", + mode = "o", + function() + require("flash").remote() + end, + desc = "Remote Flash", + }, + { + "R", + mode = { "o", "x" }, + function() + require("flash").treesitter_search() + end, + desc = "Treesitter Search", + }, + { + "", + mode = { "c" }, + function() + require("flash").toggle() + end, + desc = "Toggle Flash Search", + }, }, }, { - 'MagicDuck/grug-far.nvim', - -- config = function() - -- require('grug-far').setup({ - -- }); - -- end + "MagicDuck/grug-far.nvim", }, }