diff options
| -rw-r--r-- | lua/config/git.lua | 3 | ||||
| -rw-r--r-- | lua/config/init.lua | 1 | ||||
| -rw-r--r-- | lua/config/keys.lua | 5 | ||||
| -rw-r--r-- | lua/config/todo.lua | 15 | ||||
| -rw-r--r-- | nvim-pack-lock.json | 4 |
5 files changed, 22 insertions, 6 deletions
diff --git a/lua/config/git.lua b/lua/config/git.lua index 5e90cac..366ca77 100644 --- a/lua/config/git.lua +++ b/lua/config/git.lua @@ -5,7 +5,8 @@ vim.pack.add({ vim.keymap.set("n", "<leader>gp", function() vim.cmd.Git({ "push" }) end) -vim.keymap.set("n", "<leader>gp", function() + +vim.keymap.set("n", "<leader>gP", function() vim.cmd.Git({ "pull --rebase" }) end) diff --git a/lua/config/init.lua b/lua/config/init.lua index ee68d88..5cd83e1 100644 --- a/lua/config/init.lua +++ b/lua/config/init.lua @@ -9,3 +9,4 @@ require("config.conform") require("config.neotest") require("config.dap") require("config.java") +require("config.todo") diff --git a/lua/config/keys.lua b/lua/config/keys.lua index 1bb48e8..19045c1 100644 --- a/lua/config/keys.lua +++ b/lua/config/keys.lua @@ -11,8 +11,3 @@ vim.keymap.set("v", "<S-Tab>", "<gv") vim.keymap.set("n", "<Tab>", "v><C-\\><C-N>") vim.keymap.set("n", "<S-Tab>", "v<<C-\\><C-N>") vim.keymap.set("i", "<S-Tab>", "<C-\\><C-N>v<<C-\\><C-N>^i") - --- fugative -vim.keymap.set("n", "<leader>gp", "<CMD>Git push<CR>") -vim.keymap.set("n", "<leader>gr", "<CMD>Git pull --rebase<CR>") -vim.keymap.set("n", "<leader>ga", "<CMD>Git add .<CR> <BAR> <CMD>Git commit<CR>") diff --git a/lua/config/todo.lua b/lua/config/todo.lua new file mode 100644 index 0000000..724f2c5 --- /dev/null +++ b/lua/config/todo.lua @@ -0,0 +1,15 @@ +vim.pack.add({ + "https://github.com/folke/todo-comments.nvim", +}) + +require("todo-comments").setup() + +vim.keymap.set("n", "[t", function() + require("todo-comments").jump_prev() +end) + +vim.keymap.set("n", "]t", function() + require("todo-comments").jump_next() +end) + +vim.keymap.set("n", "<leader>ft", "<CMD>TodoTelescope<CR>") diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json index 3755343..eca6312 100644 --- a/nvim-pack-lock.json +++ b/nvim-pack-lock.json @@ -109,6 +109,10 @@ "rev": "0d8b6eaa0b5ae6bb3d9785f7a3ba4a4c6c1b1af2", "src": "https://github.com/nvim-telescope/telescope.nvim" }, + "todo-comments.nvim": { + "rev": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668", + "src": "https://github.com/folke/todo-comments.nvim" + }, "vim-eunuch": { "rev": "e86bb79", "src": "https://github.com/tpope/vim-eunuch" |
