From 48d934c3615f35e3de94a696f6a56dc019b67c48 Mon Sep 17 00:00:00 2001 From: 409 Date: Sat, 27 Jan 2024 21:08:14 +0100 Subject: [PATCH] added devicons, neogen, todo-comments and trouble --- after/plugin/harpoon.lua | 8 ++++---- after/plugin/lsp.lua | 2 +- after/plugin/neogen.lua | 33 +++++++++++++++++++++++++++++++++ after/plugin/telescope.lua | 2 ++ after/plugin/todo.lua | 2 ++ after/plugin/trouble.lua | 6 ++++++ lua/409/packer.lua | 17 +++++++++++++++++ plugin/packer_compiled.lua | 20 +++++++++++++++++--- 8 files changed, 82 insertions(+), 8 deletions(-) create mode 100644 after/plugin/neogen.lua create mode 100644 after/plugin/todo.lua create mode 100644 after/plugin/trouble.lua diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua index fb14ed7..89b5d6b 100755 --- a/after/plugin/harpoon.lua +++ b/after/plugin/harpoon.lua @@ -7,7 +7,7 @@ harpoon:setup() vim.keymap.set("n", "a", function() harpoon:list():append() end) vim.keymap.set("n", "", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) --- vim.keymap.set("n", "", function() harpoon:list():select(1) end) --- vim.keymap.set("n", "", function() harpoon:list():select(2) end) --- vim.keymap.set("n", "", function() harpoon:list():select(3) end) --- vim.keymap.set("n", "", function() harpoon:list():select(4) end) +vim.keymap.set("n", "1", function() harpoon:list():select(1) end) +vim.keymap.set("n", "2", function() harpoon:list():select(2) end) +vim.keymap.set("n", "3", function() harpoon:list():select(3) end) +vim.keymap.set("n", "4", function() harpoon:list():select(4) end) diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua index d16ed6b..cd04b26 100755 --- a/after/plugin/lsp.lua +++ b/after/plugin/lsp.lua @@ -85,7 +85,7 @@ cmp.setup({ entries = 'native', }, completion = { - completeopt = 'menu,menuone,noinsert', + completeopt = 'menuone,noselect,preview', docs_initially_visible = true }, window = { diff --git a/after/plugin/neogen.lua b/after/plugin/neogen.lua new file mode 100644 index 0000000..3a3fa1d --- /dev/null +++ b/after/plugin/neogen.lua @@ -0,0 +1,33 @@ +local neogen = require('neogen') + +neogen.setup({ + enabled = true, --if you want to disable Neogen + input_after_comment = true, -- (default: true) automatic jump (with insert mode) on inserted annotation + languages = { + cs = { + template = { + annotation_convention = 'xmldoc' + } + } + } +}) + +vim.keymap.set('n', 'nf', function() + neogen.generate({ type = 'func' }) +end) + +vim.keymap.set('n', 'nt', function() + neogen.generate({ type = 'type' }) +end) + +vim.keymap.set('n', 'nc', function() + neogen.generate({ type = 'class' }) +end) + +vim.keymap.set('i', '', function() + neogen.jump_next() +end) + +vim.keymap.set('i', '', function() + neogen.jump_prev() +end) diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua index d07463f..5ae5e5f 100755 --- a/after/plugin/telescope.lua +++ b/after/plugin/telescope.lua @@ -1,6 +1,7 @@ local builtin = require('telescope.builtin') vim.keymap.set("n", "pf", builtin.find_files, {}) vim.keymap.set("n", "", builtin.git_files, {}) +vim.keymap.set('n', 'pt', ':TodoTelescope') vim.keymap.set("n", "ps", function() local status, result = pcall(function() return vim.fn.input("Grep > ") end) -- @@ -11,4 +12,5 @@ vim.keymap.set("n", "ps", function() builtin.grep_string({ search = result }); end) + vim.api.nvim_set_hl(0, "TelescopeSelection", { link = "Visual" }) diff --git a/after/plugin/todo.lua b/after/plugin/todo.lua new file mode 100644 index 0000000..f340b21 --- /dev/null +++ b/after/plugin/todo.lua @@ -0,0 +1,2 @@ +local todo = require('todo-comments') +todo.setup() diff --git a/after/plugin/trouble.lua b/after/plugin/trouble.lua new file mode 100644 index 0000000..6a8ec12 --- /dev/null +++ b/after/plugin/trouble.lua @@ -0,0 +1,6 @@ +local trouble = require('trouble') + +vim.keymap.set('n', 'tt', ':TodoTrouble') +vim.keymap.set('n', 'tv', function () + trouble.open() +end) diff --git a/lua/409/packer.lua b/lua/409/packer.lua index f2454d5..530835d 100755 --- a/lua/409/packer.lua +++ b/lua/409/packer.lua @@ -55,4 +55,21 @@ return require('packer').startup(function(use) use('hrsh7th/cmp-path') use('hrsh7th/cmp-cmdline') use('L3MON4D3/LuaSnip') + + use('nvim-tree/nvim-web-devicons') + + use { + 'danymat/neogen', + requires = { 'nvim-treesitter/nvim-treesitter' } + } + + use { + 'folke/todo-comments.nvim', + dependencies = { 'nvim-lua/plenary' } + } + + use { + 'folke/trouble.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' } + } end) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index 99f991a..6e0c0e4 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -139,6 +139,11 @@ _G.packer_plugins = { path = "/home/j409/.local/share/nvim/site/pack/packer/start/mason.nvim", url = "https://github.com/williamboman/mason.nvim" }, + neogen = { + loaded = true, + path = "/home/j409/.local/share/nvim/site/pack/packer/start/neogen", + url = "https://github.com/danymat/neogen" + }, ["nvim-cmp"] = { loaded = true, path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-cmp", @@ -160,9 +165,8 @@ _G.packer_plugins = { url = "https://github.com/nvim-treesitter/nvim-treesitter" }, ["nvim-web-devicons"] = { - loaded = false, - needs_bufread = false, - path = "/home/j409/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons", + loaded = true, + path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", url = "https://github.com/nvim-tree/nvim-web-devicons" }, ["packer.nvim"] = { @@ -180,6 +184,16 @@ _G.packer_plugins = { path = "/home/j409/.local/share/nvim/site/pack/packer/start/telescope.nvim", url = "https://github.com/nvim-telescope/telescope.nvim" }, + ["todo-comments.nvim"] = { + loaded = true, + path = "/home/j409/.local/share/nvim/site/pack/packer/start/todo-comments.nvim", + url = "https://github.com/folke/todo-comments.nvim" + }, + ["trouble.nvim"] = { + loaded = true, + path = "/home/j409/.local/share/nvim/site/pack/packer/start/trouble.nvim", + url = "https://github.com/folke/trouble.nvim" + }, undotree = { loaded = true, path = "/home/j409/.local/share/nvim/site/pack/packer/start/undotree",