Update

2 files changed, 96 insertions, 113 deletions

diff --git a/vim/lua/chadrc.lua b/vim/lua/chadrc.lua
index 182ed96..11777ca 100644
--- a/vim/lua/chadrc.lua
+++ b/vim/lua/chadrc.lua
@@ -3,70 +3,4 @@
 
 ---@type ChadrcConfig
 local M = {}
-
-M.ui = {
-  theme = "onedark",
-  hl_override = {
-    CursorLineNr = { fg = "#eeee00" },
-  },
-
-  -- hl_override = {
-  --    Comment = { italic = true },
-  --    ["@comment"] = { italic = true },
-  -- },
-  tabufline = {
-    enabled = true,
-    order = { "treeOffset", "buffers", "tabs" },
-  },
-
-  term = {
-    hl = "Normal:term,WinSeparator:WinSeparator",
-    sizes = { sp = 0.4, vsp = 0.4 },
-    float = {
-      relative = "editor",
-      row = 0.15,
-      col = 0.13,
-      width = 0.7,
-      height = 0.7,
-      border = "single",
-    },
-  },
-}
-
--- For tabufline
-if M.ui.tabufline.enabled then
-  vim.api.nvim_exec(
-  [[
-  function! CloseBufferSafely()
-  lua require("nvchad.tabufline").close_buffer()
-  endfunction
-  ]],
-  false
-  )
-
-  for i = 1, 9, 1 do
-    vim.keymap.set("n", string.format("<A-%s>", i), function()
-      vim.api.nvim_set_current_buf(vim.t.bufs[i])
-    end)
-  end
-  vim.keymap.set("n", "<A-h>", function()
-    require("nvchad.tabufline").move_buf(-1)
-  end)
-  vim.keymap.set("n", "<A-l>", function()
-    require("nvchad.tabufline").move_buf(1)
-  end)
-  vim.keymap.set("n", "<A-H>", function()
-    vim.cmd("tabprevious")
-  end)
-  vim.keymap.set("n", "<A-L>", function()
-    vim.cmd("tabnext")
-  end)
-  vim.keymap.set("n", "<tab>", function()
-    require("nvchad.tabufline").next()
-  end, { desc = "buffer goto next" })
-  vim.keymap.set("n", "<S-tab>", function()
-    require("nvchad.tabufline").prev()
-  end, { desc = "buffer goto prev" })
-end
-
 return M
diff --git a/vim/mini.lua b/vim/mini.lua
index 7b44fc0..f550440 100644
--- a/vim/mini.lua
+++ b/vim/mini.lua
@@ -12,47 +12,9 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 -- }}}
+vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/"
 require("lazy").setup ({
   "tpope/vim-sleuth",
-  -- bufferline {{{
-  {
-    "akinsho/bufferline.nvim",
-    dependencies = {
-      'nvim-tree/nvim-web-devicons', -- OPTIONAL: for file icons
-      "tiagovla/scope.nvim",
-    },
-    config = function()
-      require("bufferline").setup{
-        options = {
-          tab_size = 14,
-          separator_style = { '', '' },
-          themable = true,
-          buffer_close_icon = '',
-          close_icon = '',
-          groups = {
-            items = {
-              require('bufferline.groups').builtin.pinned:with({ icon = "󰐃" })
-            }
-          }
-        },
-      }
-      require("scope").setup{}
-      -- 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,
-    -- }}}
-  },
-  -- }}}
   -- conform {{{
   {
     "stevearc/conform.nvim",
@@ -68,15 +30,14 @@ require("lazy").setup ({
   -- }}}
   -- Telescope {{{
   {
-    "nvim-telescope/telescope-fzf-native.nvim",
-    build = "make",
-  },
-  {
     "nvim-telescope/telescope.nvim",
     lazy = false,
     dependencies = {
       'nvim-lua/plenary.nvim',
-      "nvim-telescope/telescope-fzf-native.nvim",
+      {
+        "nvim-telescope/telescope-fzf-native.nvim",
+        build = "make",
+      },
     },
     config = function()
       -- extensions {{{
@@ -387,6 +348,50 @@ require("lazy").setup ({
     end,
   },
   --}}}
+-- Nvchad {{{
+  {
+    "NvChad/NvChad",
+    lazy = false,
+    branch = "v2.5",
+    dependencies = {
+      "Nvchad/base46",
+      "Nvchad/ui",
+    }
+  },
+-- }}}
+-- nvim-cmp {{{
+  {
+    "hrsh7th/nvim-cmp",
+    event = "InsertEnter",
+    dependencies = {
+      {
+        -- snippet plugin
+        "L3MON4D3/LuaSnip",
+        dependencies = "rafamadriz/friendly-snippets",
+        opts = { history = true, updateevents = "TextChanged,TextChangedI" },
+        config = function(_, opts)
+          require("luasnip").config.set_config(opts)
+          require "nvchad.configs.luasnip"
+        end,
+      },
+
+      -- cmp sources plugins
+      {
+        "saadparwaiz1/cmp_luasnip",
+        "hrsh7th/cmp-nvim-lua",
+        "hrsh7th/cmp-nvim-lsp",
+        "hrsh7th/cmp-buffer",
+        "hrsh7th/cmp-path",
+      },
+    },
+    opts = function()
+      return require "nvchad.configs.cmp"
+    end,
+    config = function(_, opts)
+      require("cmp").setup(opts)
+    end,
+  },
+-- }}}
 })
 
 -- Install mini.nvim {{{
@@ -564,6 +569,13 @@ require('mini.diff').setup({
     priority = 199,
   },
 })
+
+vim.keymap.set( 'n', '\\gh', function()
+    MiniDiff.toggle_overlay()
+  end,
+  { buffer = bufnr, desc = 'Toggle diff' }
+)
+
 -- }}}
 -- mini.map {{{
 require('mini.map').setup()
@@ -577,9 +589,6 @@ end,
 { buffer = bufnr, desc = '' }
 )
 -- }}}
--- mini.completion {{{
-require('mini.completion').setup()
--- }}}
 -- mini.surround {{{
 require('mini.surround').setup {
   mappings = {
@@ -617,6 +626,9 @@ vim.keymap.set( 'n', '<leader><leader>hi', function()MiniHipatterns.toggle() end
 -- mini.pairs {{{
 require('mini.pairs').setup()
 -- }}}
+-- -- mini.completion {{{
+-- require('mini.completion').setup()
+-- -- }}}
 -- -- mini.tabline {{{
 --
 -- require('mini.tabline').setup {
@@ -694,3 +706,40 @@ add {
 }
 vim.keymap.set("n", "<leader>z", ":TZAtaraxis<CR>")
 -- }}}
+-- bufferline {{{
+add {
+  source = "akinsho/bufferline.nvim",
+  depends = {
+    'nvim-tree/nvim-web-devicons', -- OPTIONAL: for file icons
+    "tiagovla/scope.nvim",
+  },
+}
+require("bufferline").setup{
+  options = {
+    tab_size = 14,
+    separator_style = { '', '' },
+    themable = true,
+    buffer_close_icon = '',
+    close_icon = '',
+    groups = {
+      items = {
+        require('bufferline.groups').builtin.pinned:with({ icon = "󰐃" })
+      }
+    }
+  },
+}
+require("scope").setup{}
+-- 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)
+-- }}}
+-- }}}