From c074143b95ba12529dfd8121c79182364a8f9b7d Mon Sep 17 00:00:00 2001
From: hyper <hx.hyper@qq.com>
Date: Wed, 9 Oct 2024 14:15:34 +0800
Subject: [PATCH] updates

---
 lazy-lock.json          |  6 +++---
 lua/plugins/editing.lua | 21 +++++++++------------
 lua/plugins/tsdev.lua   |  8 ++++++++
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index 335d2d7..c22791d 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -6,7 +6,7 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" },
   "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
-  "grug-far.nvim": { "branch": "main", "commit": "b7c2b28e49d55ff71cd9bb3ad19a2021316510d8" },
+  "grug-far.nvim": { "branch": "main", "commit": "75aad2698d428bdc94ff15f487f7165aee8ccbfb" },
   "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" },
   "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" },
   "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
@@ -15,9 +15,9 @@
   "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-lspconfig": { "branch": "master", "commit": "dcf511d53fae9675c6fde4241d94b2daaa5e0cd5" },
+  "nvim-lspconfig": { "branch": "master", "commit": "04680101ff79e99b4e33a4386ec27cbd0d360c75" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-treesitter": { "branch": "master", "commit": "4f04fb7027ce786ac4adfd1c629ca40aea96ffec" },
+  "nvim-treesitter": { "branch": "master", "commit": "86c10df7ef77daf45a0e4a918934bb59083db1e1" },
   "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
diff --git a/lua/plugins/editing.lua b/lua/plugins/editing.lua
index 01f72ba..6a9f6f0 100644
--- a/lua/plugins/editing.lua
+++ b/lua/plugins/editing.lua
@@ -58,36 +58,33 @@ return {
             local builtin = require('telescope.builtin')
             local utils = require('telescope.utils')
 
+            -- generic
             vim.keymap.set('n', '<leader>l', builtin.live_grep, { desc = 'Telescope live grep' })
-            vim.keymap.set('n', '<leader>b', builtin.buffers, { desc = 'Telescope buffers' })
             vim.keymap.set('n', '<leader>h', builtin.help_tags, { desc = 'Telescope help tags' })
             vim.keymap.set('n', '<leader>t', function()
                 vim.cmd [[TodoTelescope]]
             end, { desc = 'Telescope Todo' })
 
+            -- code inteligence
             vim.keymap.set('n', '<leader>cd', builtin.diagnostics, { desc = 'Telescope diagnostics' })
             vim.keymap.set('n', '<leader>cr', builtin.lsp_references, { desc = 'Telescope lsp references' })
             vim.keymap.set('n', '<leader>cs', builtin.treesitter, { desc = 'Telescope treesitter' })
 
-            vim.keymap.set('n', '<leader>fp', builtin.find_files, { desc = 'Telescope find in project' })
+            -- file finding
+            vim.keymap.set('n', '<leader>pf', builtin.find_files, { desc = 'Telescope find in project' })
             vim.keymap.set('n', '<leader>ff', function()
                 builtin.find_files({ cwd = utils.buffer_dir() })
             end, { desc = 'Telescope find in buffer dir' })
 
+            -- something I'm too used to
             vim.keymap.set('n', '<leader>fs', function()
                 vim.cmd [[w]]
             end, { desc = 'Save' })
 
-            vim.keymap.set('n', '<leader>fq', function()
-                vim.cmd [[q]]
-            end, { desc = 'Close' })
-
-            vim.keymap.set('n', '<leader>fQ', function()
-                vim.cmd [[q!]]
-            end, { desc = 'Force close' })
-
-            vim.keymap.set('n', '<leader>fd', function()
-                vim.cmd [[wq]]
+            -- buffers
+            vim.keymap.set('n', '<leader>bb', builtin.buffers, { desc = 'Telescope buffers' })
+            vim.keymap.set('n', '<leader>bd', function()
+                vim.cmd [[bd]]
             end, { desc = 'Save and close' })
         end
     }, {
diff --git a/lua/plugins/tsdev.lua b/lua/plugins/tsdev.lua
index b772c1b..48c50ec 100644
--- a/lua/plugins/tsdev.lua
+++ b/lua/plugins/tsdev.lua
@@ -5,6 +5,14 @@ return {
 		opts = {},
         config = function()
             require('typescript-tools').setup({})
+
+            vim.keymap.set('n', 'co', function()
+                vim.cmd [[TSToolsOrganizeImports]]
+            end, {desc = "TSTools Organize Imports"})
+
+            vim.keymap.set('n', 'ci', function()
+                vim.cmd [[TSToolsAddMissingImports]]
+            end, {desc = "TSTools Add Missing Imports"})
         end
     },{
         "hrsh7th/nvim-cmp",