Merge remote-tracking branch 'origin/dev'

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

lua/plugins/gitsigns.lua

@@ -42,7 +42,4 @@ require('gitsigns').setup {
         col = 1
     },
 
-    yadm = {
-        enable = false
-    },
 }

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")

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', '<Tab>',   [[pumvisible() ? '\<C-n>' : '\<Tab>']],   { expr = true })
+-- vim.keymap.set('i', '<Tab>',   [[pumvisible() ? '\<C-n>' : '\<Tab>']],   { expr = true })
-vim.keymap.set('i', '<S-Tab>', [[pumvisible() ? '\<C-p>' : '\<S-Tab>']], { expr = true })
+-- vim.keymap.set('i', '<S-Tab>', [[pumvisible() ? '\<C-p>' : '\<S-Tab>']], { expr = true })

lua/plugins/mini.lua

@@ -1,6 +1,5 @@
 require('mini.cursorword').setup()
 require('mini.trailspace').setup()
-require('mini.comment').setup()
 require('mini.pairs').setup()