feat(ui): fix line highlight

lua/myinit.lua

@@ -6,7 +6,6 @@ vim.fn.sign_define(
   { text = "", numhl = "DapBreakpointRejected", texthl = "DapBreakpointRejected" }
 )
 
-require "utils.autocmd"
-require "utils.usercmd"
-require "utils.options"
-require "utils.neovide"
+require("utils.autocmd")
+require("utils.usercmd")
+require("utils.neovide")

lua/options.lua

@@ -1,3 +1,18 @@
-require "nvchad.options"
+require("nvchad.options")
 
--- add yours here!
+local opt = vim.opt
+
+vim.g.dap_virtual_text = true
+vim.wo.relativenumber = true
+vim.wo.wrap = false
+vim.o.cursorlineopt = "number,line"
+-- opt.iskeyword:append("-")
+opt.foldmethod = "expr"
+opt.foldexpr = "nvim_treesitter#foldexpr()"
+opt.foldlevel = 20
+opt.ignorecase = true
+opt.wildignore:append({ "*/node_modules/*" })
+opt.clipboard:append({ "unnamedplus" })
+opt.iskeyword:append("-")
+opt.termguicolors = true -- True color support
+opt.autoindent = true    --- Good auto indent

lua/plugins/init.lua

@@ -375,11 +375,11 @@ local plugins = {
       },
       -- you can enable a preset for easier configuration
       presets = {
-        bottom_search = true,         -- use a classic bottom cmdline for search
-        command_palette = true,       -- position the cmdline and popupmenu together
+        bottom_search = true,     -- use a classic bottom cmdline for search
+        command_palette = true,   -- position the cmdline and popupmenu together
         long_message_to_split = true, -- long messages will be sent to a split
-        inc_rename = false,           -- enables an input dialog for inc-rename.nvim
-        lsp_doc_border = true,        -- add a border to hover docs and signature help
+        inc_rename = false,       -- enables an input dialog for inc-rename.nvim
+        lsp_doc_border = true,    -- add a border to hover docs and signature help
       },
     },
   },
@@ -428,10 +428,10 @@ local plugins = {
     opts = {
       enhanced_diff_hl = true,
       view = {
-        merge_tool = {
+        --[[ merge_tool = {
           layout = "diff3_mixed",
           disable_diagnostics = true,
-        },
+        }, ]]
       },
       keymaps = {
         view = {

lua/utils/options.lua

@@ -1,15 +0,0 @@
-local opt = vim.opt
-
-vim.g.dap_virtual_text = true
-vim.wo.relativenumber = true
-vim.wo.wrap = false
--- opt.iskeyword:append("-")
-opt.foldmethod = "expr"
-opt.foldexpr = "nvim_treesitter#foldexpr()"
-opt.foldlevel = 20
-opt.ignorecase = true
-opt.wildignore:append { "*/node_modules/*" }
-opt.clipboard:append { "unnamedplus" }
-opt.iskeyword:append "-"
-opt.termguicolors = true -- True color support
-opt.autoindent = true --- Good auto indent