diff --git a/lua/gabrielgio/init.lua b/lua/gabrielgio/init.lua
index 1cd849a61e54e44f34bb38d298b1d1fe67b835aa..d2eafa8acda729366fba99039a4d75859a110a2a 100644
--- a/lua/gabrielgio/init.lua
+++ b/lua/gabrielgio/init.lua
@@ -2,10 +2,10 @@ local mini_deps = require('mini.deps')
 local now, later = mini_deps.now, mini_deps.later
 
 now(function() require("gabrielgio.settable") end)
-now(function() require("gabrielgio.treesitter") end)
-now(function() require("gabrielgio.lazy") end)
 now(function() require("gabrielgio.lsp") end)
+now(function() require("gabrielgio.lazy") end)
 
+later(function() require("gabrielgio.treesitter") end)
 later(function() require("gabrielgio.mini") end)
 later(function() require("gabrielgio.go") end)
 later(function() require("gabrielgio.telescope") end)
diff --git a/lua/gabrielgio/lazy.lua b/lua/gabrielgio/lazy.lua
index 50fd3a5ebadf09537b93080ee3e1ff462d9b2a42..2179cb8b6c47616fd3f114337dbaee021d88571b 100644
--- a/lua/gabrielgio/lazy.lua
+++ b/lua/gabrielgio/lazy.lua
@@ -1,5 +1,6 @@
 -- this file is an amalgamation of configurations that don't have its own
 -- config file and will be lazily loaded
+require('neogit').setup()
 require('formatter').setup()
 require("mason").setup()
 require("mason-lspconfig").setup {
diff --git a/lua/gabrielgio/lsp.lua b/lua/gabrielgio/lsp.lua
index 2be8b5ec662e004de50ee8a40a43d45df8f91074..5ce2ed5666fa9130d23e912f41ceec9472fb1a1d 100644
--- a/lua/gabrielgio/lsp.lua
+++ b/lua/gabrielgio/lsp.lua
@@ -20,7 +20,7 @@     return bufnr
 end
 
 local function setup(f)
-    return f({capabilities = capabilities, on_attach = on_attach})
+    return f({on_attach = on_attach})
 end
 
 local function load_all(l)
@@ -40,7 +40,6 @@     lsp_config.tsserver.setup
 })
 
 lsp_config.gopls.setup({
-    capabilities = capabilities,
     cmd_env = {GOFLAGS = "-tags=unit,integration,e2e"},
     on_attach = on_attach
 })