From 7c27600c4f108005a8e44ee8232da91a208275b1 Mon Sep 17 00:00:00 2001 From: Sam Nystrom Date: Sat, 5 Aug 2023 22:28:59 -0400 Subject: nvim: remove EVEN MORE plugins (whoa) --- .config/nvim/lazy-lock.json | 11 ------- .config/nvim/lua/options.lua | 1 + .config/nvim/lua/plugins/catppuccin.lua | 4 --- .config/nvim/lua/plugins/cmp.lua | 13 -------- .config/nvim/lua/plugins/dap.lua | 57 --------------------------------- .config/nvim/lua/plugins/neotest.lua | 46 -------------------------- .config/nvim/lua/plugins/telescope.lua | 6 ++-- .config/nvim/lua/plugins/treesitter.lua | 1 - 8 files changed, 4 insertions(+), 135 deletions(-) delete mode 100644 .config/nvim/lua/plugins/dap.lua delete mode 100644 .config/nvim/lua/plugins/neotest.lua (limited to '.config') diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index f7effbe..d2fcccf 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,11 +1,9 @@ { - "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" }, "bufferline.nvim": { "branch": "main", "commit": "d24378edc14a675c820a303b4512af3bbc5761e9" }, "catppuccin": { "branch": "main", "commit": "a84ee1848bfac4601771805396552bdbaa0a0e91" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, - "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, @@ -15,20 +13,11 @@ "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, "lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" }, "neogit": { "branch": "master", "commit": "3d63d76f04dc7102c83a057ded30a93822b59dec" }, - "neotest": { "branch": "master", "commit": "fb0b31ae1dcdc7d68af5c66db4434ae5ebeffcfc" }, - "neotest-go": { "branch": "main", "commit": "f2580cad67ef0181403cf65858ab638ffd3ede9f" }, - "neotest-python": { "branch": "master", "commit": "054f22129405e747adfc2cbeddfcc59537df50ba" }, - "neotest-rust": { "branch": "main", "commit": "d1dfe0f51f3a1def715d1fdd6918341176592c23" }, "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, - "nvim-dap": { "branch": "master", "commit": "d17d1bba23ec72a157bd183c57840c39e323f515" }, - "nvim-dap-go": { "branch": "main", "commit": "eab43d63cef832801a701812913e4d1d726725e5" }, - "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, - "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, "nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" }, "nvim-surround": { "branch": "main", "commit": "10b20ca7d9da1ac8df8339e140ffef94f9ab3b18" }, "nvim-treesitter": { "branch": "master", "commit": "9fa6806b88905d52b5ca36094909630919b432cc" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" }, "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua index 652ceae..bd14907 100644 --- a/.config/nvim/lua/options.lua +++ b/.config/nvim/lua/options.lua @@ -10,3 +10,4 @@ vim.o.statusline = "%f %y%h%w%m%r%=%l:%c %P" vim.g.mapleader = " " vim.g.maplocalleader = " " +vim.api.nvim_set_keymap('n', '\\', ':noh', {}) diff --git a/.config/nvim/lua/plugins/catppuccin.lua b/.config/nvim/lua/plugins/catppuccin.lua index aa00b3f..9d9bce5 100644 --- a/.config/nvim/lua/plugins/catppuccin.lua +++ b/.config/nvim/lua/plugins/catppuccin.lua @@ -7,12 +7,8 @@ return { require("catppuccin").setup({ flavour = "macchiato", integrations = { - leap = true, neogit = true, - notify = true, - neotest = true, which_key = true, - fidget = true, }, }) vim.cmd.colorscheme("catppuccin") diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index 9ad472b..edc5091 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -92,18 +92,5 @@ return { }) end, }, - { - "rcarriga/cmp-dap", - dependencies = { "hrsh7th/nvim-cmp" }, - ft = { "dap-repl", "dapui_watches", "dapui_hover" }, - config = function() - local cmp = require("cmp") - cmp.setup.filetype({ "dap-repl", "dapui_watches", "dapui_hover" }, { - sources = { - { name = "dap" }, - }, - }) - end, - }, } diff --git a/.config/nvim/lua/plugins/dap.lua b/.config/nvim/lua/plugins/dap.lua deleted file mode 100644 index dcbd62c..0000000 --- a/.config/nvim/lua/plugins/dap.lua +++ /dev/null @@ -1,57 +0,0 @@ -return { - { - "mfussenegger/nvim-dap", - dependencies = { - { "leoluz/nvim-dap-go", opts = {} }, - { - "mfussenegger/nvim-dap-python", - config = function() - require("dap-python").setup(vim.fn.exepath("python")) - end, - }, - { - "rcarriga/nvim-dap-ui", - dependencies = { "mfussenegger/nvim-dap" }, - keys = { - { "du", function() require("dapui").toggle() end, desc = "Toggle UI" }, - { "de", function() require("dapui").eval() end, desc = "Eval", mode = { "n", "v" } }, - }, - config = function() - local dapui = require("dapui") - dapui.setup() - - local dap = require("dap") - dap.listeners.after.event_initialized["dapui_config"] = dapui.open - dap.listeners.before.event_terminated["dapui_config"] = dapui.close - dap.listeners.before.event_exited["dapui_config"] = dapui.close - end, - }, - }, - keys = { - { "db", function() require("dap").toggle_breakpoint() end, desc = "Toggle Breakpoint" }, - { "dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" }, - { "dc", function() require("dap").continue() end, desc = "Continue" }, - { "dC", function() require("dap").run_to_cursor() end, desc = "Run to Cursor" }, - { "dg", function() require("dap").goto_() end, desc = "Go to line (no execute)" }, - { "di", function() require("dap").step_into() end, desc = "Step Into" }, - { "dj", function() require("dap").down() end, desc = "Down" }, - { "dk", function() require("dap").up() end, desc = "Up" }, - { "dl", function() require("dap").run_last() end, desc = "Run Last" }, - { "do", function() require("dap").step_out() end, desc = "Step Out" }, - { "dO", function() require("dap").step_over() end, desc = "Step Over" }, - { "dp", function() require("dap").pause() end, desc = "Pause" }, - { "dr", function() require("dap").repl.toggle() end, desc = "Toggle REPL" }, - { "ds", function() require("dap").session() end, desc = "Session" }, - { "dt", function() require("dap").terminate() end, desc = "Terminate" }, - { "dw", function() require("dap.ui.widgets").hover() end, desc = "Widgets" }, - }, - config = function() - require("dap") - local sign = vim.fn.sign_define - sign("DapBreakpoint", { text = "●", texthl = "DapBreakpoint", linehl = "", numhl = ""}) - sign("DapBreakpointCondition", { text = "●", texthl = "DapBreakpointCondition", linehl = "", numhl = ""}) - sign("DapLogPoint", { text = "◆", texthl = "DapLogPoint", linehl = "", numhl = ""}) - end, - }, -} - diff --git a/.config/nvim/lua/plugins/neotest.lua b/.config/nvim/lua/plugins/neotest.lua deleted file mode 100644 index 5e22696..0000000 --- a/.config/nvim/lua/plugins/neotest.lua +++ /dev/null @@ -1,46 +0,0 @@ -return { - { - "nvim-neotest/neotest", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - "antoinemadec/FixCursorHold.nvim", - - "nvim-neotest/neotest-python", - "rouge8/neotest-rust", - "nvim-neotest/neotest-go", - }, - keys = { - { "tt", function() require("neotest").run.run(vim.fn.expand("%")) end, desc = "Run buffer" }, - { "tT", function() require("neotest").run.run(vim.loop.cwd()) end, desc = "Run all files" }, - { "tr", function() require("neotest").run.run() end, desc = "Run nearest test" }, - { "td", function() require("neotest").run.run({strategy="dap"}) end, desc = "Debug nearest test" }, - { "ts", function() require("neotest").summary.toggle() end, desc = "Toggle summary" }, - { "to", function() require("neotest").output.open({enter=true, auto_close=true}) end, desc = "Show output" }, - { "tO", function() require("neotest").output_panel.toggle() end, desc = "Toggle output panel" }, - { "tS", function() require("neotest").run.stop() end, desc = "Stop" }, - { "twt", function() require("neotest").watch.watch(vim.fn.expand("%")) end, desc = "Watch buffer" }, - { "twT", function() require("neotest").watch.watch(vim.loop.cwd()) end, desc = "Watch all files" }, - { "twr", function() require("neotest").watch.watch() end, desc = "Watch nearest test" }, - { "tws", function() require("neotest").watch.stop() end, desc = "Stop watching" }, - }, - config = function() - local neotest_ns = vim.api.nvim_create_namespace("neotest") - vim.diagnostic.config({ - virtual_text = { - format = function(diagnostic) - return diagnostic.message:gsub("\n", " "):gsub("\t", " "):gsub("%s+", " "):gsub("^%s+", "") - end, - }, - }, neotest_ns) - - require("neotest").setup({ - adapters = { - require("neotest-python"), - require("neotest-rust"), - require("neotest-go"), - }, - }) - end, - }, -} diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 84f806c..8dfcce3 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -6,10 +6,10 @@ return { "nvim-tree/nvim-web-devicons", }, keys = { - { "fF", "Telescope find_files", desc = "Find files" }, - { "ff", "Telescope git_files", desc = "Find git files" }, + { "ff", "Telescope find_files", desc = "Find files" }, + { "fF", "Telescope git_files", desc = "Find git files" }, { "fg", "Telescope live_grep", desc = "Live grep" }, - { "fb", "Telescope buffers", desc = "Buffers" }, + { "fb", "Telescope buffers", desc = "Find buffers" }, { "fh", "Telescope help_tags", desc = "Help tags" }, }, cmd = "Telescope", diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index d948ac6..3f7c5ac 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -1,7 +1,6 @@ return { { "nvim-treesitter/nvim-treesitter", - dependencies = { "nvim-treesitter/nvim-treesitter-textobjects" }, event = { "BufReadPre", "BufNewFile" }, config = function() require("nvim-treesitter.configs").setup({ -- cgit v1.2.3