edit keymaps file to fix error upon opening vim

init.lua

@@ -285,7 +285,6 @@ require('lazy').setup({
     -- Then, because we use the `config` key, the configuration only runs
     -- after the plugin has been loaded:
     --  config = function() ... end
-
     { -- Useful plugin to show you pending keybinds.
       'folke/which-key.nvim',
       event = 'VeryLazy', -- Sets the loading event to 'VeryLazy'
@@ -825,25 +824,17 @@ require('lazy').setup({
   --
   --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
   --    For additional information see: :help lazy.nvim-lazy.nvim-structuring-your-plugins
-<<<<<<< HEAD
   { import = 'custom.plugins' },
-=======
-   { import = 'custom.plugins' },
->>>>>>> 6ecc6f96c43a98f2ed0a64d16d71b5cae8828a54
 }, {})
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
-<<<<<<< HEAD
---
---
+
 -- Override default Grey Color Line Number with White
 vim.cmd 'highlight LineNr guifg=#ffffff'
 
 -- Hopefully adds Clipboard Support
 vim.o.clipboard = 'unnamedplus'
-=======
 
 -- Override default Grey Color Line Number with White
 vim.cmd 'highlight LineNr guifg=#ffffff'
->>>>>>> 6ecc6f96c43a98f2ed0a64d16d71b5cae8828a54

lua/custom/plugins/keymaps.lua

@@ -1,14 +1,19 @@
+local keymaps = {
+
   -- Map <Leader>nt to toggle nvim-tree
-vim.api.nvim_set_keymap('n', '<Leader>t', ':NvimTreeToggle<CR>', { noremap = true, silent = true })
+  vim.api.nvim_set_keymap('n', '<C-t>', ':NvimTreeToggle<CR>', { noremap = true, silent = true }),
 
   -- Map <C-p> to switch focus between nvim-tree and code
-vim.api.nvim_set_keymap('n', '<C-f>', ':NvimTreeFocus<CR>', { noremap = true, silent = true })
+  vim.api.nvim_set_keymap('n', '<C-f>', ':NvimTreeFocus<CR>', { noremap = true, silent = true }),
 
   -- Map 'a' to create a new file
-vim.api.nvim_set_keymap('n', 'a', ':NvimTreeNewFile<CR>', { noremap = true, silent = true })
+  vim.api.nvim_set_keymap('n', 'a', ':NvimTreeNewFile<CR>', { noremap = true, silent = true }),
 
   -- Map <Leader>nd to delete selected file/directory
-vim.api.nvim_set_keymap('n', 'C-d', ':NvimTreeDelete<CR>', { noremap = true, silent = true })
+  vim.api.nvim_set_keymap('n', 'd', ':NvimTreeDelete<CR>', { noremap = true, silent = true }),
 
   -- Map <Leader>nr to rename selected file/directory
-vim.api.nvim_set_keymap('n', 'r', ':NvimTreeRename<CR>', { noremap = true, silent = true })
+  vim.api.nvim_set_keymap('n', 'r', ':NvimTreeRename<CR>', { noremap = true, silent = true }),
+}
+
+return keymaps