diff --git a/nvim/init.lua b/nvim/init.lua index b346b37..c22161b 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -21,17 +21,17 @@ require("settings.keymaps") require("settings.barbar") -- -- -- simple plugins that don't make sense to put in a seperate file, would clutter too much --- -- require("gitsigns").setup() - require("feline").setup() - require("impatient").enable_profile() - require('Comment').setup() - require("toggleterm").setup({ - autochdir = true, - }) - require('leap').add_default_mappings() - require("nvim-highlight-colors").setup { - render = 'background', -- or 'foreground' or 'first_column' - enable_named_colors = true, - enable_tailwind = true, - } --- require('neoscroll').setup() +require("gitsigns").setup() +require("feline").setup() +require("impatient").enable_profile() +require('Comment').setup() +require("toggleterm").setup({ + autochdir = true, +}) +require('leap').add_default_mappings() +require("nvim-highlight-colors").setup { + render = 'background', -- or 'foreground' or 'first_column' + enable_named_colors = true, + enable_tailwind = true, +} +require('neoscroll').setup() diff --git a/nvim/lua/settings/autocommands.lua b/nvim/lua/settings/autocommands.lua index 0c39313..23e4c35 100644 --- a/nvim/lua/settings/autocommands.lua +++ b/nvim/lua/settings/autocommands.lua @@ -27,4 +27,8 @@ vim.cmd([[highlight BufferInactiveMod guifg=#dbc074 guibg=#131a24]]) vim.cmd([[highlight BufferInactiveSign guifg=#719cd6 guibg=#131a24]]) vim.cmd([[highlight LspInlayHint guibg=#192330]]) +vim.cmd(":syntax off") +vim.cmd([[highlight CursorLine guibg=#1A1B27]]) +vim.cmd([[highlight CursorLineSign guibg=#1A1B27]]) +vim.cmd([[highlight CursorLineFold guibg=#1A1B27]]) diff --git a/nvim/lua/settings/options.lua b/nvim/lua/settings/options.lua index 4f38cf2..87c91c4 100644 --- a/nvim/lua/settings/options.lua +++ b/nvim/lua/settings/options.lua @@ -1,31 +1,14 @@ local options = { - clipboard = "unnamedplus", - mouse = "n", - fileencoding = "utf-8", - relativenumber = true, - cursorline = false, - number = true, - smartindent = true, - smartcase = true, - showmode = true, - termguicolors = true, - ignorecase = true, - showtabline = 2, - timeoutlen = 200, -- time to wait for a mapped sequence to complete (in milliseconds) - undofile = true, -- enable persistent undoi updatetime = 300, -- faster completion (4000ms default) - writebackup = false, -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited - -- expandtab = true, -- convert tabs to spaces - shiftwidth = 2, -- the number of spaces inserted for each indentation - tabstop = 2, -- insert 2 spaces for a tab - scrolloff = 8, - sidescrolloff = 8, - spell = false, - syntax = "off", - spelllang = "en_us", - mousemodel = "popup_setpos", - shell = "/usr/bin/zsh", - autochdir = true, - lazyredraw = true, + clipboard = "unnamedplus", + mouse = "n", + fileencoding = "utf-8", + number = true, + showmode = true, + termguicolors = true, + spelllang = "en_us", + shell = "/usr/bin/zsh", + autochdir = true, + cursorline = true, } vim.g.mkdp_browser = '/usr/bin/firefox' @@ -36,5 +19,5 @@ vim.g.mapleader = " " vim.keymap.set("n", "", "", { silent = true, noremap = false }) for k, v in pairs(options) do - vim.opt[k] = v + vim.opt[k] = v end