diff --git a/init.lua b/init.lua
index 14722ac7..97b8d667 100644
--- a/init.lua
+++ b/init.lua
@@ -3,8 +3,6 @@
 --  NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
 
 -- Install package manager
 --    https://github.com/folke/lazy.nvim
@@ -49,7 +47,7 @@ require('lazy').setup({
 
       -- Useful status updates for LSP
       -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-      { 'j-hui/fidget.nvim', tag = 'legacy', opts = {} },
+      { 'j-hui/fidget.nvim',       tag = 'legacy', opts = {} },
 
       -- Additional lua configuration, makes nvim stuff amazing!
       'folke/neodev.nvim',
@@ -73,7 +71,7 @@ require('lazy').setup({
   },
 
   -- Useful plugin to show you pending keybinds.
-  { 'folke/which-key.nvim', opts = {} },
+  { 'folke/which-key.nvim',  opts = {} },
   {
     -- Adds git related signs to the gutter, as well as utilities for managing changes
     'lewis6991/gitsigns.nvim',
@@ -87,7 +85,8 @@ require('lazy').setup({
         changedelete = { text = '~' },
       },
       on_attach = function(bufnr)
-        vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
+        vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk,
+          { buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
         vim.keymap.set('n', '<leader>gn', require('gitsigns').next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' })
         vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
       end,
@@ -164,10 +163,10 @@ require('lazy').setup({
   -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
   --       These are some example plugins that I've included in the kickstart repository.
   --       Uncomment any of the lines below to enable them.
-    require 'lornest.plugins.fugitive',
-    require 'lornest.plugins.harpoon',
-    require 'lornest.plugins.copilot',
-    require 'lornest.plugins.nvim-tree',
+  require 'lornest.plugins.fugitive',
+  require 'lornest.plugins.harpoon',
+  require 'lornest.plugins.copilot',
+  require 'lornest.plugins.nvim-tree',
   -- require 'kickstart.plugins.autoformat',
   -- require 'kickstart.plugins.debug',
 
@@ -404,7 +403,7 @@ end
 --  define the property 'filetypes' to the map in question.
 local servers = {
   -- clangd = {},
-  -- gopls = {},
+  gopls = {},
   -- pyright = {},
   -- rust_analyzer = {},
   -- tsserver = {},
diff --git a/lua/lornest/plugins/copilot.lua b/lua/lornest/plugins/copilot.lua
index 68920a62..b6b28526 100644
--- a/lua/lornest/plugins/copilot.lua
+++ b/lua/lornest/plugins/copilot.lua
@@ -1,5 +1,23 @@
 return {
     {
-        "github/copilot.vim",
+        "zbirenbaum/copilot.lua",
+        cmd = "Copilot",
+        event = "InsertEnter",
+        config = function()
+            require("copilot").setup({
+               suggestion = {
+                    enabled = true,
+                    auto_trigger = true,
+                    keymap = {
+                        accept = "<Right>",
+                        accept_word = false,
+                        accept_line = false,
+                        next = "<A-Down>",
+                        prev = "<A-Up>",
+                        dismiss = "<C-]>",
+                    }
+                }
+            })
+        end
     },
 }
diff --git a/lua/lornest/plugins/harpoon.lua b/lua/lornest/plugins/harpoon.lua
index 96b82e8b..4d0a6807 100644
--- a/lua/lornest/plugins/harpoon.lua
+++ b/lua/lornest/plugins/harpoon.lua
@@ -4,10 +4,10 @@ return {
     local mark = require("harpoon.mark")
     local ui = require("harpoon.ui")
 
-    vim.keymap.set("n", "<leader>ha", mark.add_file)
+    vim.keymap.set("n", "<leader>m", mark.add_file)
     vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
 
-    vim.keymap.set("n", "<leader>hn", function() ui.nav_next() end)
-    vim.keymap.set("n", "<leader>hp", function() ui.nav_prev() end)
+    vim.keymap.set("n", "<C-h>", function() ui.nav_prev() end)
+    vim.keymap.set("n", "<C-j>", function() ui.nav_next() end)
   end,
 }
diff --git a/lua/lornest/plugins/nvim-tree.lua b/lua/lornest/plugins/nvim-tree.lua
index 968462f5..d12ea717 100644
--- a/lua/lornest/plugins/nvim-tree.lua
+++ b/lua/lornest/plugins/nvim-tree.lua
@@ -7,7 +7,7 @@ return {
   },
   config = function()
     require("nvim-tree").setup {
-      vim.api.nvim_set_keymap("n", "<C-h>", ":NvimTreeToggle<cr>", {silent = true, noremap = true})
+      vim.api.nvim_set_keymap("n", "<C-a>", ":NvimTreeToggle<cr>", {silent = true, noremap = true})
     }
   end,
 }