diff --git a/lua/options/opts.lua b/lua/options/opts.lua index c68d6fe..08c0c69 100755 --- a/lua/options/opts.lua +++ b/lua/options/opts.lua @@ -8,7 +8,6 @@ o.autowrite = true -- auto write buffer when it's not focused o.ignorecase = true -- case insensitive on search.. o.list = true -- display listchars o.smartindent = true -- smarter indentation -o.smarttab = true -- make tab behaviour smarter o.splitright = true -- split right instead of left o.splitkeep = "screen" -- stabilize split o.startofline = false -- don't go to the start of the line when moving to another file @@ -17,6 +16,11 @@ o.termguicolors = true -- true colours for better experience o.wrap = false -- don't wrap lines o.backupcopy = "yes" -- fix weirdness for stuff that replaces the entire file when hot reloading +o.smarttab = false -- make tab behaviour smarter +o.tabstop = 4 +o.softtabstop = 2 +o.shiftwidth = 2 + o.compatible = false -- disable compatibility with old vi o.showmatch = true -- show matches while searching for text o.hlsearch = true -- highlight text that has been searched diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua index 04f7b99..238be07 100755 --- a/lua/plugins/gitsigns.lua +++ b/lua/plugins/gitsigns.lua @@ -42,7 +42,4 @@ require('gitsigns').setup { col = 1 }, - yadm = { - enable = false - }, } diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 6b02a0a..4fd225e 100755 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -6,10 +6,7 @@ require("plugins.devicons") require("plugins.lualine") require("plugins.hlblocks") require("plugins.gitsigns") --- require("plugins.nvimtree") --- require("plugins.bufferline") require("plugins.wilder") require("plugins.mini") require("plugins.oil") --- require("plugins.fterm") require("plugins.telescope") diff --git a/lua/plugins/lazy.lua b/lua/plugins/lazy.lua index d9816e1..d48af8b 100755 --- a/lua/plugins/lazy.lua +++ b/lua/plugins/lazy.lua @@ -1,4 +1,3 @@ - local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim' if not vim.loop.fs_stat(lazypath) then @@ -49,6 +48,13 @@ require('lazy').setup({ end }, + { + 'OXY2DEV/markview.nvim', + config = function() + require('markview').setup() + end + }, + { 'shellRaining/hlchunk.nvim', event = { @@ -104,5 +110,5 @@ require('lazy').setup({ vim.opt.laststatus=2 -vim.keymap.set('i', '', [[pumvisible() ? '\' : '\']], { expr = true }) -vim.keymap.set('i', '', [[pumvisible() ? '\' : '\']], { expr = true }) +-- vim.keymap.set('i', '', [[pumvisible() ? '\' : '\']], { expr = true }) +-- vim.keymap.set('i', '', [[pumvisible() ? '\' : '\']], { expr = true }) diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua index fdb68d4..7d7fc84 100755 --- a/lua/plugins/mini.lua +++ b/lua/plugins/mini.lua @@ -1,6 +1,5 @@ require('mini.cursorword').setup() require('mini.trailspace').setup() -require('mini.comment').setup() require('mini.pairs').setup()