diff options
-rw-r--r-- | lua/settings.lua | 15 | ||||
-rw-r--r-- | lua/utils.lua | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/lua/settings.lua b/lua/settings.lua index 107d61bd..ac8114cb 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -1,10 +1,12 @@ ---vim.o.iskeyword="+=-" --treat dash separated words as a word text object" ---vim.o.shortmess="c" --Don't pass messages to |ins-completion-menu|. - ---vim.o.formatoptions="cro" --Stop newline continution of comments +vim.cmd('set iskeyword+=-') --treat dash separated words as a word text object" +vim.cmd('set shortmess+=c') --Don't pass messages to |ins-completion-menu|. +-- vim.cmd('set formatoptions-=cro') -- Stop newline continution of comments +-- vim.cmd('set fo-=ro') +-- vim.api.nvim_set_option('set fo-=ro', false) +-- vim.wo.formatoptions="" --Required to keep multiple buffers open multiple buffers vim.o.hidden=true --Required to keep multiple buffers open multiple buffers -vim.o.wrap=false --Display long lines as just one line ---vim.o.whichwrap="+=<,>,[,],h,l" +vim.wo.wrap=false --Display long lines as just one line +vim.cmd('set whichwrap+=<,>,[,],h,l') vim.o.encoding="utf-8" --The encoding displayed vim.o.pumheight=10 --Makes popup menu smaller vim.o.fileencoding="utf-8" --The encoding written to file @@ -23,7 +25,6 @@ vim.o.expandtab=true --Converts tabs to spaces vim.o.smartindent=true --Makes indenting smart vim.o.autoindent=true --Good auto indent vim.o.laststatus=2 --Always display the status line ---vim.o.number=true --Line numbers vim.wo.number = true vim.o.cursorline=true --Enable highlighting of the current line vim.o.background="dark" --tell vim what the background color looks like diff --git a/lua/utils.lua b/lua/utils.lua index 59c905f1..b5f1413b 100644 --- a/lua/utils.lua +++ b/lua/utils.lua @@ -23,7 +23,9 @@ end define_augroups( {_general_settings = { {'TextYankPost', '*', 'lua require(\'vim.highlight\').on_yank({higroup = \'IncSearch\', timeout = 200})'}, + {'BufWinEnter', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'}, + {'BufRead', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'}, + {'BufNewFile', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'}, }, } ) - |