diff --git a/dots/.nvim-environments/primary/config/lua/core/autocmds.lua b/dots/.nvim-environments/primary/config/lua/core/autocmds.lua
index 0f49c059..4ad4797c 100644
--- a/dots/.nvim-environments/primary/config/lua/core/autocmds.lua
+++ b/dots/.nvim-environments/primary/config/lua/core/autocmds.lua
@@ -12,39 +12,6 @@ M.setup = function()
     vim.api.nvim_create_autocmd("BufWritePre", {
         command = "%s/\\s\\+$//e",
     })
-
-    -- -- NOTE: Handles scenarios in which the filetype isn't detected on load
-    -- vim.api.nvim_create_autocmd('BufReadPost', {
-    --     pattern = '*',
-    --     callback = function()
-    --         local opt_ft = vim.opt_local.ft:get()
-    --         if opt_ft == nil or opt_ft == '' then
-    --             vim.cmd('filetype detect')
-    --         end
-    --     end,
-    -- })
-
-    -- NOTE: Local cursorline
-    vim.api.nvim_create_autocmd("BufEnter", {
-        pattern = "*",
-        callback = function()
-            vim.opt_local.cursorline = true
-        end,
-    })
-
-    vim.api.nvim_create_autocmd("WinEnter", {
-        pattern = "*",
-        callback = function()
-            vim.opt_local.cursorline = true
-        end,
-    })
-
-    vim.api.nvim_create_autocmd("WinLeave", {
-        pattern = "*",
-        callback = function()
-            vim.opt_local.cursorline = false
-        end,
-    })
 end
 
 return M
diff --git a/dots/.nvim-environments/primary/config/lua/core/options.lua b/dots/.nvim-environments/primary/config/lua/core/options.lua
index ab816f7a..70687250 100755
--- a/dots/.nvim-environments/primary/config/lua/core/options.lua
+++ b/dots/.nvim-environments/primary/config/lua/core/options.lua
@@ -72,6 +72,9 @@ M.setup = function()
     opt.conceallevel = 2
     opt.concealcursor = "ic"
 
+    -- Cursor line highlight
+    opt.cursorline = true
+
     -- Lazy Redraw to Speed Up Macros
     opt.lazyredraw = true