diff --git a/lua/config/options.lua b/lua/config/options.lua
index e3abb4b..ce289d3 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -10,33 +10,33 @@ end
 
 -- General
 opt.clipboard = "unnamedplus" -- Sync with system clipboard
-opt.confirm = true            -- Confirm before closing unsaved buffer
-opt.cursorline = true         -- Highlight current line
-opt.mouse = "a"               -- Enable mouse
-opt.number = true             -- Show line numbers
-opt.relativenumber = true     -- Relative line numbers
-opt.signcolumn = "yes"        -- Always show sign column
-opt.termguicolors = true      -- True color support
-opt.wrap = false              -- Disable line wrap
+opt.confirm = true -- Confirm before closing unsaved buffer
+opt.cursorline = true -- Highlight current line
+opt.mouse = "a" -- Enable mouse
+opt.number = true -- Show line numbers
+opt.relativenumber = true -- Relative line numbers
+opt.signcolumn = "yes" -- Always show sign column
+opt.termguicolors = true -- True color support
+opt.wrap = true -- Enable line wrap
 
 -- Indentation
-opt.expandtab = true   -- Use spaces instead of tabs
-opt.shiftwidth = 2     -- Size of indent
-opt.tabstop = 2        -- Number of spaces tabs count for
+opt.expandtab = true -- Use spaces instead of tabs
+opt.shiftwidth = 2 -- Size of indent
+opt.tabstop = 4 -- Number of spaces tabs count for
 opt.smartindent = true -- Smart indentation
 
 -- Search
 opt.ignorecase = true -- Ignore case
-opt.smartcase = true  -- Don't ignore case with capitals
-opt.hlsearch = true   -- Highlight search results
-opt.incsearch = true  -- Show search results as you type
+opt.smartcase = true -- Don't ignore case with capitals
+opt.hlsearch = true -- Highlight search results
+opt.incsearch = true -- Show search results as you type
 
 -- Split behavior
 opt.splitbelow = true -- Put new windows below current
 opt.splitright = true -- Put new windows right of current
 
 -- Undo
-opt.undofile = true    -- Persistent undo
+opt.undofile = true -- Persistent undo
 opt.undolevels = 10000 -- Maximum undo levels
 
 -- Performance
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 0e3d316..e6190ee 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -63,7 +63,7 @@ return {
         -- Go
         gopls = {
           -- Root detection: find go.work first, then go.mod, then git root
-          -- root_dir = make_root_detector({ "go.work", "go.mod" }),
+          root_dir = make_root_detector({ "go.work", "go.mod" }),
           settings = {
             gopls = {
               gofumpt = true,