nvim/.config/nvim/lazy-lock.json

@@ -17,8 +17,8 @@
   "gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" },
   "global-note.nvim": { "branch": "main", "commit": "1e0d4bba425d971ed3ce40d182c574a25507115c" },
   "go.nvim": { "branch": "master", "commit": "6ad080424f4b96a584cf591721e8e13c102cce4e" },
-  "godoc.nvim": { "branch": "main", "commit": "0163dd1f4695ef6bed8ad72336b96e08f31018a0" },
   "guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" },
+  "hierarchy-tree-go.nvim": { "branch": "main", "commit": "9fab9ddefe81edab4a144824955d2d085db3f49a" },
   "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "leap.nvim": { "branch": "main", "commit": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe" },
@@ -31,7 +31,7 @@
   "neogit": { "branch": "master", "commit": "12f78aaabb37b4946254dd5e47cf7b552904937a" },
   "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" },
   "nvim-lspconfig": { "branch": "master", "commit": "fd26f8626c03b424f7140d454031d1dcb8d23513" },
-  "nvim-surround": { "branch": "main", "commit": "6c54643ef42016b744888b06d2381abd23f9b7ea" },
+  "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
   "nvim-treesitter": { "branch": "master", "commit": "38959800c2439c890e3238af559f0dc3be45e393" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "143856b1cee509a190cc8c17ddb0638002171235" },
   "nvim-various-textobjs": { "branch": "main", "commit": "ea78fbdac4a2ca10e2922721233a769770afb45b" },
@@ -41,9 +41,6 @@
   "orgmode": { "branch": "master", "commit": "dafb6aa6e2e09362e304a933974c563bab0b464f" },
   "persisted.nvim": { "branch": "main", "commit": "b4b7a281307f8b52d47b0fd5b6798a453681d44e" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "replacer.nvim": { "branch": "master", "commit": "32e1713230844fa52f7f0598c59295de3c90dc95" },
-  "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" },
-  "tardis.nvim": { "branch": "main", "commit": "a6ee00a217529490e79d349b1f1a9cf5831180d3" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "2a5ceff981501cff8f46871d5402cd3378a8ab6a" },
   "telescope-git-grep.nvim": { "branch": "main", "commit": "cdd8215f15843a420b5c8e792395c403136626b6" },
   "telescope-tabs": { "branch": "master", "commit": "0a678eefcb71ebe5cb0876aa71dd2e2583d27fd3" },
@@ -61,6 +58,5 @@
   "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
   "whaler": { "branch": "main", "commit": "9e0b67e36250cb80e679563adcd4b7451eae26b2" },
-  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
-  "yankbank-nvim": { "branch": "main", "commit": "ded8f01bd6a7887310e14d463c8aa55eb79ec281" }
 }

nvim/.config/nvim/lua/lupan/remap.lua

