* adapted config after merging upstream

Author: Florin Balate

.gitignore

@@ -2,5 +2,5 @@ tags
 test.sh
 .luarc.json
 nvim
-plugin/
+packer_compiled.lua
 lazy-lock.json

after/plugin/defaults.lua

@@ -20,12 +20,12 @@ vim.cmd [[ colorscheme gruvbox ]]
 vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' })
 
 -- nvim-tree
-vim.opt.foldmethod = "expr"
-vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
+-- vim.opt.foldmethod = "expr"
+-- vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
+-- vim.g.loaded_netrw = 1
+-- vim.g.loaded_netrwPlugin = 1
 
-vim.keymap.set('n', '<c-n>', ':NvimTreeFindFileToggle<CR>')
+vim.keymap.set('n', '<c-n>', ':Neotree<CR>')
 
 -- lualine options
 require('lualine').setup({
@@ -43,49 +43,49 @@ require('lualine').setup({
 	}
 })
 
-local dapui =require('dapui')
-local dap = require('dap')
-
-dap.adapters.coreclr={
-  type = 'executable',
-  command = '/home/florin/.local/share/nvim/mason/packages/netcoredbg/netcoredbg',
-  args = {'--interpreter=vscode'}
-}
-
-dap.configurations.cs = {
-  {
-    type = "coreclr",
-    name = "launch - netcoredbg",
-    request = "launch",
-    program = function()
-        return vim.fn.input('Path to dll', vim.fn.getcwd() .. '/bin/Debug/', 'file')
-    end,
-  },
-}
-
-dap.listeners.after.event_initialized["dapui_config"] = function ()
-	dapui.open()
-end
-dap.listeners.before.event_terminated["dapui_config"] = function ()
-	dapui.close()
-end
-dap.listeners.before.event_exited["dapui_config"]	= function ()
-	dapui.close()
-end
-
--- require("dap.ext.vscode").load_launchjs()
-local continue = function()
-  if vim.fn.filereadable('.vscode/launch.json') then
-    require('dap.ext.vscode').load_launchjs()
-  end
-  require('dap').continue()
-end
-vim.keymap.set('n', '<leader>dm', require('dap-python').test_method, { desc = '[D]ebug [M]ethod'})
-vim.keymap.set('n', '<leader>dc', continue, { desc = '[D]ebug Start/[C]ontinue'})
-vim.keymap.set('n', '<leader>dt', require('dap').toggle_breakpoint, { desc = '[D]ebug [T]oggle breakpoint'})
-vim.keymap.set('n', '<leader>di', require('dap').step_into, { desc = '[D]ebug Step [I]nto'})
-vim.keymap.set('n', '<leader>do', require('dap').step_over, { desc = '[D]ebug Steo [O]ver'})
+-- local dapui =require('dapui')
+-- local dap = require('dap')
 
+-- dap.adapters.coreclr={
+--   type = 'executable',
+--   command = '/home/florin/.local/share/nvim/mason/packages/netcoredbg/netcoredbg',
+--   args = {'--interpreter=vscode'}
+-- }
+--
+-- dap.configurations.cs = {
+--   {
+--     type = "coreclr",
+--     name = "launch - netcoredbg",
+--     request = "launch",
+--     program = function()
+--         return vim.fn.input('Path to dll', vim.fn.getcwd() .. '/bin/Debug/', 'file')
+--     end,
+--   },
+-- }
+--
+-- dap.listeners.after.event_initialized["dapui_config"] = function ()
+-- 	dapui.open()
+-- end
+-- dap.listeners.before.event_terminated["dapui_config"] = function ()
+-- 	dapui.close()
+-- end
+-- dap.listeners.before.event_exited["dapui_config"]	= function ()
+-- 	dapui.close()
+-- end
+--
+-- -- require("dap.ext.vscode").load_launchjs()
+-- local continue = function()
+--   if vim.fn.filereadable('.vscode/launch.json') then
+--     require('dap.ext.vscode').load_launchjs()
+--   end
+--   require('dap').continue()
+-- end
+-- vim.keymap.set('n', '<leader>dm', require('dap-python').test_method, { desc = '[D]ebug [M]ethod'})
+-- vim.keymap.set('n', '<leader>dc', continue, { desc = '[D]ebug Start/[C]ontinue'})
+-- vim.keymap.set('n', '<leader>dt', require('dap').toggle_breakpoint, { desc = '[D]ebug [T]oggle breakpoint'})
+-- vim.keymap.set('n', '<leader>di', require('dap').step_into, { desc = '[D]ebug Step [I]nto'})
+-- vim.keymap.set('n', '<leader>do', require('dap').step_over, { desc = '[D]ebug Steo [O]ver'})
+--
 vim.keymap.set('n', '<leader>bs', require('bufferline').pick_buffer, {desc = '[B]uffer [P]ick'})
   -- lua require("neotest").run.run({vim.fn.expand("%"), strategy = "dap"})
 

lua/custom/plugins.lua

@@ -0,0 +1,15 @@
+-- Unless you are still migrating, remove the deprecated commands from v1.x
+vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
+
+return {
+  "nvim-neo-tree/neo-tree.nvim",
+  version = "*",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+    "MunifTanjim/nui.nvim",
+  },
+  config = function ()
+    require('neo-tree').setup {}
+  end,
+}