5 files changed, 11 insertions, 30 deletions

diff --git a/nvim/init.lua b/nvim/init.lua
index 9630b9d..c9bdaf1 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -2,7 +2,6 @@ require("config.options")
 
 local keymaps = require("config.keymaps")
 keymaps.global()
-keymaps.telescope()
 
 require("config.autocmds")
 require("config.lazy")
diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua
index 123e039..b193d5c 100644
--- a/nvim/lua/config/keymaps.lua
+++ b/nvim/lua/config/keymaps.lua
@@ -42,32 +42,6 @@ function M.lsp(buffer, client)
   set_python_bindings()
 end
 
-function M.telescope()
-  local opts = {
-    silent = true,
-  }
-
-  map("n", "<leader>ff", function()
-    require("telescope.builtin").find_files()
-  end, opts)
-
-  map("n", "<leader>fg", function()
-    require("telescope.builtin").live_grep()
-  end, opts)
-
-  map("n", "<leader>fb", function()
-    require("telescope.builtin").buffers()
-  end, opts)
-
-  map("n", "<leader>fh", function()
-    require("telescope.builtin").help_tags()
-  end, opts)
-
-  map("n", "<leader>dd", function()
-    require("telescope.builtin").diagnostics()
-  end, opts)
-end
-
 function M.gitsigns()
   map("n", "<leader>tb", require("gitsigns").toggle_current_line_blame)
 end
diff --git a/nvim/lua/plugins/editing.lua b/nvim/lua/plugins/editing.lua
index 4a80d2b..d1c3447 100644
--- a/nvim/lua/plugins/editing.lua
+++ b/nvim/lua/plugins/editing.lua
@@ -1,6 +1,6 @@
 return {
-  { "tpope/vim-repeat" },
-  { "tpope/vim-surround" },
+  { "tpope/vim-repeat", event = "VeryLazy" },
+  { "tpope/vim-surround", event = "VeryLazy" },
 
   {
     "romainl/vim-cool",
diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
index 7633892..8c2cae5 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -5,5 +5,12 @@ return {
       "nvim-lua/plenary.nvim",
     },
     lazy = true,
+    keys = {
+      { "<leader>ff", "<cmd>Telescope find_files<cr>", desc = "Find files" },
+      { "<leader>fg", "<cmd>Telescope live_grep<cr>", desc = "Live grep" },
+      { "<leader>fb", "<cmd>Telescope buffers<cr>", desc = "Buffers" },
+      { "<leader>fh", "<cmd>Telescope help_tags<cr>", desc = "Help tags" },
+      { "<leader>dd", "<cmd>Telescope diagnostics<cr>", desc = "Diagnostics" },
+    },
   },
 }
diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua
index 235c0b5..66cd717 100644
--- a/nvim/lua/plugins/treesitter.lua
+++ b/nvim/lua/plugins/treesitter.lua
@@ -9,7 +9,8 @@ return {
     "nvim-treesitter/nvim-treesitter",
     branch = "main",
     build = ":TSUpdate",
-    lazy = false,
+    event = "BufReadPost",
+    lazy = true,
     config = function()
       local treesitter = require("nvim-treesitter")
       local langs = require("config.treesitter").languages