@@ -10,6 +10,8 @@ key('v', '<Space>', '<Nop>', { silent = true })
 key('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 key('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
+key("n", "<leader>dd", "<cmd>Oil<CR>", { desc = "[D]isplay [d]irectory" })
+key("n", "<leader>df", "<cmd>Oil --float<CR>", { desc = "[D]isplay directory [f]loat" })
 key("n", "<leader>ut", "<cmd>UndotreeToggle<CR>", { desc = "[U]undotree [t]oggle" })
 
 -- tabs

nvim/.config/nvim/lua/plugins/arrow.lua

@@ -3,7 +3,7 @@ return {
     "otavioschwanck/arrow.nvim",
     opts = {
       show_icons = true,
-      leader_key = '-',
+      leader_key = '<leader>;',
       buffer_leader_key = '<leader>m',
     },
     keys = {

nvim/.config/nvim/lua/plugins/editing.lua

@@ -13,9 +13,11 @@ return {
 
   {
     "kylechui/nvim-surround",
-    version = "^3.0.0", -- Use for stability; omit to use `main` branch for the latest features
+    version = "*", -- Use for stability; omit to use `main` branch for the latest features
     event = "VeryLazy",
-    config = true,
+    config = function(_, opts)
+      require("nvim-surround").setup(opts)
+    end
   },
 
   {
@@ -31,31 +33,4 @@ return {
     lazy = false,
     opts = { keymaps = { useDefaults = true } },
   },
-
-  {
-    'ggandor/leap.nvim',
-    opts = {
-      safe_labels = {},
-    },
-    dependencies = {
-      "tpope/vim-repeat",
-    },
-    keys = {
-      { '\\', '<Plug>(leap)',             mode = { 'n', 'x', 'o' } },
-      { 'gs', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' } },
-    }
-  },
-
-  {
-    'Wansmer/treesj',
-    dependencies = { 'nvim-treesitter/nvim-treesitter' },
-    opts = {
-      use_default_keymaps = false,
-    },
-    keys = {
-      { '<leader>tg', function() require('treesj').toggle() end, desc = "[T]ree to[g]gle one-line" },
-      { '<leader>tj', function() require('treesj').join() end,   desc = "[T]ree [J]oin one-line" },
-      { '<leader>ts', function() require('treesj').split() end,  desc = "[T]ree [S]plit one-line" },
-    },
-  },
 }

nvim/.config/nvim/lua/plugins/file-explorer.lua

@@ -1,13 +0,0 @@
-return {
-  {
-    'stevearc/oil.nvim',
-    dependencies = { "nvim-tree/nvim-web-devicons" },
-    opts = {
-      default_file_explorer = true,
-      delete_to_trash = true,
-    },
-    keys = {
-      { "<leader>-", "<cmd>Oil --float<CR>", desc = "Open parent directory" },
-    },
-  },
-}

nvim/.config/nvim/lua/plugins/godoc.lua

@@ -1,24 +0,0 @@
-return {
-  {
-    'fredrikaverpil/godoc.nvim',
-    version = '*',
-    dependencies = {
-      { 'nvim-telescope/telescope.nvim' },
-      {
-        'nvim-treesitter/nvim-treesitter',
-        opts = {
-          ensure_installed = { 'go' },
-        },
-      },
-    },
-    event = 'VeryLazy',
-    cmd = 'GoDoc',
-    keys = {
-      { '<leader>gd', '<cmd>GoDoc<CR>', desc = '[G]o[D]oc' },
-    },
-    build = 'go install github.com/lotusirous/gostdsym/stdsym@latest',
-    opts = {
-      picker = { type = 'telescope' },
-    },
-  },
-}

nvim/.config/nvim/lua/plugins/init.lua

@@ -0,0 +1,51 @@
+return {
+  {
+    'crusj/hierarchy-tree-go.nvim',
+    dependencies = 'neovim/nvim-lspconfig',
+    lazy = true,
+  },
+
+  {
+    'ggandor/leap.nvim',
+    opts = {
+      safe_labels = {},
+    },
+    dependencies = {
+      "tpope/vim-repeat",
+    },
+    keys = {
+      { 'gs', '<Plug>(leap)',             mode = { 'n', 'x', 'o' } },
+      { 'gS', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' } },
+    }
+  },
+
+  {
+    "folke/trouble.nvim",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+  },
+
+  {
+    'stevearc/oil.nvim',
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    opts = {
+      default_file_explorer = true,
+      delete_to_trash = true,
+    },
+    keys = {
+      { "-", "<cmd>Oil<CR>", desc = "Open parent directory" },
+    },
+  },
+
+  {
+    'Wansmer/treesj',
+    dependencies = { 'nvim-treesitter/nvim-treesitter' },
+    opts = {
+      use_default_keymaps = false,
+    },
+    keys = {
+      { '<leader>tg', function() require('treesj').toggle() end, desc = "[T]ree to[g]gle one-line" },
+      { '<leader>tj', function() require('treesj').join() end,   desc = "[T]ree [J]oin one-line" },
+      { '<leader>ts', function() require('treesj').split() end,  desc = "[T]ree [S]plit one-line" },
+    },
+  },
+}

nvim/.config/nvim/lua/plugins/lsp.lua

@@ -120,7 +120,6 @@ return {
       }
     end,
   },
-
   {
     'nvimdev/lspsaga.nvim',
     dependencies = {
@@ -155,11 +154,4 @@ return {
       vim.keymap.set({ 'n', 't' }, '<C-_>', '<cmd>Lspsaga term_toggle<CR>', { desc = "[L]spsaga [T]erm toggle" })
     end,
   },
-
-  {
-    "folke/trouble.nvim",
-    dependencies = { "nvim-tree/nvim-web-devicons" },
-    opts = {},
-    cmd = 'Trouble'
-  },
 }

nvim/.config/nvim/lua/plugins/replacer.lua

@@ -1,11 +0,0 @@
-return {
-  'gabrielpoca/replacer.nvim',
-  opts = { rename_files = false },
-  keys = {
-    {
-      '<leader>rp',
-      function() require('replacer').run() end,
-      desc = "[R]e[p]lacer"
-    }
-  }
-}

nvim/.config/nvim/lua/plugins/tardis.lua

@@ -1,5 +0,0 @@
-return {
-  'fredeeb/tardis.nvim',
-  dependencies = { 'nvim-lua/plenary.nvim' },
-  config = true,
-}

nvim/.config/nvim/lua/plugins/yankbank.lua

@@ -1,12 +0,0 @@
-return {
-  "ptdewey/yankbank-nvim",
-  dependencies = "kkharji/sqlite.lua",
-  config = function()
-    require('yankbank').setup({
-      persist_type = "sqlite",
-    })
-  end,
-  keys = {
-    { "<leader>b", "<cmd>YankBank<CR>", desc = "Yank[B]ank" },
-  },
-}