From 032d00a16473985e6fa50a8e9596216e80d35411 Mon Sep 17 00:00:00 2001 From: Nigel Barink Date: Sat, 5 Oct 2024 15:25:46 +0200 Subject: [PATCH] Added fidget back in as replacement for noice.nvim, improved telescope hotkeys dap fix for C/C++ added java to conform --- lazy-lock.json | 45 ++++++++++++++++---------------- lua/barink/plugins/conform.lua | 1 + lua/barink/plugins/dap.lua | 45 ++++++++++++++++---------------- lua/barink/plugins/fidget.lua | 8 ++++++ lua/barink/plugins/harpoon.lua | 31 +++++++++++++++++----- lua/barink/plugins/lsp.lua | 33 +++++++++++------------ lua/barink/plugins/noice.lua | 11 -------- lua/barink/plugins/telescope.lua | 2 +- 8 files changed, 95 insertions(+), 81 deletions(-) create mode 100644 lua/barink/plugins/fidget.lua delete mode 100644 lua/barink/plugins/noice.lua diff --git a/lazy-lock.json b/lazy-lock.json index 7fbffc2..712541d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -6,43 +6,42 @@ "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "conform.nvim": { "branch": "master", "commit": "797de8f79055334104cf77893cd93fe3fc2ac154" }, - "edgy.nvim": { "branch": "main", "commit": "0e8bbab4eba9dab6c237e4a2e146dc0466897be6" }, + "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, + "edgy.nvim": { "branch": "main", "commit": "7e8dedc39abebe40c289b8012cc89b11c69aa7a0" }, + "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, - "gitsigns.nvim": { "branch": "main", "commit": "356df59308d8b87486644d2324d7558ac0f3db36" }, + "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, - "lazy.nvim": { "branch": "main", "commit": "a09c876f6ef642c8feaea45932df73b058d9a083" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, - "mason-lspconfig": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, + "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "mason-lspconfig": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neoconf.nvim": { "branch": "main", "commit": "944f30e58171cf909b6567ce206e9097745560d1" }, - "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" }, + "neoconf.nvim": { "branch": "main", "commit": "3b6db0a913258a91951f96b09c005522cca98f1f" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, - "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" }, - "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" }, - "nvim-lspconfig": { "branch": "master", "commit": "1ea7c6126a1aa0121098e4f16c04d5dde1a4ba22" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, + "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "3497eb39bf413a57ab5b7e7e2e192683e462148c" }, + "nvim-jdtls": { "branch": "master", "commit": "efe813854432a314b472226dca813f0f2598d44a" }, + "nvim-lspconfig": { "branch": "master", "commit": "a9bc587e9ae0cbcb3e90a2e9342f86b3b78c4408" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, - "nvim-treesitter": { "branch": "master", "commit": "733fa85db27079ec2757183c5c840ba15a303e1f" }, - "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, - "oil.nvim": { "branch": "master", "commit": "9e5eb2fcd1dfee2ff30c89273ffff179e42034b9" }, + "nvim-treesitter": { "branch": "master", "commit": "36b78d112bddd69a05e24679241962e29e494d9e" }, + "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" }, + "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, - "telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" }, + "telescope.nvim": { "branch": "master", "commit": "cb3f98d935842836cc115e8c9e4b38c1380fbb6b" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, + "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, - "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, + "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" }, "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" }, "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" }, "vim-dadbod-ui": { "branch": "master", "commit": "f29c85ab42861c6ef683289b0c6a51e0d436dcf6" }, - "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, + "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } } diff --git a/lua/barink/plugins/conform.lua b/lua/barink/plugins/conform.lua index fecf484..cb8d16e 100644 --- a/lua/barink/plugins/conform.lua +++ b/lua/barink/plugins/conform.lua @@ -8,6 +8,7 @@ return { lua = { "stylua"}, javascript = { "prettierd", "prettier", stop_after_first = true }, typescript = { "prettierd", "prettier", stop_after_first = true }, + java = { "clang-format", stop_after_first = true }, }, format_on_save = { timeout_ms = 500 }, default_format_ops = { diff --git a/lua/barink/plugins/dap.lua b/lua/barink/plugins/dap.lua index 0552b34..ac5c5e2 100644 --- a/lua/barink/plugins/dap.lua +++ b/lua/barink/plugins/dap.lua @@ -22,21 +22,38 @@ return { }, config = function () local dap = require('dap') + -- Godot Config + dap.adapters.godot = { + type = "server", + host = "127.0.0.1", + port = 6006 + } + --dap.configurations.gdscript{ + -- type = "godot", + -- request = "launch", + -- name = "launch scene", + -- project = "${workspaceFolder}" + --} + -- C/C++ Config dap.configurations.cpp = { { name = "Launch", - type= "codelldb", + type= "lldb", request = "launch", program = function () return vim.fn.input('Path to executable: ', vim.fn.getcwd() , 'file') end, - cwd = '${workspaceFolder}/Framework', stopOnEntry = false, + runInTerminal = false, } } dap.adapters.lldb = { - type = 'executable', - command = "C:\\Program Files\\LLVM\\bin\\lldb-dap.exe", + type = 'server', + port= "${port}", + executable = { + command = "C:\\Users\\nigel\\AppData\\Local\\nvim-data\\mason\\bin\\codelldb.cmd", + args = { "--port", "${port}"} + }, name = 'lldb' } @@ -57,17 +74,7 @@ return { name = "Launch file", program = "java ${file}", }} - dap.configurations.cpp = {{ - name="launch", - type="lldb", - request="launch", - program = function () - return vim.fn.input('Path to executable: ', vim.fn.getcwd() ..'/', 'file') - end, - cwd = '${workspaceFolder}', - stopOnEntry = false, - args = {}, - }} + -- Golang config dap.configurations.go = { { type = "delve", @@ -99,14 +106,6 @@ return { args = {'dap', '-l', '127.0.0.1:${port}'}, } } - dap.adapters.codelldb = { - type= 'server', - port = '${port}', - executable = { - command = 'C:/Users/Nigel/Appdata/Local/nvim-data/mason/bin/codelldb.cmd', - args = {"--port", "${port}"} - } - } end } } diff --git a/lua/barink/plugins/fidget.lua b/lua/barink/plugins/fidget.lua new file mode 100644 index 0000000..22332c8 --- /dev/null +++ b/lua/barink/plugins/fidget.lua @@ -0,0 +1,8 @@ +return { + { + "j-hui/fidget.nvim", + opt = { + } + } +} + diff --git a/lua/barink/plugins/harpoon.lua b/lua/barink/plugins/harpoon.lua index d083f59..6efb923 100644 --- a/lua/barink/plugins/harpoon.lua +++ b/lua/barink/plugins/harpoon.lua @@ -1,18 +1,35 @@ return { "ThePrimeagen/harpoon", branch= "harpoon2", - dependencies = {{"nvim-lua/plenary.nvim"}}, + dependencies = { + {"nvim-lua/plenary.nvim"}, + {"nvim-telescope/telescope.nvim"} + }, config = function() local harpoon = require("harpoon") 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) + local conf = require("telescope.config").values + local function toggle_telescope(harpoon_files) + local file_paths = {} + for _, item in ipairs(harpoon_files.items) do + table.insert(file_paths, item.value) + 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) + require("telescope.pickers").new({}, { + result = file_paths, + previewer = conf.file_previewer({}), + sorter = conf.generic_sorter({}), + }):find() + end + + vim.keymap.set("n", "ha", function() harpoon:list():add() end) + vim.keymap.set("n", "hh", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) + vim.keymap.set("n", "fe", function () toggle_telescope(harpoon:list()) end, { desc = "Open harpoon window"} ) + vim.keymap.set("n", "C-1", function() harpoon:list():select(1) end) + vim.keymap.set("n", "C-2", function() harpoon:list():select(2) end) + vim.keymap.set("n", "C-3", function() harpoon:list():select(3) end) + vim.keymap.set("n", "C-4", function() harpoon:list():select(4) end) vim.keymap.set("n", "", function() harpoon:list():prev() end) diff --git a/lua/barink/plugins/lsp.lua b/lua/barink/plugins/lsp.lua index 7c788cc..a73d11b 100644 --- a/lua/barink/plugins/lsp.lua +++ b/lua/barink/plugins/lsp.lua @@ -25,6 +25,12 @@ return require("mason-lspconfig").setup({ ensure_installed = { "lua_ls", "bashls", "rust_analyzer" } }) + local ls = require("luasnip") + ls.config.set_config({ + history = true, + updateevents = "TextChanged, TextChangedI", + enable_autosnippets = true, + }) local cmp = require('cmp') cmp.setup({ snippet = { @@ -41,7 +47,6 @@ return }), sources = cmp.config.sources({ { name = 'nvim_lsp', keyword_length = 1 }, - { name = 'luasnip', option = { show_autosnippets = true}}, { name = 'path' }, }, { { name = 'buffer', keyword_length = 2 }, @@ -61,42 +66,36 @@ return }) }) - -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore). - cmp.setup.cmdline({ '/', '?' }, { - mapping = cmp.mapping.preset.cmdline(), + cmp.setup.filetype({ "sql"}, { sources = { - { name = 'buffer' } + { name = "vim-dadbod-completion"}, + { name = "buffer"} , } }) - + -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore). -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). cmp.setup.cmdline(':', { mapping = cmp.mapping.preset.cmdline(), sources = cmp.config.sources({ - { name = 'path' } + { name = 'path' }, + { name = 'buffer' } }, { { name = 'cmdline' } }), matching = { disallow_symbol_nonprefix_matching = false } }) - local ls = require("luasnip") - ls.config.set_config({ - history = true, - updateevents = "TextChanged, TextChangedI", - enable_autosnippets = true, - }) vim.keymap.set({"i", "s"}, "", function() ls.expand() end, {silent = true}) - vim.keymap.set({"i", "s"}, "", function() ls.jump(1) end, {silent = true }) - vim.keymap.set({"i", "s"}, "", function() ls.jump(-1) end, {silent = true}) + vim.keymap.set({"i", "s"}, "", function() ls.jump(1) end, {silent = true }) + vim.keymap.set({"i", "s"}, "", function() ls.jump(-1) end, {silent = true}) vim.keymap.set({"i", "s"}, "", function() if ls.choice_active() then ls.change_choice(1) end end, {silent = true}) - require("luasnip.loaders.from_lua").load({paths= "C:\\Users\\nigel\\AppData\\Local\\nvim\\lua\\barink\\snippets"}) + require("luasnip.loaders.from_lua").load({paths= "~/.config/nvim/lua/barink/snippets"}) -- Set up lspconfig. @@ -105,9 +104,11 @@ return local language_server = { asm_lsp= true, + mojo = true, zls = true, emmet_language_server = true, rust_analyzer = true, + gdtoolkit = { flags = { debounce_text_changes = 150 }}, jdtls = true, pylsp = true, phpactor = { diff --git a/lua/barink/plugins/noice.lua b/lua/barink/plugins/noice.lua deleted file mode 100644 index 61ebecf..0000000 --- a/lua/barink/plugins/noice.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - "folke/noice.nvim", - event = "VeryLazy", - opts = { - }, - dependencies = { - "MunifTanjim/nui.nvim", - "rcarriga/nvim-notify", - }, - -} diff --git a/lua/barink/plugins/telescope.lua b/lua/barink/plugins/telescope.lua index eaa0654..92e1f32 100644 --- a/lua/barink/plugins/telescope.lua +++ b/lua/barink/plugins/telescope.lua @@ -21,7 +21,7 @@ return { vim.keymap.set('n', '/', builtin.current_buffer_fuzzy_find) vim.keymap.set('n', 'gw', builtin.grep_string) vim.keymap.set('n', 'fp',function () - builtin.find_files { cwd = "~/AppData/Local/nvim/lua/barink/"} + builtin.find_files { cwd = "~/.config/nvim/lua/barink/"} end) end }