From a31d8dbea212442e2ed132516e42b72258b2ccd7 Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <pham@topo.tw>
Date: Thu, 4 Jul 2024 12:56:50 +0800
Subject: Update

---
 vim/lua/chadrc.lua       |  2 +-
 vim/lua/mappings.lua     |  6 ++++--
 vim/lua/plugins/init.lua | 31 ++++++++++++++++++++++++++-----
 3 files changed, 31 insertions(+), 8 deletions(-)

(limited to 'vim/lua')

diff --git a/vim/lua/chadrc.lua b/vim/lua/chadrc.lua
index 4efa204..28e240f 100644
--- a/vim/lua/chadrc.lua
+++ b/vim/lua/chadrc.lua
@@ -22,7 +22,7 @@ if M.ui.tabufline.enabled then
   vim.keymap.set("n", "<C-c>", function()
     local bufnrs = vim.tbl_filter(function(b) return 1 == vim.fn.buflisted(b) end, vim.api.nvim_list_bufs())
     if #bufnrs == 1 then
-      vim.cmd("silent quit!")
+      vim.cmd("silent quit")
     else
       require("nvchad.tabufline").close_buffer()
     end
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index 788a6ab..ad4824b 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -38,7 +38,9 @@ vim.keymap.set("n", "<leader>sg", "<cmd>Telescope live_grep<CR>", { desc = "tele
 
 vim.keymap.set("n", "<leader>gf", "<cmd>Telescope git_files<CR>", { desc = "telescope git files" })
 vim.keymap.set("n", "<leader>sH", "<cmd>Telescope help_tags<CR>", { desc = "telescope help page" })
-vim.keymap.set("n", "<leader>tt", ":Telescope ", { desc = "telescope help page" })
+vim.keymap.set("n", "<leader>sm", "<cmd>Telescope marks<CR>", { desc = "telescope marks" })
+vim.keymap.set("n", "<leader>sj", "<cmd>Telescope jumplist<CR>", { desc = "telescope marks" })
+vim.keymap.set("n", "<leader>tt", "<cmd>Telescope<CR>", { desc = "telescope help page" })
 vim.keymap.set('n', '<leader>sk', "<cmd>Telescope keymaps<CR>", { desc = 'telescope keymaps' })
 vim.keymap.set("n", "<leader>pt", "<cmd>Telescope terms<CR>", { desc = "telescope pick hidden term" })
 
@@ -65,7 +67,7 @@ vim.keymap.set('n', '<leader>ss', function()
         require('telescope.actions').close(prompt_bufnr)
         local prefix_filetype = string.match(file, "([^_]+)")
         vim.cmd(":e " .. cwd .. "/" .. file)
-        vim.bo.filetype(prefix_filetype)
+        vim.bo.filetype = prefix_filetype
         vim.cmd("set filetype?")
       end
 
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua
index 0e9911e..a0a972c 100644
--- a/vim/lua/plugins/init.lua
+++ b/vim/lua/plugins/init.lua
@@ -51,7 +51,8 @@ return {
 
   {
     'lewis6991/gitsigns.nvim',
-    opts = {
+    opts = function()
+      return {
       -- See `:help gitsigns.txt`
       signs = {
         add = { text = '+' },
@@ -66,12 +67,14 @@ return {
         vim.keymap.set('n', '<leader>gn', gs.next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' })
         vim.keymap.set('n', '<leader>hp', gs.preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
         vim.keymap.set('n', '<leader>hd', gs.diffthis, { buffer = bufnr, desc = '[h]unk [d]iff' })
-        vim.keymap.set('n', '<leader>hD', function() gs.diffthis('~') end, { buffer = bufnr, desc = '[h]unk [d]iff for ~' })
+        vim.keymap.set('n', '<leader>hD', function() gs.diffthis('~') end,
+          { buffer = bufnr, desc = '[h]unk [d]iff for ~' })
         -- vim.keymap.set("n", "<leader>gb", gs.blame_line{full=true}, { desc = "Git Blame" })
         vim.keymap.set("n", "<leader>gb", gs.toggle_current_line_blame, { desc = "Blame Line" })
         vim.keymap.set('v', 'hr', gs.reset_hunk, { buffer = bufnr, desc = '[h]unk [r]eset' })
-      end,
-    },
+      end
+    }
+    end,
   },
 
   {
@@ -246,7 +249,25 @@ return {
   {
     'tpope/vim-surround',
     lazy = false,
-  }
+  },
+
+  {
+    "nvim-tree/nvim-tree.lua",
+    opts = function()
+      local opts = require "nvchad.configs.nvimtree"
+      opts.on_attach = function(bufnr)
+        local api = require("nvim-tree.api")
+        api.config.mappings.default_on_attach(bufnr)
+        vim.keymap.set('n', 'l', api.node.open.edit, { buffer = bufnr, nowait = true })
+        vim.keymap.set('n', 'h', api.tree.change_root_to_parent, { buffer = bufnr, nowait = true })
+      end
+      return opts
+    end,
+  },
+  -- {
+  --   'junegunn/goyo.vim',
+  --   lazy = false,
+  -- },
 
 
   -- {
-- 
cgit v1.2.3-70-g09d2