diff --git a/CHEATSHEET.md b/CHEATSHEET.md index 7602741..f020601 100644 --- a/CHEATSHEET.md +++ b/CHEATSHEET.md @@ -102,6 +102,7 @@ - `Ctrl`+`v` block mode - `vap` "visual-select-around-paragraph" - `vip` "visual-select-inside-paragraph" +- `ViB` Select lines inside block (useful for commenting) ### Code selection diff --git a/CHEATSHEET.pdf b/CHEATSHEET.pdf index c25f453..efe87a5 100644 Binary files a/CHEATSHEET.pdf and b/CHEATSHEET.pdf differ diff --git a/lazy-lock.json b/lazy-lock.json index f7edee3..6bde944 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,12 +8,14 @@ "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "gitsigns.nvim": { "branch": "main", "commit": "39e0d1cd44eafed5f30c372e377ab1cb1781ec9f" }, + "hardtime.nvim": { "branch": "main", "commit": "882e62292ac9fc0ab764253a16d9387ed995ad94" }, "kanagawa": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, "mason.nvim": { "branch": "main", "commit": "7f265cd6ae56cecdd0aa50c8c73fc593b0604801" }, "mini.nvim": { "branch": "main", "commit": "18889a4993a2c6de64eb07f91e7ad8666793441a" }, "newpaper.nvim": { "branch": "main", "commit": "d8f2a29001f795a59e4f28713427c200c15449ea" }, + "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-lint": { "branch": "master", "commit": "fdb04e9285edefbe25a02a31a35e8fbb10fe054d" }, "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" }, "nvim-treesitter-context": { "branch": "master", "commit": "5c48b8ba1b0b7b25feb6e34e7eb293ea893aedc4" }, diff --git a/lua/weeheavy/plugins/hardtime.lua b/lua/weeheavy/plugins/hardtime.lua new file mode 100644 index 0000000..a6546a1 --- /dev/null +++ b/lua/weeheavy/plugins/hardtime.lua @@ -0,0 +1,8 @@ +-- Highlight, list and search todo comments in your projects +-- https://github.com/folke/todo-comments.nvim +return { + "m4xshen/hardtime.nvim", + lazy = false, + dependencies = { "MunifTanjim/nui.nvim" }, + opts = {}, +} diff --git a/lua/weeheavy/plugins/mini.lua b/lua/weeheavy/plugins/mini.lua index 05ae225..fde12fc 100644 --- a/lua/weeheavy/plugins/mini.lua +++ b/lua/weeheavy/plugins/mini.lua @@ -4,18 +4,21 @@ return { version = false, config = function() require("mini.icons").setup() + require("mini.ai").setup({ n_lines = 500 }) + require("mini.trailspace").setup() + require("mini.cursorword").setup() require("mini.surround").setup({ mappings = { - add = "wq", -- Add surrounding in Normal and Visual modes - delete = "wd", -- Delete surrounding - -- find = "sf", -- Find surrounding (to the right) - -- find_left = "sF", -- Find surrounding (to the left) - highlight = "hs", -- Highlight surrounding - replace = "wc", -- Replace surrounding - -- update_n_lines = "sn", -- Update `n_lines` - - -- suffix_last = "l", -- Suffix to search with "prev" method - -- suffix_next = "n", -- Suffix to search with "next" method + -- add = "wq", -- Add surrounding in Normal and Visual modes + -- delete = "wd", -- Delete surrounding + -- -- find = "sf", -- Find surrounding (to the right) + -- -- find_left = "sF", -- Find surrounding (to the left) + -- highlight = "hs", -- Highlight surrounding + -- replace = "wc", -- Replace surrounding + -- -- update_n_lines = "sn", -- Update `n_lines` + -- + -- -- suffix_last = "l", -- Suffix to search with "prev" method + -- -- suffix_next = "n", -- Suffix to search with "next" method }, }) end, diff --git a/lua/weeheavy/plugins/telescope.lua b/lua/weeheavy/plugins/telescope.lua index 0c171c7..c7a93d5 100644 --- a/lua/weeheavy/plugins/telescope.lua +++ b/lua/weeheavy/plugins/telescope.lua @@ -29,6 +29,9 @@ return { }, }, pickers = { + colorscheme = { + enable_preview = true, + }, find_files = { hidden = true, wrap_results = false, -- this is not about the preview diff --git a/lua/weeheavy/remap.lua b/lua/weeheavy/remap.lua index 0243e51..af5adf8 100644 --- a/lua/weeheavy/remap.lua +++ b/lua/weeheavy/remap.lua @@ -48,9 +48,9 @@ end, { noremap = true, desc = "Git diff/stage" }) vim.keymap.set("n", "gb", ":Gitsigns toggle_current_line_blame", { noremap = true, desc = "Git blame" }) -- Remapping of existing Vim key binds -vim.keymap.set("n", "w", "W") -- skip punctuation when moving to start of next word -vim.keymap.set("n", "e", "E") -- skip punctuation when moving to end of next word -vim.keymap.set("n", "b", "B") -- skip punctuation when moving to end of previous word +-- vim.keymap.set("n", "w", "W") -- skip punctuation when moving to start of next word +-- vim.keymap.set("n", "e", "E") -- skip punctuation when moving to end of next word +-- vim.keymap.set("n", "b", "B") -- skip punctuation when moving to end of previous word --vim.keymap.set("n", "i", "gg=G``", { noremap = true, desc = "Re-indent whole file" }) -- '``' makes it stay at current line+column position