diff --git a/config/.config/nvim/after/ftplugin/go.vim b/config/.config/nvim/after/ftplugin/go.vim
index 81ba35f..120df70 100644
--- a/config/.config/nvim/after/ftplugin/go.vim
+++ b/config/.config/nvim/after/ftplugin/go.vim
@@ -1,3 +1,7 @@
 set tabstop=2
-set softtabstop=2
 set shiftwidth=2
+set softtabstop=2
+set expandtab
+
+set textwidth=80
+set colorcolumn=80
diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua
index 7772bff..1238e0e 100644
--- a/vim/.vim/lua/plugins/google.lua
+++ b/vim/.vim/lua/plugins/google.lua
@@ -38,7 +38,7 @@ return {
 	glug("googlepaths"),
 	-- Set up syntax, indent, and core settings for various filetypes
 	superlazy(glug("ft-cpp", { event = "BufRead,BufNewFile *.[ch],*.cc,*.cpp" })),
-	-- superlazy(glug("ft-go", { event = "BufRead,BufNewFile *.go" })),
+	superlazy(glug("ft-go", { event = "BufRead,BufNewFile *.go" })),
 	superlazy(glug("ft-java", { event = "BufRead,BufNewFile *.java" })),
 	superlazy(glug("ft-javascript", { event = "BufRead,BufNewFile *.js,*.jsx" })),
 	superlazy(glug("ft-kotlin", { event = "BufRead,BufNewFile *.kt,*.kts" })),
diff --git a/vim/.vim/lua/plugins/neotree.lua b/vim/.vim/lua/plugins/neotree.lua
index 894c1bf..bc34fd8 100644
--- a/vim/.vim/lua/plugins/neotree.lua
+++ b/vim/.vim/lua/plugins/neotree.lua
@@ -1,52 +1,57 @@
 local use_google = require("utils").use_google
 
 return {
-  -- {
-  -- 	"cmdtree",
-  -- 	dir = "~/cmdtree",
-  -- },
-  {
-    "nvim-neo-tree/neo-tree.nvim",
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-      "MunifTanjim/nui.nvim",
-      --			"~/cmdtree",
-    },
-    cmd = {
-      "Neotree",
-    },
-    config = function()
-      require("neo-tree").setup({
-        hijack_netrw_behavior = "open_default",
-        filesystem = {
-          filtered_items = {
-            hide_dotfiles = false,
-          },
-          bind_to_cwd = false,
-        },
-        sources = {
-          "filesystem",
-          "buffers",
-          "git_status",
-          --"cmdtree",
-          -- ...and any additional source
-        },
-        window = {
-          mappings = {
-            ["O"] = "expand_all_nodes",
-          },
-        },
-      })
-    end,
+	-- {
+	-- 	"cmdtree",
+	-- 	dir = "~/cmdtree",
+	-- },
+	{
+		"nvim-neo-tree/neo-tree.nvim",
+		branch = "v3.x",
+		lazy = false, -- neo-tree will lazily load itself
+		dependencies = {
+			"nvim-lua/plenary.nvim",
+			"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+			"MunifTanjim/nui.nvim",
+			-- {"3rd/image.nvim", opts = {}}, -- Optional image support in preview window: See `# Preview Mode` for more information
+		},
+		-----@module "neo-tree"
+		-----@type neotree.Config
+		opts = {
+			filesystem = {
+				hijack_netrw_behavior = "open_default",
+				filtered_items = {
+					hide_dotfiles = false,
+				},
+				-- follow_current_file = {
+				-- 	enabled = true,
+				-- 	leave_dirs_open = false,
+				-- },
+				group_empty_dirs = true,
+			},
+			sources = {
+				"filesystem",
+				"buffers",
+				"git_status",
+				--"cmdtree",
+				-- ...and any additional source
+			},
+			window = {
+				mappings = {
+					["O"] = "expand_all_nodes",
+				},
+			},
+		},
     -- stylua: ignore
     keys = {
       (function()
-        if use_google() then
-          return { "<C-n>m", ":Neotree float cmdtree<CR>", desc = "Open NeoTree CWD float" }
-        end
+        -- if use_google() then
+        --   return { "<C-n>m", ":Neotree float cmdtree<CR>", desc = "Open NeoTree CWD float" }
+        -- end
         return { "<C-n>m", ":Neotree float git_status<CR>", desc = "Open NeoTree CWD float" }
       end)(),
-      { "<C-n>", ":Neotree toggle left dir=%:p:h<cr>" },
+      { "<C-n>", ":Neotree reveal left<cr>" },
+      { "<C-n>.", ":Neotree reveal left dir=%:p:h<cr>" },
     },
-  },
+	},
 }