diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index e5bc8c0..72cba92 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -34,5 +34,7 @@
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" },
   "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
-  "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }
+  "tiny-glimmer.nvim": { "branch": "main", "commit": "70234ad3d193a187c81cb16007100b790c9801fc" },
+  "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
+  "visual-whitespace.nvim": { "branch": "main", "commit": "99898e2c26d06c9109820236228c7ce6df86e51c" }
 }
diff --git a/nvim/lua/vim_opt.lua b/nvim/lua/vim_opt.lua
index 7465fd9..9a83bbd 100644
--- a/nvim/lua/vim_opt.lua
+++ b/nvim/lua/vim_opt.lua
@@ -8,12 +8,14 @@ opt.clipboard = "unnamedplus"
 
 -- Highlight the currently selected row
 opt.cursorline = true
-opt.cursorlineopt = "both"
+opt.cursorlineopt = "number"
 
 -- Indenting
 opt.expandtab = true
-opt.smartindent = true
+opt.cindent = true
+-- opt.smartindent = true
 opt.breakindent = true
+opt.breakindentopt = "list:-1"
 opt.shiftwidth = 4
 opt.tabstop = 4
 opt.softtabstop = 4
@@ -75,4 +77,22 @@ opt.sessionoptions = { "buffers", "curdir", "winsize", "winpos", "skiprtp" }
 -- See comment in lspsetup autocmd for LspAttach
 -- opt.completeopt = "menu,menuone,noselect,fuzzy"
 
+opt.fileignorecase = true
+
+-- This always keeps the windows equal in size
+opt.equalalways = true
+
+opt.linebreak = true
+opt.ruler = false
+opt.shiftround = true
+
+-- Faster draw
+opt.redrawtime = 150
+
+-- Disable lots of unnecessary warning notifications
+opt.shortmess = "acstFOSW"
+
+-- Allows to select one more after EOL
+opt.virtualedit = "onemore"
+
 return opt