Update

3 files changed, 533 insertions, 498 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index 58277b9..17a97da 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -23,7 +23,7 @@ augroup tabinfo
   autocmd BufDelete * call RemoveBufFromTabs()
 
   function! AddBufToTab()
-    if !has_key(t:, 'bufs') | let t:['bufs'] = [] | endif
+    if !has_key(t:, 'bufs') | let t:bufs = [] | endif
     call add(t:bufs, bufnr()) | call sort(t:bufs) | call uniq(t:bufs)
   endfunc
   function! RemoveBufFromTabs()
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 4df45ad..ce6cf84 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -196,7 +196,6 @@ function! DeleteMark(mark)
 endfunc
 nnoremap dm :call DeleteMark(getchar())<CR>
 
-
 " Usage: z' to fold lines not near marks, use v:count to set offset
 "        For example: 15z'
 autocmd BufEnter * let b:fold_for_marks = 0
@@ -205,8 +204,8 @@ function! ToggleFoldForMarks(offset)
   if !b:fold_for_marks || a:offset
     " If toggling from other foldmethod, save view!
     if !b:fold_for_marks
-      mkview 
-      setlocal foldmethod=manual 
+      mkview
+      setlocal foldmethod=manual
     endif
 
     " Then clear all folds
@@ -242,6 +241,7 @@ function! ToggleFoldForMarks(offset)
     let b:fold_for_marks = 1
     echo "Folds for Marks"
   else
+    " Reset everything
     loadview
     let b:fold_for_marks = 0
     echo "Reset Folds"
@@ -249,6 +249,35 @@ function! ToggleFoldForMarks(offset)
 endfunction
 nnoremap <expr> z' ":\<C-u>call ToggleFoldForMarks("..v:count..")\<CR>"
 
+function! ChangeUnfold(downward, count)
+  " Only do this if foldmethod is manual or count is given
+  if &foldmethod != 'manual' || !a:count | return | endif
+
+  " Move to fold upward/downward
+  if downward
+    norm! zj
+  else
+    norm! zk
+  endif
+  let foldstart = foldclosed('.')
+  let foldend = foldclosedend('.')
+
+  " Change folding area
+  norm! zd
+  let move = (a:count ? a:count : 1)
+  if downward
+    let foldstart += move
+  else
+    let foldend -= move
+  endif
+  exe foldstart..","..foldend.."fold"
+
+  " Get back to origin cursor position
+  norm! ''
+endfunc
+nnoremap <expr> z> ":\<C-u>call ChangeUnfold(1,"..v:count..")\<CR>"
+nnoremap <expr> z< ":\<C-u>call ChangeUnfold(0,"..v:count..")\<CR>"
+
 "}}}
 " EDIT {{{
 
diff --git a/vim/mini.lua b/vim/mini.lua
index 01e0cf1..750c94e 100644
--- a/vim/mini.lua
+++ b/vim/mini.lua
@@ -3,6 +3,343 @@
 -- Ref: https://github.com/echasnovski/mini.nvim
 --      https://lazy.folke.io/spec
 
