Change keybindings and add better buffer handling

nvim/after/ftplugin/typescript.lua

@@ -0,0 +1 @@
+vim.opt_local.shiftwidth = 4

nvim/lazy-lock.json

@@ -2,6 +2,7 @@
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
   "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" },
   "auto-session": { "branch": "main", "commit": "9d02776ed42874d37869dc683396234e3724b52d" },
+  "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
   "bufferline.nvim": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
@@ -32,6 +33,7 @@
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
   "vim-floaterm": { "branch": "master", "commit": "4e28c8dd0271e10a5f55142fb6fe9b1599ee6160" },
   "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
 }

nvim/lua/config/core/keymaps.lua

@@ -20,7 +20,6 @@ keymap.set('n', 'j', 'gj', opts)
 keymap.set('n', '<UP>', 'gk', opts)
 keymap.set('n', '<DOWN>', 'gj', opts)
 
-
 -- COMMANDS
 
 -- print current working directory

nvim/lua/config/plugins/auto-session.lua

@@ -19,7 +19,9 @@ return {
 
 					-- If NvimTree was opened when the session was saved, show it
 					if buf_exists('NvimTree_') then
-						require('nvim-tree.api').tree.open()
+						local nvim_tree_api = require('nvim-tree.api')
+						nvim_tree_api.tree.reload()
+						nvim_tree_api.tree.open()
 					end
 				end
 			}

nvim/lua/config/plugins/bufdelete.lua

@@ -0,0 +1,6 @@
+return {
+	'famiu/bufdelete.nvim',
+	config = function()
+		vim.keymap.set('n', '<C-q>', '<cmd>Bdelete<cr>', { noremap = true, silent = true })
+	end
+}

nvim/lua/config/plugins/bufferline.lua

@@ -7,11 +7,20 @@ return {
 		local bufferline = require('bufferline')
 		bufferline.setup({
 			options = {
+				persist_buffer_sort = true,
 				hover = {
 					enabled = true,
 					delay = 200,
 					reveal = {'close'}
 				},
+				offsets = {
+					{
+						filetype = "NvimTree",
+						text = "File Explorer",
+						highlight = "Directory",
+						separator = true,
+					}
+				}
 			}
 		})
 

nvim/lua/config/plugins/floaterm.lua

@@ -3,8 +3,8 @@ return {
 	config = function ()
 		local keymap = vim.keymap
 		local opts = { noremap = true, silent = true }
-		keymap.set('n', '<C-q>', '<cmd>FloatermToggle<cr>', opts)
-		keymap.set('t', '<C-q>', '<cmd>FloatermToggle<cr>', opts)
+		keymap.set('n', '<C-a>', '<cmd>FloatermToggle<cr>', opts)
+		keymap.set('t', '<C-a>', '<cmd>FloatermToggle<cr>', opts)
 		keymap.set('t', '<PageUp>', '<cmd>FloatermPrev<cr>', opts)
 		keymap.set('t', '<PageDown>', '<cmd>FloatermNext<cr>', opts)
 

nvim/lua/config/plugins/lsp/lspconfig.lua

@@ -71,6 +71,8 @@ return {
 						'less',
 						'javascript',
 						'javascriptreact',
+						'typescript',
+						'typescriptreact',
 						'svelte',
 						'vue',
 					}

nvim/lua/config/plugins/lsp/mason.lua

@@ -28,8 +28,9 @@ return {
 				'html',
 				'cssls',
 				'pyright',
-				'emmet_ls',
+				-- 'emmet_ls',
 				'bashls',
+				'ts_ls',
 			},
 		})
 
@@ -39,7 +40,7 @@ return {
 				'isort',
 				'black',
 				'pylint',
-				'eslint_d',
+				-- 'eslint_d',
 			}
 		})
 	end,

nvim/lua/config/plugins/lsp/null-ls.lua

@@ -8,13 +8,13 @@ return {
 
 		local sources = {
 			null_ls.builtins.formatting.prettier.with({
-				filetypes = { 'javascript', 'typescript', 'css', 'html', 'json', 'markdown', 'yaml' }
+				filetypes = { 'javascript', 'typescript', 'typescriptreact', 'css', 'html', 'json', 'markdown', 'yaml' }
 			}),
 			null_ls.builtins.formatting.black,
 			null_ls.builtins.formatting.djlint,
 			null_ls.builtins.formatting.isort,
 			null_ls.builtins.formatting.stylua,
-			require('none-ls.diagnostics.eslint_d'),
+			-- require('none-ls.diagnostics.eslint_d'),
 		}
 
 		null_ls.setup({

nvim/lua/config/plugins/nvim-tree.lua

@@ -10,15 +10,25 @@ return {
 		vim.g.loaded_netrw = 1
 		vim.g.loaded_netrwPlugin = 1
 
-		nvim_tree.setup()
+		nvim_tree.setup({
+			filters = {
+				custom = { 'node_modules', '__pycache__' },
+			},
+			update_focused_file = {
+				enable = true,
+				update_cwd = true,
+			}
+		})
 
 		local keymap = vim.keymap
 		keymap.set('n', '<leader>ee', api.tree.toggle, { noremap = true, silent = true })
+		keymap.set('n', '<leader>ec', '<cmd>NvimTreeCD<cr>', { noremap = true, silent = true })
 
 		local wk = require('which-key')
 		wk.add({
 			{ '<leader>e', group = 'nvim-tree', icon = { icon = '  ', color = 'orange' } },
-			{ '<leader>ee', group = 'Toggle tree' }
+			{ '<leader>ee', group = 'Toggle tree' },
+			{ '<leader>ec', group = 'Change tree root to CWD' }
 		})
 	end
 }

nvim/lua/config/plugins/todo-comments.lua

@@ -0,0 +1,5 @@
+return {
+	'folke/todo-comments.nvim',
+	dependencies = { 'nvim-lua/plenary.nvim' },
+	opts = {},
+}