From 3ccd05a6907dc0eede443e04e99795e2eadebf48 Mon Sep 17 00:00:00 2001 From: Donovan Date: Sun, 23 Nov 2025 15:46:52 -0600 Subject: [PATCH] remove broken code --- lazy-lock.json | 82 +++++++-------- lua/dkelly/core/options.lua | 3 +- lua/dkelly/plugins/dap.lua | 123 ----------------------- lua/dkelly/plugins/lsp.lua | 45 ++++++--- lua/dkelly/plugins/mason.lua | 27 ----- lua/dkelly/plugins/neotest.lua | 4 +- lua/dkelly/plugins/nvim-cmp.lua | 138 ++++++++++++-------------- lua/dkelly/plugins/tailwind-tools.lua | 11 -- lua/dkelly/plugins/treesitter.lua | 1 + 9 files changed, 131 insertions(+), 303 deletions(-) delete mode 100644 lua/dkelly/plugins/dap.lua delete mode 100644 lua/dkelly/plugins/tailwind-tools.lua diff --git a/lazy-lock.json b/lazy-lock.json index 57ae7c8..1960208 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,60 +1,50 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "CopilotChat.nvim": { "branch": "main", "commit": "16d897fd43d07e3b54478ccdb2f8a16e4df4f45a" }, "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, - "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "auto-session": { "branch": "main", "commit": "00334ee24b9a05001ad50221c8daffbeedaa0842" }, + "auto-session": { "branch": "main", "commit": "292492ab7af4bd8b9e37e28508bc8ce995722fd5" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, - "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, + "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp-treesitter": { "branch": "master", "commit": "958fcfa0d8ce46d215e19cc3992c542f576c4123" }, - "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" }, - "copilot.lua": { "branch": "master", "commit": "5f726c8e6bbcd7461ee0b870d4e6c8a973b55b64" }, + "conform.nvim": { "branch": "master", "commit": "afce105eb47b0869dfafdac90d82f02ef2419d61" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f1b1e25373cd589ecf418ced8c2ece28229dd83" }, - "iron.nvim": { "branch": "master", "commit": "c005b01b779f1b6c038e11248db403bb3df6a7f3" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lazygit.nvim": { "branch": "main", "commit": "b9eae3badab982e71abab96d3ee1d258f0c07961" }, - "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, - "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "4cad8f67d9594565549442e2e8c68556761ab7a9" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" }, - "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "gitsigns.nvim": { "branch": "main", "commit": "cdafc320f03f2572c40ab93a4eecb733d4016d07" }, + "iron.nvim": { "branch": "master", "commit": "746414e67adcd3ad2ad5dbe6262543b55ac3f3cd" }, + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, + "lazygit.nvim": { "branch": "main", "commit": "2305deed25bc61b866d5d39189e9105a45cf1cfb" }, + "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "7d527c76c43f46294de9c19d39c5a86317809b4b" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, + "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, - "neotest": { "branch": "master", "commit": "ef492755730e59e1d8122c461abbd086bee4c76b" }, - "neotest-go": { "branch": "main", "commit": "92950ad7be2ca02a41abca5c6600ff6ffaf5b5d6" }, - "neotest-golang": { "branch": "main", "commit": "863a9d8cef20b7392aac77eaa7d116faa8344aab" }, - "neotest-python": { "branch": "master", "commit": "34c9f6f3dc53fc462ea658b5071238037f95f7aa" }, - "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, - "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" }, - "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" }, - "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" }, - "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, - "nvim-lint": { "branch": "master", "commit": "b47cbb249351873e3a571751c3fb66ed6369852f" }, + "neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" }, + "neotest-go": { "branch": "main", "commit": "59b50505053f9c45a9febb79e11a56206c3e3901" }, + "neotest-golang": { "branch": "main", "commit": "b982da5f39980797c1bdec875d688a302245f31f" }, + "neotest-python": { "branch": "master", "commit": "b0d3a861bd85689d8ed73f0590c47963a7eb1bf9" }, + "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" }, + "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" }, + "nvim-dap": { "branch": "master", "commit": "5860c7c501eb428d3137ee22c522828d20cca0b3" }, + "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" }, + "nvim-lint": { "branch": "master", "commit": "d1118791070d090777398792a73032a0ca5c79ff" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, - "nvim-lspconfig": { "branch": "master", "commit": "8adb3b5938f6074a1bcc36d3c3916f497d2e8ec4" }, + "nvim-lspconfig": { "branch": "master", "commit": "30a2b191bccf541ce1797946324c9329e90ec448" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-tree.lua": { "branch": "master", "commit": "1c733e8c1957dc67f47580fe9c458a13b5612d5b" }, + "nvim-tree.lua": { "branch": "master", "commit": "3fb91e18a727ecc0385637895ec397dea90be42a" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "tailwind-tools": { "branch": "master", "commit": "fbe982901d4508b0dcd80e07addf0fcb6dab6c49" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, - "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, - "venv-selector.nvim": { "branch": "regexp", "commit": "c677caa1030808a9f90092e522de7cc20c1390dd" }, - "vim-go": { "branch": "master", "commit": "787342da47bc5fe6fa88e9d65842c6a0a6304700" }, - "vim-tmux-navigator": { "branch": "master", "commit": "97e58f2b3b4f8fd30ce149302f10202f363cc361" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } + "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, + "telescope.nvim": { "branch": "master", "commit": "83a3a713d6b2d2a408491a1b959e55a7fa8678e8" }, + "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, + "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, + "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, + "vim-go": { "branch": "master", "commit": "dc07b9082fecd47f8ebef5f2684758e570f66377" }, + "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }, + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } } diff --git a/lua/dkelly/core/options.lua b/lua/dkelly/core/options.lua index 560b672..0d9b2f0 100644 --- a/lua/dkelly/core/options.lua +++ b/lua/dkelly/core/options.lua @@ -1,6 +1,5 @@ vim.cmd("let g:netrw_liststyle = 3") - local opt = vim.opt opt.relativenumber = true @@ -24,7 +23,7 @@ opt.background = "dark" opt.signcolumn = "yes" -- backspace -opt.backspace = "indent,eol,start" -- allow backspace on indent, end of line or insert mode start position +opt.backspace = "indent,eol,start" -- allow backspace on indent, end of line or insert mode start position -- clipboard opt.clipboard:append("unnamedplus") -- use system clipboard as default register diff --git a/lua/dkelly/plugins/dap.lua b/lua/dkelly/plugins/dap.lua deleted file mode 100644 index a1eeae9..0000000 --- a/lua/dkelly/plugins/dap.lua +++ /dev/null @@ -1,123 +0,0 @@ -return { - { - "mfussenegger/nvim-dap", - dependencies = {}, - config = function() - local dap = require("dap") - dap.adapters.dart = { - type = "executable", - command = "flutter", - args = { "debug_adapter" }, - } - require("nvim-dap-virtual-text").setup() - vim.keymap.set("n", "bb", dap.toggle_breakpoint, { desc = "Toggle breakpoint" }) - vim.keymap.set("n", "b1", dap.continue, { desc = "Continue" }) - vim.keymap.set("n", "b2", dap.step_into, { desc = "Step into" }) - vim.keymap.set("n", "b3", dap.step_over, { desc = "Step over" }) - vim.keymap.set("n", "b4", dap.step_out, { desc = "Step out" }) - vim.keymap.set("n", "b5", dap.step_back, { desc = "Step back" }) - vim.keymap.set("n", "b6", dap.restart, { desc = "Restart" }) - dap.configurations.go = {} - end, - }, - { - "rcarriga/nvim-dap-ui", - dependencies = { - "mfussenegger/nvim-dap", - "nvim-neotest/nvim-nio", - }, - config = function() - local dap = require("dap") - local ui = require("dapui") - ui.setup() - dap.listeners.before.attach.dapui_config = function() - ui.open() - end - dap.listeners.before.launch.dapui_config = function() - ui.open() - end - vim.keymap.set("n", "be", function() - require("dapui").eval(nil, { enter = true }) - end, { desc = "Evaluate variable under cursor" }) - vim.keymap.set("n", "bq", function() - require("dap").terminate() - require("dapui").close() - end, { desc = "Quit DAP" }) - end, - }, - { - "theHamsta/nvim-dap-virtual-text", - dependencies = { - "mfussenegger/nvim-dap", - }, - config = function() - require("nvim-dap-virtual-text").setup({ - enabled = true, - enabled_commands = true, - highlight_changed_variables = true, - highlight_new_as_changed = true, - show_stop_reason = true, - commented = false, - all_references = false, - virt_text_pos = "eol", - all_frames = false, - virt_lines = false, - }) - end, - }, - { - "jay-babu/mason-nvim-dap.nvim", - dependencies = { - "mason.nvim", - "mfussenegger/nvim-dap", - }, - config = function() - require("mason-nvim-dap").setup({ - ensure_installed = { "delve", "dart" }, - automatic_installation = true, - automatic_setup = true, - handlers = { - function(config) - require("mason-nvim-dap").default_setup(config) - end, - }, - }) - end, - }, - { - "mfussenegger/nvim-dap-python", - dependencies = "mfussenegger/nvim-dap", - config = function() - -- use the system python as a default; venv-selector will - -- overwrite this when you pick a venv - require("dap-python").setup("python3") -- or an absolute path - end, - }, - { - "linux-cultist/venv-selector.nvim", - dependencies = { - "neovim/nvim-lspconfig", - { - "nvim-telescope/telescope.nvim", - branch = "0.1.x", - dependencies = { "nvim-lua/plenary.nvim" }, - }, - "mfussenegger/nvim-dap-python", -- tiny wrapper that registers the debugpy adapter - "mfussenegger/nvim-dap", - }, - lazy = false, - branch = "regexp", - keys = { - { "v", "VenvSelect" }, - }, - opts = { - dap_enabled = true, - search = { - anaconda_base = { - command = "fd /python$ /opt/homebrew/anaconda3/envs --full-path --color never -E /proc", - type = "anaconda", - }, - }, - }, - }, -} diff --git a/lua/dkelly/plugins/lsp.lua b/lua/dkelly/plugins/lsp.lua index 76254f1..e958402 100644 --- a/lua/dkelly/plugins/lsp.lua +++ b/lua/dkelly/plugins/lsp.lua @@ -8,8 +8,7 @@ return { }, config = function() -- import lspconfig plugin - local lspconfig = require("lspconfig") - lspconfig.dartls.setup({}) + local lspconfig = vim.lsp.config -- import cmp-nvim-lsp plugin local cmp_nvim_lsp = require("cmp_nvim_lsp") @@ -50,12 +49,6 @@ return { opts.desc = "Show line diagnostics" keymap.set("n", "d", vim.diagnostic.open_float, opts) -- show diagnostics for line - opts.desc = "Go to previous diagnostic" - keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) -- jump to previous diagnostic in buffer - - opts.desc = "Go to next diagnostic" - keymap.set("n", "]d", vim.diagnostic.goto_next, opts) -- jump to next diagnostic in buffer - opts.desc = "Show documentation for what is under cursor" keymap.set("n", "K", vim.lsp.buf.hover, opts) -- show documentation for what is under cursor @@ -79,15 +72,38 @@ return { end require("mason-lspconfig").setup({ + ensure_installed = { + -- LSP server names only + "bashls", -- Bash + "clangd", -- C/C++ + "cssls", -- CSS + "gopls", -- Go + "html", -- HTML + "jsonls", -- JSON + "lua_ls", -- Lua + "marksman", -- Markdown + "pyright", -- Python + "rust_analyzer", -- Rust + "taplo", -- TOML + "yamlls", -- YAML + "dockerls", -- Docker + "graphql", -- GraphQL + "sqlls", -- SQL (or try "sqls") + "perlnavigator", -- Perl + "vimls", -- Vim + "lemminx", -- XML + "cmake", -- CMake + "zls", -- Zig + }, + automatic_installation = true, handlers = { - function(server_name) -- default handler (optional) - require("lspconfig")[server_name].setup({ - capabilities = capabilities, - }) - end, + -- function(server_name) -- default handler (optional) + -- vim.lsp.config[server_name].setup({ + -- capabilities = capabilities, + -- }) + -- end, zls = function() - local lspconfig = require("lspconfig") lspconfig.zls.setup({ root_dir = lspconfig.util.root_pattern(".git", "build.zig", "zls.json"), settings = { @@ -102,7 +118,6 @@ return { vim.g.zig_fmt_autosave = 0 end, ["lua_ls"] = function() - local lspconfig = require("lspconfig") lspconfig.lua_ls.setup({ capabilities = capabilities, settings = { diff --git a/lua/dkelly/plugins/mason.lua b/lua/dkelly/plugins/mason.lua index e87e0b7..744c76a 100644 --- a/lua/dkelly/plugins/mason.lua +++ b/lua/dkelly/plugins/mason.lua @@ -21,33 +21,6 @@ return { }, }) - require("mason-lspconfig").setup({ - ensure_installed = { - -- LSP server names only - "bashls", -- Bash - "clangd", -- C/C++ - "cssls", -- CSS - "gopls", -- Go - "html", -- HTML - "jsonls", -- JSON - "lua_ls", -- Lua - "marksman", -- Markdown - "pyright", -- Python - "rust_analyzer", -- Rust - "taplo", -- TOML - "yamlls", -- YAML - "dockerls", -- Docker - "graphql", -- GraphQL - "sqlls", -- SQL (or try "sqls") - "perlnavigator", -- Perl - "vimls", -- Vim - "lemminx", -- XML - "cmake", -- CMake - "zls", -- Zig - }, - automatic_installation = true, - }) - mason_tool_installer.setup({ ensure_installed = { "prettier", -- prettier formatter diff --git a/lua/dkelly/plugins/neotest.lua b/lua/dkelly/plugins/neotest.lua index 64cb667..9604de6 100644 --- a/lua/dkelly/plugins/neotest.lua +++ b/lua/dkelly/plugins/neotest.lua @@ -51,8 +51,8 @@ return { end, { desc = "Debug: Debug Nearest Test" }) vim.keymap.set("n", "to", function() - require("neotest").output.open() - end, { desc = "Debug: Open test output" }) + require("neotest").output_panel.open() + end, { desc = "Debug: Open test output panel" }) vim.keymap.set("n", "ta", function() require("neotest").run.run(vim.fn.getcwd()) diff --git a/lua/dkelly/plugins/nvim-cmp.lua b/lua/dkelly/plugins/nvim-cmp.lua index 54e9091..54b7ab5 100644 --- a/lua/dkelly/plugins/nvim-cmp.lua +++ b/lua/dkelly/plugins/nvim-cmp.lua @@ -1,86 +1,70 @@ return { - "hrsh7th/nvim-cmp", - dependencies = { - -- basic sources - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - -- cmdline completion for `:` and `/` - "hrsh7th/cmp-cmdline", -- :contentReference[oaicite:0]{index=0} - -- LSP - "hrsh7th/cmp-nvim-lsp", -- :contentReference[oaicite:1]{index=1} - -- Treesitter source - "ray-x/cmp-treesitter", -- :contentReference[oaicite:2]{index=2} + "hrsh7th/nvim-cmp", + dependencies = { + -- basic sources + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-path", + -- cmdline completion for `:` and `/` + "hrsh7th/cmp-cmdline", -- :contentReference[oaicite:0]{index=0} + -- LSP + "hrsh7th/cmp-nvim-lsp", -- :contentReference[oaicite:1]{index=1} + -- Treesitter source + "ray-x/cmp-treesitter", -- :contentReference[oaicite:2]{index=2} - -- snippet engine & integration (optional) - { - "L3MON4D3/LuaSnip", - version = "v2.*", - build = "make install_jsregexp", - }, - "saadparwaiz1/cmp_luasnip", - "rafamadriz/friendly-snippets", + "rafamadriz/friendly-snippets", - -- icons - "onsails/lspkind.nvim", - }, - - config = function() - local cmp = require("cmp") - local luasnip = require("luasnip") - local lspkind = require("lspkind") + -- icons + "onsails/lspkind.nvim", + }, - -- load friendly-snippets - require("luasnip.loaders.from_vscode").lazy_load() + config = function() + local cmp = require("cmp") + local lspkind = require("lspkind") - -- nicer completions menu - vim.opt.completeopt = "menu,menuone,preview,noselect" + -- load friendly-snippets - cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.confirm({ select = false }), - }), - sources = cmp.config.sources({ - { name = "luasnip" }, - { name = "nvim_lsp" }, - { name = "treesitter" }, - { name = "buffer" }, - { name = "path" }, - }), - formatting = { - format = lspkind.cmp_format({ - maxwidth = 50, - ellipsis_char = "...", - }), - }, - }) + -- nicer completions menu + vim.opt.completeopt = "menu,menuone,preview,noselect" - -- Command‐line “:” → cmdline + path - cmp.setup.cmdline(":", { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = "path" }, - { name = "cmdline" }, - }, - }) + cmp.setup({ + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping.confirm({ select = false }), + }), + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "treesitter" }, + { name = "buffer" }, + { name = "path" }, + }), + formatting = { + format = lspkind.cmp_format({ + maxwidth = 50, + ellipsis_char = "...", + }), + }, + }) - -- Search “/” → buffer - cmp.setup.cmdline("/", { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = "buffer" }, - }, - }) - end, + -- Command‐line “:” → cmdline + path + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = "path" }, + { name = "cmdline" }, + }, + }) + + -- Search “/” → buffer + cmp.setup.cmdline("/", { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = "buffer" }, + }, + }) + end, } - diff --git a/lua/dkelly/plugins/tailwind-tools.lua b/lua/dkelly/plugins/tailwind-tools.lua deleted file mode 100644 index caf41f5..0000000 --- a/lua/dkelly/plugins/tailwind-tools.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - "luckasRanarison/tailwind-tools.nvim", - name = "tailwind-tools", - build = ":UpdateRemotePlugins", - dependencies = { - "nvim-treesitter/nvim-treesitter", - "nvim-telescope/telescope.nvim", -- optional - "neovim/nvim-lspconfig", -- optional - }, - opts = {}, -- your configuration -} diff --git a/lua/dkelly/plugins/treesitter.lua b/lua/dkelly/plugins/treesitter.lua index d05dab2..2ca288e 100644 --- a/lua/dkelly/plugins/treesitter.lua +++ b/lua/dkelly/plugins/treesitter.lua @@ -82,6 +82,7 @@ return { -- Other Neovim-related "vimdoc", "yaml", + "swift", }, }) end,