+-- Install mini.nvim {{{
+-- Put this at the top of 'init.lua'
+local path_package = vim.fn.stdpath("data") .. "/site"
+local mini_path = path_package .. "/pack/deps/start/mini.nvim"
+vim.o.packpath = path_package
+
+if not vim.loop.fs_stat(mini_path) then
+  vim.cmd('echo "Installing `mini.nvim`" | redraw')
+  local clone_cmd = {
+    "git",
+    "clone",
+    "--filter=blob:none",
+    -- Uncomment next line to use 'stable' branch
+    -- '--branch', 'stable',
+    "https://github.com/echasnovski/mini.nvim",
+    mini_path,
+  }
+  vim.fn.system(clone_cmd)
+  vim.cmd("packadd mini.nvim | helptags ALL")
+end
+
+-- }}}
+-- mini.deps {{{
+require("mini.deps").setup({
+  path = { package = path_package },
+})
+Add, Now, Later = MiniDeps.add, MiniDeps.now, MiniDeps.later
+-- }}}
+-- -- mini.basics {{{
+-- require("mini.basics").setup()
+-- -- }}}
+-- mini.misc {{{
+require("mini.misc").setup({
+  make_global = { "put", "put_text", "zoom" },
+})
+vim.keymap.set( 'n', '<leader>Z', function()
+  zoom()
+  vim.cmd("silent! call ToggleWinPadding()")
+end, { buffer = bufnr, desc = 'zoom' })
+--}}}
+-- mini.extra {{{
+require("mini.extra").setup()
+-- }}}
+-- mini.colors {{{
+require("mini.colors").setup()
+vim.keymap.set("n", "<leader><leader>co", function()
+  require("mini.colors").interactive()
+end)
+-- }}}
+-- mini.base16 {{{
+require("mini.base16").setup({
+  palette = {
+    -- Default Background
+    base00 = "#2d2a2e",
+    -- Lighter Background (Used for status bars, line number and folding marks)
+    base01 = "#37343a",
+    -- Selection Background
+    base02 = "#423f46",
+    -- Comments, Invisible, Line Highlighting
+    base03 = "#848089",
+    -- Dark Foreground (Used for status bars)
+    base04 = "#66d9ef",
+    -- Default Foreground, Caret, Delimiters, Operators
+    base05 = "#e3e1e4",
+    -- Light Foreground (Not often used)
+    base06 = "#a1efe4",
+    -- Light Background (Not often used)
+    base07 = "#f8f8f2",
+    -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+    base08 = "#f85e84",
+    -- Integers, Boolean, Constants, XML Attributes, Markup Link Url
+    base09 = "#ef9062",
+    -- Classes, Markup Bold, Search Text Background
+    base0A = "#a6e22e",
+    -- Strings, Inherited Class, Markup Code, Diff Inserted
+    base0B = "#e5c463",
+    -- Support, Regular Expressions, Escape Characters, Markup Quotes
+    base0C = "#66d9ef",
+    -- Functions, Methods, Attribute IDs, Headings
+    base0D = "#9ecd6f",
+    -- Keywords, Storage, Selector, Markup Italic, Diff Changed
+    base0E = "#a1efe4",
+    -- Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
+    base0F = "#f9f8f5",
+  },
+  use_cterm = false,
+})
+--
+-- Override settings for search
+vim.cmd("hi Search guibg=#e5c07b")
+--
+-- Resume terminal color
+for i = 1, 15, 1 do
+  vim.cmd("let terminal_color_" .. i .. " = ''")
+end
+--
+-- Override settings for bufferline
+vim.cmd("hi BufferLineTabSelected guibg=#f85e84")
+vim.cmd("hi BufferLineTab guibg=Gray")
+--
+--}}}
+-- mini.icons {{{
+require("mini.icons").setup({})
+--}}}
+-- mini.comment {{{
+require("mini.comment").setup({
+  -- Module mappings. Use `''` (empty string) to disable one.
+  mappings = {
+    -- Toggle comment (like `gcip` - comment inner paragraph) for both
+    -- Normal and Visual modes
+    comment = "gc",
+    --
+    -- Toggle comment on current line
+    comment_line = "<C-/>",
+    --
+    -- Toggle comment on visual selection
+    comment_visual = "<C-/>",
+    --
+    -- Define 'comment' textobject (like `dgc` - delete whole comment block)
+    -- Works also in Visual mode if mapping differs from `comment_visual`
+    textobject = "gc",
+  },
+}) -- }}}
+-- mini.cursorword {{{
+require("mini.cursorword").setup()
+-- }}}
+-- mini.diff {{{
+require("mini.diff").setup({
+  -- Options for how hunks are visualized
+  view = {
+    -- Visualization style. Possible values are 'sign' and 'number'.
+    -- Default: 'number' if line numbers are enabled, 'sign' otherwise.
+    style = "sign",
+    --
+    -- Signs used for hunks with 'sign' view
+    signs = { add = "+", change = "▒", delete = "-" },
+    --
+    -- Priority of used visualization extmarks
+    priority = 199,
+  },
+})
+--
+vim.keymap.set("n", "\\gh", function()
+  MiniDiff.toggle_overlay()
+end, { buffer = bufnr, desc = "Toggle diff" })
+--
+-- }}}
+-- mini.map {{{
+require("mini.map").setup()
+vim.keymap.set("n", "\\m", function()
+  require("mini.map").toggle()
+end, { desc = "Minimap", buffer = bufnr })
+-- }}}
+-- mini.visits {{{
+
+require("mini.visits").setup()
+-- vim.keymap.set("n", "<leader><leader>li", function()
+--      MiniVisits.list_paths()
+-- end, { buffer = bufnr, desc = "" })
+--
+-- }}}
+-- mini.ai {{{
+require("mini.ai").setup {}
+-- }}}
+-- mini.surround {{{
+require("mini.surround").setup {
+  mappings = {
+    add = 's'
+  }
+}
+-- }}}
+-- mini.indentscope {{{
+require("mini.indentscope").setup()
+-- }}}
+-- mini.splitjoin {{{
+require("mini.splitjoin").setup()
+-- }}}
+-- mini.move {{{
+require("mini.move").setup()
+-- }}}
+-- mini.hipatterns {{{
+--
+local hipatterns = require("mini.hipatterns")
+hipatterns.setup({
+  highlighters = {
+    -- Highlight standalone 'FIXME', 'HACK', 'TODO', 'NOTE'
+    fixme = { pattern = "%f[%w]()FIXME()%f[%W]", group = "MiniHipatternsFixme" },
+    hack = { pattern = "%f[%w]()HACK()%f[%W]", group = "MiniHipatternsHack" },
+    todo = { pattern = "%f[%w]()TODO()%f[%W]", group = "MiniHipatternsTodo" },
+    note = { pattern = "%f[%w]()NOTE()%f[%W]", group = "MiniHipatternsNote" },
+    --
+    -- Highlight hex color strings (`#rrggbb`) using that color
+    hex_color = hipatterns.gen_highlighter.hex_color(),
+  },
+})
+vim.keymap.set("n", "<leader><leader>hi", function()
+  MiniHipatterns.toggle()
+end, { buffer = bufnr, desc = "Toggle hex color highlight" })
+--
+-- }}}
+-- mini.pairs {{{
+require("mini.pairs").setup()
+-- }}}
+-- -- mini.statusline {{{
+-- --
+-- require("mini.statusline").setup({
+--   content = {
+--     active = status_config,
+--   },
+-- })
+-- local function diagnostics_table(args)
+--   local info = vim.b.coc_diagnostic_info
+--   if MiniStatusline.is_truncated(args.trunc_width) or info == nil then
+--     return {}
+--   end
+--   local table = {}
+--   table.e = (info["error"] or 0) > 0 and "E" .. info["error"] or ""
+--   table.w = (info["warning"] or 0) > 0 and "W" .. info["warning"] or ""
+--   table.h = (info["hint"] or 0) > 0 and "H" .. info["hint"] or ""
+--   table.i = (info["information"] or 0) > 0 and "I" .. info["information"] or ""
+--   table.s = vim.g.coc_status
+--   return table
+-- end
+--
+-- function status_config()
+--   local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 })
+--   local git = MiniStatusline.section_git({ trunc_width = 75 })
+--   local diagnostics = diagnostics_table({ trunc_width = 75 })
+--   local filename = MiniStatusline.section_filename({ trunc_width = 140 })
+--   local fileinfo = MiniStatusline.section_fileinfo({ trunc_width = 120 })
+--   local location = MiniStatusline.section_location({ trunc_width = 75 })
+--
+--   return MiniStatusline.combine_groups({
+--     { hl = mode_hl,                 strings = { mode } },
+--     { hl = "MiniStatuslineDevinfo", strings = { git, diagnostics["s"] } },
+--     { hl = "MiniStatuslineError",   strings = { diagnostics["e"] } },
+--     { hl = "MiniStatuslineWarning", strings = { diagnostics["w"] } },
+--     { hl = "MiniStatuslineInfo",    strings = { diagnostics["i"] } },
+--     { hl = "MiniStatuslineHint",    strings = { diagnostics["h"] } },
+--     "%<", -- Mark general truncate point
+--     { hl = "MiniStatuslineFilename", strings = { filename } },
+--     "%=", -- End left alignment
+--     { hl = "MiniStatuslineFileinfo", strings = { fileinfo } },
+--     { hl = mode_hl,                  strings = { location } },
+--   })
+-- end
+--
+-- -- }}}
+-- -- mini.completion {{{
+-- require('mini.completion').setup()
+-- -- }}}
+-- -- mini.tabline {{{
+--
+-- require('mini.tabline').setup {
+--   format = function(buf_id, label)
+--     local suffix = vim.bo[buf_id].modified and '+ ' or ''
+--     return MiniTabline.default_format(buf_id, label) .. suffix
+--   end,
+--   tabpage_section = 'right'
+-- }
+--
+-- for i = 1, 9, 1 do
+--   vim.keymap.set("n", string.format("<A-%s>", i), function()
+--     vim.api.nvim_set_current_buf(vim.fn.getbufinfo({ buflisted=true })[i].bufnr)
+--   end, {silent = true})
+-- end
+--
+-- -- }}}
+-- -- mini.clue {{{
+-- local miniclue = require('mini.clue')
+-- miniclue.setup({
+--   triggers = {
+--     -- Leader triggers
+--     { mode = 'n', keys = '<Leader>' },
+--     { mode = 'x', keys = '<Leader>' },
+--
+--     -- Built-in completion
+--     { mode = 'i', keys = '<C-x>' },
+--
+--     -- `g` key
+--     { mode = 'n', keys = 'g' },
+--     { mode = 'x', keys = 'g' },
+--
+--     -- Marks
+--     { mode = 'n', keys = "'" },
+--     { mode = 'n', keys = '`' },
+--     { mode = 'x', keys = "'" },
+--     { mode = 'x', keys = '`' },
+--
+--     -- Registers
+--     { mode = 'n', keys = '"' },
+--     { mode = 'x', keys = '"' },
+--     { mode = 'i', keys = '<C-r>' },
+--     { mode = 'c', keys = '<C-r>' },
+--
+--     -- Window commands
+--     { mode = 'n', keys = '<C-w>' },
+--
+--     -- `z` key
+--     { mode = 'n', keys = 'z' },
+--     { mode = 'x', keys = 'z' },
+--   },
+--
+--   clues = {
+--     -- Enhance this by adding descriptions for <Leader> mapping groups
+--     miniclue.gen_clues.builtin_completion(),
+--     miniclue.gen_clues.g(),
+--     miniclue.gen_clues.marks(),
+--     miniclue.gen_clues.registers(),
+--     miniclue.gen_clues.windows(),
+--     miniclue.gen_clues.z(),
+--   },
+-- -- }}}
+-- -- mini.bufremote {{{
+-- require('mini.bufremove')
+--}}}
+-- -- mini.animate --{{{
+-- require("mini.animate").setup()
+-- -- }}}
+-- -- suda {{{
+-- add { source = "lambdalisue/suda.vim" }
+-- }}}
+-- -- true-zen {{{
+-- Add({
+--   source = "Pocco81/true-zen.nvim",
+-- })
+-- vim.keymap.set("n", "<leader>z", ":TZAtaraxis<CR>")
+-- -- }}}
+-- marks.nvim {{{
+Add {
+  source = "chentoast/marks.nvim"
+}
+require('marks').setup {
+}
+vim.cmd("hi MarkSignHL guifg=#f85e84 guibg=#37343a")
+-- }}}
+
 -- Install Lazy {{{
 -- Bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
@@ -10,10 +347,172 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
   local lazyrepo = "https://github.com/folke/lazy.nvim.git"
   vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
 end
-vim.opt.rtp:prepend(lazypath)
+vim.cmd("set rtp+="..lazypath)
 -- }}}
 require("lazy").setup({
   -- "tpope/vim-sleuth",
+-- bufferline {{{
+  {
+    "akinsho/bufferline.nvim",
+    lazy = false,
+    dependencies = {
+      "nvim-tree/nvim-web-devicons",
+      "tiagovla/scope.nvim",
+    },
+    config = function()
+      require('bufferline').setup{
+        options = {
+          numbers = 'ordinal',
+          tab_size = 14,
+          separator_style = { "", "" },
+          themable = true,
+          buffer_close_icon = "",
+          close_icon = "",
+          groups = {
+            items = {
+              require("bufferline.groups").builtin.pinned:with({ icon = "󰐃" }),
+            },
+          },
+          enforce_regular_tabs = false,
+          diagnostics = "coc",
+          diagnostics_update_in_insert = true,
+          diagnostics_indicator = function(count, level)
+            local icon = level:match("error") and " " or " "
+            return " " .. icon .. count
+          end,
+          offsets = {
+            {
+              filetype = "NvimTree",
+              text = "File Explorer",
+              highlight = "Directory",
+              text_align = "left"
+            },
+            {
+              filetype = "coc-explorer",
+              text = function()
+                return vim.fn.getcwd()
+              end,
+              highlight = "Directory",
+              text_align = "left"
+            },
+            {
+              filetype = 'vista',
+              text = function()
+                return vim.fn.getcwd()
+              end,
+              highlight = "Tags",
+              text_align = "right"
+            }
+          },
+          custom_filter = function (buf_number)
+            for _, p in ipairs(vim.t.bufs) do
+              if p == buf_number then
+                return true
+              end
+            end
+            return false
+          end
+        }
+      }
+      -- keymaps {{{
+        for i = 1, 9, 1 do
+          vim.keymap.set("n", string.format("<A-%s>", i), function()
+            vim.cmd("BufferLineGoToBuffer " .. i)
+          end, { silent = true })
+        end
+        local opts = { noremap = true, silent = true }
+        vim.keymap.set("n", "<TAB>", "<Cmd>BufferLineCyclePrev<CR>", opts)
+        vim.keymap.set("n", "<S-TAB>", "<Cmd>BufferLineCycleNext<CR>", opts)
+        vim.keymap.set("n", "<M-h>", "<Cmd>BufferLineMovePrev<CR>", opts)
+        vim.keymap.set("n", "<M-l>", "<Cmd>BufferLineMoveNext<CR>", opts)
+        vim.keymap.set("n", "<M-p>", "<Cmd>BufferLineTogglePin<CR>", opts)
+        -- }}}
+      end
+    },
+  -- }}}
+  -- lualine {{{
+  {
+    "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
+    init = function()
+      vim.g.lualine_laststatus = vim.o.laststatus
+      if vim.fn.argc(-1) > 0 then
+        -- set an empty statusline till lualine loads
+        vim.o.statusline = " "
+      else
+        -- hide the statusline on the starter page
+        vim.o.laststatus = 0
+      end
+    end,
+    opts = function()
+      -- PERF: we don't need this lualine require madness 🤷
+      local lualine_require = require("lualine_require")
+      lualine_require.require = require
+
+      vim.o.laststatus = vim.g.lualine_laststatus
+
+      local opts = {
+        options = {
+          theme = "auto",
+          globalstatus = vim.o.laststatus == 3,
+          disabled_filetypes = { statusline = { "dashboard", "alpha", "ministarter" } },
+        },
+        sections = {
+          lualine_a = { "mode" },
+          lualine_b = { "branch" },
+
+          lualine_x = {
+            -- stylua: ignore
+            {
+              function() return require("noice").api.status.command.get() end,
+              cond = function() return package.loaded["noice"] and require("noice").api.status.command.has() end,
+            },
+            -- stylua: ignore
+            {
+              function() return require("noice").api.status.mode.get() end,
+              cond = function() return package.loaded["noice"] and require("noice").api.status.mode.has() end,
+            },
+            -- stylua: ignore
+            {
+              function() return "  " .. require("dap").status() end,
+              cond = function() return package.loaded["dap"] and require("dap").status() ~= "" end,
+            },
+            -- stylua: ignore
+            {
+              require("lazy.status").updates,
+              cond = require("lazy.status").has_updates,
+            },
+            {
+              "diff",
+              source = function()
+                local gitsigns = vim.b.gitsigns_status_dict
+                if gitsigns then
+                  return {
+                    added = gitsigns.added,
+                    modified = gitsigns.changed,
+                    removed = gitsigns.removed,
+                  }
+                end
+              end,
+            },
+          },
+          lualine_y = {
+            { "progress", separator = " ", padding = { left = 1, right = 0 } },
+            { "location", padding = { left = 0, right = 1 } },
+          },
+          lualine_z = {
+            function()
+              return " " .. os.date("%R")
+            end,
+          },
+        },
+        extensions = { "neo-tree", "lazy" },
+      }
+
+      return opts
+    end,
+  },
+  -- }}}
   -- Telescope {{{
   {
     "nvim-telescope/telescope.nvim",
@@ -442,89 +941,6 @@ require("lazy").setup({
     end,
   },
 -- }}}
-  -- lualine {{{
-  {
-    "nvim-lualine/lualine.nvim",
-    event = "VeryLazy",
-    init = function()
-      vim.g.lualine_laststatus = vim.o.laststatus
-      if vim.fn.argc(-1) > 0 then
-        -- set an empty statusline till lualine loads
-        vim.o.statusline = " "
-      else
-        -- hide the statusline on the starter page
-        vim.o.laststatus = 0
-      end
-    end,
-    opts = function()
-      -- PERF: we don't need this lualine require madness 🤷
-      local lualine_require = require("lualine_require")
-      lualine_require.require = require
-
-      vim.o.laststatus = vim.g.lualine_laststatus
-
-      local opts = {
-        options = {
-          theme = "auto",
-          globalstatus = vim.o.laststatus == 3,
-          disabled_filetypes = { statusline = { "dashboard", "alpha", "ministarter" } },
-        },
-        sections = {
-          lualine_a = { "mode" },
-          lualine_b = { "branch" },
-
-          lualine_x = {
-            -- stylua: ignore
-            {
-              function() return require("noice").api.status.command.get() end,
-              cond = function() return package.loaded["noice"] and require("noice").api.status.command.has() end,
-            },
-            -- stylua: ignore
-            {
-              function() return require("noice").api.status.mode.get() end,
-              cond = function() return package.loaded["noice"] and require("noice").api.status.mode.has() end,
-            },
-            -- stylua: ignore
-            {
-              function() return "  " .. require("dap").status() end,
-              cond = function() return package.loaded["dap"] and require("dap").status() ~= "" end,
-            },
-            -- stylua: ignore
-            {
-              require("lazy.status").updates,
-              cond = require("lazy.status").has_updates,
-            },
-            {
-              "diff",
-              source = function()
-                local gitsigns = vim.b.gitsigns_status_dict
-                if gitsigns then
-                  return {
-                    added = gitsigns.added,
-                    modified = gitsigns.changed,
-                    removed = gitsigns.removed,
-                  }
-                end
-              end,
-            },
-          },
-          lualine_y = {
-            { "progress", separator = " ", padding = { left = 1, right = 0 } },
-            { "location", padding = { left = 0, right = 1 } },
-          },
-          lualine_z = {
-            function()
-              return " " .. os.date("%R")
-            end,
-          },
-        },
-        extensions = { "neo-tree", "lazy" },
-      }
-
-      return opts
-    end,
-  },
-  -- }}}
 
   -- -- lspconfig {{{
   -- -- Use :help lspconfig-all to check servers
@@ -748,416 +1164,6 @@ require("lazy").setup({
   -- -- }}}
 })
 
--- Install mini.nvim {{{
--- Put this at the top of 'init.lua'
-local path_package = vim.fn.stdpath("data") .. "/site"
-vim.o.packpath = path_package
-local mini_path = path_package .. "/pack/deps/start/mini.nvim"
---
-if not vim.loop.fs_stat(mini_path) then
-  vim.cmd('echo "Installing `mini.nvim`" | redraw')
-  local clone_cmd = {
-    "git",
-    "clone",
-    "--filter=blob:none",
-    -- Uncomment next line to use 'stable' branch
-    -- '--branch', 'stable',
-    "https://github.com/echasnovski/mini.nvim",
-    mini_path,
-  }
-  vim.fn.system(clone_cmd)
-  vim.cmd("packadd mini.nvim | helptags ALL")
-end
---
--- }}}
--- mini.deps {{{
-require("mini.deps").setup({
-  path = { package = path_package },
-})
-Add, Now, Later = MiniDeps.add, MiniDeps.now, MiniDeps.later
--- }}}
--- -- mini.basics {{{
--- require("mini.basics").setup()
--- -- }}}
--- mini.misc {{{
-require("mini.misc").setup({
-  make_global = { "put", "put_text", "zoom" },
-})
-vim.keymap.set( 'n', '<leader>Z', function()
-  zoom()
-  vim.cmd("silent! call ToggleWinPadding()")
-end, { buffer = bufnr, desc = 'zoom' })
---}}}
--- mini.extra {{{
-require("mini.extra").setup()
--- }}}
--- mini.colors {{{
-require("mini.colors").setup()
-vim.keymap.set("n", "<leader><leader>co", function()
-  require("mini.colors").interactive()
-end)
--- }}}
--- mini.base16 {{{
-require("mini.base16").setup({
-  palette = {
-    -- Default Background
-    base00 = "#2d2a2e",
-    -- Lighter Background (Used for status bars, line number and folding marks)
-    base01 = "#37343a",
-    -- Selection Background
-    base02 = "#423f46",
-    -- Comments, Invisible, Line Highlighting
-    base03 = "#848089",
-    -- Dark Foreground (Used for status bars)
-    base04 = "#66d9ef",
-    -- Default Foreground, Caret, Delimiters, Operators
-    base05 = "#e3e1e4",
-    -- Light Foreground (Not often used)
-    base06 = "#a1efe4",
-    -- Light Background (Not often used)
-    base07 = "#f8f8f2",
-    -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
-    base08 = "#f85e84",
-    -- Integers, Boolean, Constants, XML Attributes, Markup Link Url
-    base09 = "#ef9062",
-    -- Classes, Markup Bold, Search Text Background
-    base0A = "#a6e22e",
-    -- Strings, Inherited Class, Markup Code, Diff Inserted
-    base0B = "#e5c463",
-    -- Support, Regular Expressions, Escape Characters, Markup Quotes
-    base0C = "#66d9ef",
-    -- Functions, Methods, Attribute IDs, Headings
-    base0D = "#9ecd6f",
-    -- Keywords, Storage, Selector, Markup Italic, Diff Changed
-    base0E = "#a1efe4",
-    -- Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
-    base0F = "#f9f8f5",
-  },
-  use_cterm = false,
-})
---
--- Override settings for search
-vim.cmd("hi Search guibg=#e5c07b")
---
--- Resume terminal color
-for i = 1, 15, 1 do
-  vim.cmd("let terminal_color_" .. i .. " = ''")
-end
---
--- Override settings for bufferline
-vim.cmd("hi BufferLineTabSelected guibg=#f85e84")
-vim.cmd("hi BufferLineTab guibg=Gray")
---
---}}}
--- mini.icons {{{
-require("mini.icons").setup({})
---}}}
--- mini.comment {{{
-require("mini.comment").setup({
-  -- Module mappings. Use `''` (empty string) to disable one.
-  mappings = {
-    -- Toggle comment (like `gcip` - comment inner paragraph) for both
-    -- Normal and Visual modes
-    comment = "gc",
-    --
-    -- Toggle comment on current line
-    comment_line = "<C-/>",
-    --
-    -- Toggle comment on visual selection
-    comment_visual = "<C-/>",
-    --
-    -- Define 'comment' textobject (like `dgc` - delete whole comment block)
-    -- Works also in Visual mode if mapping differs from `comment_visual`
-    textobject = "gc",
-  },
-}) -- }}}
--- mini.cursorword {{{
-require("mini.cursorword").setup()
--- }}}
--- mini.diff {{{
-require("mini.diff").setup({
-  -- Options for how hunks are visualized
-  view = {
-    -- Visualization style. Possible values are 'sign' and 'number'.
-    -- Default: 'number' if line numbers are enabled, 'sign' otherwise.
-    style = "sign",
-    --
-    -- Signs used for hunks with 'sign' view
-    signs = { add = "+", change = "▒", delete = "-" },
-    --
-    -- Priority of used visualization extmarks
-    priority = 199,
-  },
-})
---
-vim.keymap.set("n", "\\gh", function()
-  MiniDiff.toggle_overlay()
-end, { buffer = bufnr, desc = "Toggle diff" })
---
--- }}}
--- mini.map {{{
-require("mini.map").setup()
-vim.keymap.set("n", "\\m", function()
-  require("mini.map").toggle()
-end, { desc = "Minimap", buffer = bufnr })
--- }}}
--- mini.visits {{{
-
-require("mini.visits").setup()
--- vim.keymap.set("n", "<leader><leader>li", function()
---      MiniVisits.list_paths()
--- end, { buffer = bufnr, desc = "" })
---
--- }}}
--- mini.surround {{{
-require("mini.surround").setup {
-  mappings = {
-    add = 's'
-  }
-}
--- }}}
--- mini.indentscope {{{
-require("mini.indentscope").setup()
--- }}}
--- mini.splitjoin {{{
-require("mini.splitjoin").setup()
--- }}}
--- mini.move {{{
-require("mini.move").setup()
--- }}}
--- mini.hipatterns {{{
---
-local hipatterns = require("mini.hipatterns")
-hipatterns.setup({
-  highlighters = {
-    -- Highlight standalone 'FIXME', 'HACK', 'TODO', 'NOTE'
-    fixme = { pattern = "%f[%w]()FIXME()%f[%W]", group = "MiniHipatternsFixme" },
-    hack = { pattern = "%f[%w]()HACK()%f[%W]", group = "MiniHipatternsHack" },
-    todo = { pattern = "%f[%w]()TODO()%f[%W]", group = "MiniHipatternsTodo" },
-    note = { pattern = "%f[%w]()NOTE()%f[%W]", group = "MiniHipatternsNote" },
-    --
-    -- Highlight hex color strings (`#rrggbb`) using that color
-    hex_color = hipatterns.gen_highlighter.hex_color(),
-  },
-})
-vim.keymap.set("n", "<leader><leader>hi", function()
-  MiniHipatterns.toggle()
-end, { buffer = bufnr, desc = "Toggle hex color highlight" })
---
--- }}}
--- mini.pairs {{{
-require("mini.pairs").setup()
--- }}}
--- -- mini.statusline {{{
--- --
--- require("mini.statusline").setup({
---   content = {
---     active = status_config,
---   },
--- })
--- local function diagnostics_table(args)
---   local info = vim.b.coc_diagnostic_info
---   if MiniStatusline.is_truncated(args.trunc_width) or info == nil then
---     return {}
---   end
---   local table = {}
---   table.e = (info["error"] or 0) > 0 and "E" .. info["error"] or ""
---   table.w = (info["warning"] or 0) > 0 and "W" .. info["warning"] or ""
---   table.h = (info["hint"] or 0) > 0 and "H" .. info["hint"] or ""
---   table.i = (info["information"] or 0) > 0 and "I" .. info["information"] or ""
---   table.s = vim.g.coc_status
---   return table
--- end
---
--- function status_config()
---   local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 })
---   local git = MiniStatusline.section_git({ trunc_width = 75 })
---   local diagnostics = diagnostics_table({ trunc_width = 75 })
---   local filename = MiniStatusline.section_filename({ trunc_width = 140 })
---   local fileinfo = MiniStatusline.section_fileinfo({ trunc_width = 120 })
---   local location = MiniStatusline.section_location({ trunc_width = 75 })
---
---   return MiniStatusline.combine_groups({
---     { hl = mode_hl,                 strings = { mode } },
---     { hl = "MiniStatuslineDevinfo", strings = { git, diagnostics["s"] } },
---     { hl = "MiniStatuslineError",   strings = { diagnostics["e"] } },
---     { hl = "MiniStatuslineWarning", strings = { diagnostics["w"] } },
---     { hl = "MiniStatuslineInfo",    strings = { diagnostics["i"] } },
---     { hl = "MiniStatuslineHint",    strings = { diagnostics["h"] } },
---     "%<", -- Mark general truncate point
---     { hl = "MiniStatuslineFilename", strings = { filename } },
---     "%=", -- End left alignment
---     { hl = "MiniStatuslineFileinfo", strings = { fileinfo } },
---     { hl = mode_hl,                  strings = { location } },
---   })
--- end
---
--- -- }}}
--- -- mini.completion {{{
--- require('mini.completion').setup()
--- -- }}}
--- -- mini.tabline {{{
---
--- require('mini.tabline').setup {
---   format = function(buf_id, label)
---     local suffix = vim.bo[buf_id].modified and '+ ' or ''
---     return MiniTabline.default_format(buf_id, label) .. suffix
---   end,
---   tabpage_section = 'right'
--- }
---
--- for i = 1, 9, 1 do
---   vim.keymap.set("n", string.format("<A-%s>", i), function()
---     vim.api.nvim_set_current_buf(vim.fn.getbufinfo({ buflisted=true })[i].bufnr)
---   end, {silent = true})
--- end
---
--- -- }}}
--- -- mini.clue {{{
--- local miniclue = require('mini.clue')
--- miniclue.setup({
---   triggers = {
---     -- Leader triggers
---     { mode = 'n', keys = '<Leader>' },
---     { mode = 'x', keys = '<Leader>' },
---
---     -- Built-in completion
---     { mode = 'i', keys = '<C-x>' },
---
---     -- `g` key
---     { mode = 'n', keys = 'g' },
---     { mode = 'x', keys = 'g' },
---
---     -- Marks
---     { mode = 'n', keys = "'" },
---     { mode = 'n', keys = '`' },
---     { mode = 'x', keys = "'" },
---     { mode = 'x', keys = '`' },
---
---     -- Registers
---     { mode = 'n', keys = '"' },
---     { mode = 'x', keys = '"' },
---     { mode = 'i', keys = '<C-r>' },
---     { mode = 'c', keys = '<C-r>' },
---
---     -- Window commands
---     { mode = 'n', keys = '<C-w>' },
---
---     -- `z` key
---     { mode = 'n', keys = 'z' },
---     { mode = 'x', keys = 'z' },
---   },
---
---   clues = {
---     -- Enhance this by adding descriptions for <Leader> mapping groups
---     miniclue.gen_clues.builtin_completion(),
---     miniclue.gen_clues.g(),
---     miniclue.gen_clues.marks(),
---     miniclue.gen_clues.registers(),
---     miniclue.gen_clues.windows(),
---     miniclue.gen_clues.z(),
---   },
--- -- }}}
--- -- mini.bufremote {{{
--- require('mini.bufremove')
---}}}
--- -- mini.animate --{{{
--- require("mini.animate").setup()
--- -- }}}
--- -- suda {{{
--- add { source = "lambdalisue/suda.vim" }
--- }}}
--- -- true-zen {{{
--- Add({
---   source = "Pocco81/true-zen.nvim",
--- })
--- vim.keymap.set("n", "<leader>z", ":TZAtaraxis<CR>")
--- -- }}}
--- bufferline {{{
-Add({
-  source = "akinsho/bufferline.nvim",
-  depends = {
-    "nvim-tree/nvim-web-devicons",
-    "tiagovla/scope.nvim",
-  },
-})
-require('bufferline').setup{
-  options = {
-    numbers = 'ordinal',
-    tab_size = 14,
-    separator_style = { "", "" },
-    themable = true,
-    buffer_close_icon = "",
-    close_icon = "",
-    groups = {
-      items = {
-        require("bufferline.groups").builtin.pinned:with({ icon = "󰐃" }),
-      },
-    },
-    enforce_regular_tabs = false,
-    diagnostics = "coc",
-    diagnostics_update_in_insert = true,
-    diagnostics_indicator = function(count, level)
-      local icon = level:match("error") and " " or " "
-      return " " .. icon .. count
-    end,
-    offsets = {
-      {
-        filetype = "NvimTree",
-        text = "File Explorer",
-        highlight = "Directory",
-        text_align = "left"
-      },
-      {
-        filetype = "coc-explorer",
-        text = function()
-          return vim.fn.getcwd()
-        end,
-        highlight = "Directory",
-        text_align = "left"
-      },
-      {
-        filetype = 'vista',
-        text = function()
-          return vim.fn.getcwd()
-        end,
-        highlight = "Tags",
-        text_align = "right"
-      }
-    },
-    custom_filter = function (buf_number)
-      for _, p in ipairs(vim.t.bufs) do
-        if p == buf_number then
-          return true
-        end
-      end
-      return false
-    end
-  }
-};
--- keymaps {{{
-for i = 1, 9, 1 do
-  vim.keymap.set("n", string.format("<A-%s>", i), function()
-    vim.cmd("BufferLineGoToBuffer " .. i)
-  end, { silent = true })
-end
-local opts = { noremap = true, silent = true }
-vim.keymap.set("n", "<TAB>", "<Cmd>BufferLineCyclePrev<CR>", opts)
-vim.keymap.set("n", "<S-TAB>", "<Cmd>BufferLineCycleNext<CR>", opts)
-vim.keymap.set("n", "<M-h>", "<Cmd>BufferLineMovePrev<CR>", opts)
-vim.keymap.set("n", "<M-l>", "<Cmd>BufferLineMoveNext<CR>", opts)
-vim.keymap.set("n", "<M-p>", "<Cmd>BufferLineTogglePin<CR>", opts)
--- }}}
--- -- TODO: tabpages
--- -- }}}
--- marks.nvim {{{
-Add {
-  source = "chentoast/marks.nvim"
-}
-require('marks').setup {
-}
-vim.cmd("hi MarkSignHL guifg=#f85e84 guibg=#37343a")
--- }}}
 -- KEYMAPS {{{
 
 -- Use floating window for translation