Merge branch 'main' of ssh://git.mattserver.net:2222/matt/dotfiles

nvim/.config/nvim/lua/maps.lua

@@ -13,8 +13,8 @@ vim.api.nvim_set_keymap('n', '<C-f>', ':NnnPicker %:p:h<CR>', { noremap = true }
 vim.api.nvim_set_keymap('t', '<C-f>', '<cmd>NnnPicker %:p:h<CR>', { noremap = true })
 
 -- nvim-tree
--- vim.api.nvim_set_keymap('n', '<C-b>', '<cmd>NvimTreeToggle <CR>', { noremap = true })
--- vim.api.nvim_set_keymap('n', '<leader>b', ':NvimTreeResize ', { noremap = true })
+vim.api.nvim_set_keymap('n', '<C-b>', '<cmd>NvimTreeToggle <CR>', { noremap = true })
+vim.api.nvim_set_keymap('n', '<leader>b', ':NvimTreeResize ', { noremap = true })
 
 -- Telescope
 vim.keymap.set('n', '<C-l>', builtin.find_files, {})

nvim/.config/nvim/lua/plugins.lua

@@ -14,9 +14,7 @@ vim.opt.rtp:prepend(lazypath)
 
 -- Install Plugins
 require('lazy').setup({
-    -- LSP
     'neovim/nvim-lspconfig',
-    -- DAP
     'mfussenegger/nvim-dap',
     'rcarriga/nvim-dap-ui',
     'leoluz/nvim-dap-go',
@@ -117,28 +115,28 @@ require('nnn').setup({
         fullscreen = false,
     },
 })
--- local function tree_on_attach(bufnr)
---     local api = require('nvim-tree.api')
---     api.config.mappings.default_on_attach(bufnr)
---     vim.keymap.del('n', '<C-e>', { buffer = bufnr })
---     vim.keymap.set("n", "<M-h>", function() api.tree.resize({ relative = -5 }) end, { buffer = bufnr })
---     vim.keymap.set("n", "<M-l>", function() api.tree.resize({ relative = 5 }) end, { buffer = bufnr })
--- end
--- require('nvim-tree').setup({
---     on_attach = tree_on_attach,
---     renderer = {
---         full_name = true,
---     },
---     view = {
---         side = "left",
---     },
---     tab = {
---         sync = {
---             open  = true,
---             close = true,
---         },
---     },
--- })
+local function tree_on_attach(bufnr)
+    local api = require('nvim-tree.api')
+    api.config.mappings.default_on_attach(bufnr)
+    vim.keymap.del('n', '<C-e>', { buffer = bufnr })
+    vim.keymap.set("n", "<M-h>", function() api.tree.resize({ relative = -5 }) end, { buffer = bufnr })
+    vim.keymap.set("n", "<M-l>", function() api.tree.resize({ relative = 5 }) end, { buffer = bufnr })
+end
+require('nvim-tree').setup({
+    on_attach = tree_on_attach,
+    renderer = {
+        full_name = true,
+    },
+    view = {
+        side = "left",
+    },
+    tab = {
+        sync = {
+            open  = true,
+            close = true,
+        },
+    },
+})
 require('telescope').setup({
     defaults = {
         file_ignore_patterns = {