feat(nvim) slim down new config

1 files changed, 52 insertions, 68 deletions

diff --git a/dot_config/nvim_new/init.lua b/dot_config/nvim_new/init.lua
index 0547ec2..ff6868d 100644
--- a/dot_config/nvim_new/init.lua
+++ b/dot_config/nvim_new/init.lua
@@ -125,24 +125,13 @@ vim.pack.add({
     { src = "https://github.com/rose-pine/neovim" },
     { src = "https://github.com/stevearc/oil.nvim" },
     { src = "https://github.com/echasnovski/mini.pick" },
-    { src = "https://github.com/neovim/nvim-lspconfig" },
     { src = "https://github.com/nvim-treesitter/nvim-treesitter" },
-    { src = "https://github.com/nvim-lua/plenary.nvim" },
-    {
-        src = "https://github.com/ThePrimeagen/harpoon",
-        version = "harpoon2"
-    },
-    { src = "https://github.com/nvim-neotest/neotest" },
-    { src = "https://github.com/antoinemadec/FixCursorHold.nvim" },
-    { src = "https://github.com/nvim-neotest/neotest-python", },
-    { src = "https://github.com/nvim-neotest/nvim-nio" },
-    { src = "https://github.com/jiaoshijie/undotree" },
+    { src = "https://github.com/mason-org/mason.nvim" },
 
 })
 
 -- LSP
-vim.lsp.enable({ "lua_ls", "ruff", "rust_analyzer" })
-vim.keymap.set("n", "<leader>rf", vim.lsp.buf.format)
+vim.lsp.enable({ "lua_ls", "ruff", "basedpyright", "rust_analyzer" })
 
 -- LSP specific keybindings
 vim.api.nvim_create_autocmd("LspAttach", {
@@ -194,6 +183,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
         -- Code changes
         lsp_map("n", "<leader>cr", vim.lsp.buf.rename, "Rename")
         lsp_map("n", "<leader>ca", vim.lsp.buf.code_action, "Code actions")
+        lsp_map("n", "<leader>rf", vim.lsp.buf.format, "Format")
 
         -- Diagnostics
         lsp_map("n", "<leader>ds", vim.diagnostic.open_float, "[s]how [d]iagnostic window")
@@ -219,20 +209,14 @@ vim.api.nvim_create_autocmd("LspAttach", {
     end,
 })
 
+require("mason").setup()
+
 -- Treesitter
 require "nvim-treesitter.configs".setup({
     ensure_installed = { "lua", "python", "rust" },
     highlight = { enable = true }
 })
 
--- Format on write
-vim.api.nvim_create_autocmd("BufWritePre", {
-    pattern = "*",
-    callback = function()
-        vim.lsp.buf.format()
-    end,
-})
-
 -- Completion
 vim.api.nvim_create_autocmd('LspAttach', {
     callback = function(ev)
@@ -253,54 +237,54 @@ map("n", "<leader>vh", "<CMD>Pick help<CR>")
 require "oil".setup()
 vim.keymap.set("n", "g-", "<CMD>Oil<CR>")
 
--- Harpoon
-local harpoon = require("harpoon")
-harpoon:setup()
-
-map("n", "<leader>a", function()
-    harpoon:list():add()
-end, { desc = "mark file with harpoon" })
-
-map("n", "<c-e>", function()
-    harpoon.ui:toggle_quick_menu(harpoon:list())
-end, { desc = "open harpoon menu" })
-
-map("n", "<leader>j", function()
-    harpoon:list():select(1)
-end, { desc = "open harpoon file 1" })
-map("n", "<leader>k", function()
-    harpoon:list():select(2)
-end, { desc = "open harpoon file 2" })
-map("n", "<leader>l", function()
-    harpoon:list():select(3)
-end, { desc = "open harpoon file 3" })
-map("n", "<leader>;", function()
-    harpoon:list():select(4)
-end, { desc = "Open Harpoon file 4" })
-
--- Neotest
-require "neotest".setup({
-    adapters = {
-        require("neotest-python")({
-            python = "python",
-            runner = "pytest",
-            is_test_file = function(file_path) ---@param file_path string
-                local normalized_path = vim.fs.normalize(file_path)
-                return normalized_path.match("test/.*%/test_.%.py$") ~= nil
-            end,
-        }),
-    }
-})
-
-map("n", "<leader>tr", require("neotest").run.run, { desc = "Neotest: run test at cursor" })
-map("n", "<leader>tf", function()
-    require("netotest").run.run(vim.fn.expand("%"))
-end, { desc = "Neotest: run all tests in current file" })
-map("n", "<leader>ts", require("neotest").summary.toggle, { desc = "Neotest: toggle summary panel" })
+-- -- Harpoon
+-- local harpoon = require("harpoon")
+-- harpoon:setup()
+--
+-- map("n", "<leader>a", function()
+--     harpoon:list():add()
+-- end, { desc = "mark file with harpoon" })
+--
+-- map("n", "<c-e>", function()
+--     harpoon.ui:toggle_quick_menu(harpoon:list())
+-- end, { desc = "open harpoon menu" })
+--
+-- map("n", "<leader>j", function()
+--     harpoon:list():select(1)
+-- end, { desc = "open harpoon file 1" })
+-- map("n", "<leader>k", function()
+--     harpoon:list():select(2)
+-- end, { desc = "open harpoon file 2" })
+-- map("n", "<leader>l", function()
+--     harpoon:list():select(3)
+-- end, { desc = "open harpoon file 3" })
+-- map("n", "<leader>;", function()
+--     harpoon:list():select(4)
+-- end, { desc = "Open Harpoon file 4" })
+--
+-- -- Neotest
+-- require "neotest".setup({
+--     adapters = {
+--         require("neotest-python")({
+--             python = "python",
+--             runner = "pytest",
+--             is_test_file = function(file_path) ---@param file_path string
+--                 local normalized_path = vim.fs.normalize(file_path)
+--                 return normalized_path.match("test/.*%/test_.%.py$") ~= nil
+--             end,
+--         }),
+--     }
+-- })
+--
+-- map("n", "<leader>tr", require("neotest").run.run, { desc = "Neotest: run test at cursor" })
+-- map("n", "<leader>tf", function()
+--     require("netotest").run.run(vim.fn.expand("%"))
+-- end, { desc = "Neotest: run all tests in current file" })
+-- map("n", "<leader>ts", require("neotest").summary.toggle, { desc = "Neotest: toggle summary panel" })
 
--- Undotree
-require("undotree").setup()
-map("n", "<leader>u", require("undotree").toggle, { desc = "Toggle Undotree" })
+-- -- Undotree
+-- require("undotree").setup()
+-- map("n", "<leader>u", require("undotree").toggle, { desc = "Toggle Undotree" })
 
 -- Colorscheme
 vim.o.background = "dark"