diff --git a/.config/nvim/lua/my/settings.lua b/.config/nvim/lua/my/settings.lua index 61be97e..e7a004b 100644 --- a/.config/nvim/lua/my/settings.lua +++ b/.config/nvim/lua/my/settings.lua @@ -1,34 +1,42 @@ -vim.o.number = true -- line numbers -vim.o.list = true -- show whitespace -vim.o.listchars = 'tab:▸ ,trail:·,nbsp:+' -vim.o.textwidth = 80 -- default text width -vim.o.colorcolumn = tostring(vim.o.textwidth) -vim.o.wrap = false -- don't wrap long lines -vim.o.linebreak = true -- break on word boundaries -vim.o.cursorline = true -- highlight row with cursor -vim.o.scrolloff = 5 -- show 5 lines below/above cursor -vim.o.sidescrolloff = 5 -- same for left/right -vim.o.expandtab = true -- indent using spaces -vim.o.tabstop = 4 -- 1 tab = 4 spaces -vim.o.shiftwidth = 4 -- 1 indentation = 4 spaces -vim.o.completeopt = 'menu,menuone,noselect' -- completion popup -vim.o.autochdir = true -- change workir to current file dir -vim.o.updatetime = 500 -- fire CursorHold autocommand event -vim.o.cmdheight = 2 -- message area size -vim.o.mouse = '' -- make use of mouse in these modes -vim.o.pumheight = 10 -- maximum entries in popup menu -vim.o.smartindent = true -- indent after { and so on -vim.o.statusline = '%<%f %h%m%r%=%-16.(%l,%c%V (%P)%)%y' -vim.o.formatoptions = vim.o.formatoptions .. 'n' -vim.o.splitright = true -- split vertical window right +---@format disable-next +local options = { + number = true, -- line numbers + list = true, -- show whitespace + listchars = 'tab:▸ ,trail:·,nbsp:+', + textwidth = 80, -- default text width + colorcolumn = tostring(vim.o.textwidth), + wrap = false, -- don't wrap long lines + linebreak = true, -- break on word boundaries + cursorline = true, -- highlight row with cursor + scrolloff = 5, -- show 5 lines below/above cursor + sidescrolloff = 5, -- same for left/right + expandtab = true, -- indent using spaces + tabstop = 4, -- 1 tab = 4 spaces + shiftwidth = 4, -- 1 indentation = 4 spaces + completeopt = 'menu,menuone,noselect', -- completion popup + autochdir = true, -- change workir to current file dir + updatetime = 500, -- fire CursorHold autocommand event + cmdheight = 2, -- message area size + mouse = '', -- make use of mouse in these modes + pumheight = 10, -- maximum entries in popup menu + smartindent = true, -- indent after { and so on + statusline = '%<%f %h%m%r%=%-16.(%l,%c%V (%P)%)%y', + formatoptions = vim.o.formatoptions .. 'n', + splitright = true, -- split vertical window right +} +for k, v in pairs(options) do + vim.o[k] = v +end vim.api.nvim_create_user_command('Hv', 'vertical help ', { - nargs = 1, complete = 'help' }) + nargs = 1, complete = 'help' +}) vim.api.nvim_create_user_command('Ht', 'tab help ', { - nargs = 1, complete = 'help' }) + nargs = 1, complete = 'help' +}) -- theme -vim.o.termguicolors = true -- 24 bit colours +vim.o.termguicolors = true -- 24 bit colours vim.cmd('colorscheme amora') ---- make comments a bit lighter vim.api.nvim_set_hl(0, 'AmoraComment', { fg = '#7C4180', ctermfg = 61 })