[Perf] Half launch time again

nvim/lua/plugins/nav/neotree.lua

@@ -6,10 +6,15 @@ return {
         "MunifTanjim/nui.nvim",
         -- {"3rd/image.nvim", opts = {}}, -- Optional image support in preview window: See `# Preview Mode` for more information
     },
-    lazy = false, -- neo-tree will lazily load itself
-    config = function()
-        -- Automatically open up
-        require("neo-tree").setup({
+    keys = {
+        { "<leader>e", "<Cmd>Neotree<CR>", desc = "Open Neotree" },
+        {
+            "<leader><leader>gg",
+            "<Cmd>Neotree source=git_status position=float<CR>",
+            desc = "Open git view",
+        },
+    },
+    opts = {
         close_if_last_window = true, -- Close Neo-tree if it is the last window left in the tab
         popup_border_style = "rounded",
         enable_git_status = true,
@@ -323,14 +328,5 @@ return {
                 },
             },
         },
-        })
-
-        vim.keymap.set("n", "<leader>e", "<Cmd>Neotree<CR>", { silent = true, desc = "Open Neotree" })
-        vim.keymap.set(
-            "n",
-            "<leader><leader>gg",
-            "<Cmd>Neotree source=git_status position=float<CR>",
-            { silent = true, desc = "Open git view" }
-        )
-    end,
+    },
 }

nvim/lua/plugins/nav/telescope.lua

@@ -11,26 +11,72 @@ return {
         },
     },
     keys = {
-        { "<leader>ff", require("telescope.builtin").find_files, desc = "Telescope find files" },
+        {
+            "<leader>ff",
+            function()
+                require("telescope.builtin").find_files()
+            end,
+            desc = "Telescope find files",
+        },
 
-        { "<leader>flg", require("telescope.builtin").live_grep, desc = "Telescope live grep" },
+        {
+            "<leader>flg",
+            function()
+                require("telescope.builtin").live_grep()
+            end,
+            desc = "Telescope live grep",
+        },
 
-        { "<leader>fg", function ()
-            require( 'telescope' ).extensions.live_grep_args.live_grep_args()
-        end, desc = "Telescope live grep args" },
+        {
+            "<leader>fg",
+            function()
+                require("telescope").extensions.live_grep_args.live_grep_args()
+            end,
+            desc = "Telescope live grep args",
+        },
 
-        { "<leader>fb", require("telescope.builtin").buffers, desc = "Telescope buffers" },
+        {
+            "<leader>fb",
+            function()
+                require("telescope.builtin").buffers()
+            end,
+            desc = "Telescope buffers",
+        },
 
-        { "<leader>fh", require("telescope.builtin").help_tags, desc = "Telescope nvim functions" },
+        {
+            "<leader>fh",
+            function()
+                require("telescope.builtin").help_tags()
+            end,
+            desc = "Telescope nvim functions",
+        },
 
         { "<leader>ft",  ":TodoTelescope<CR>",             desc = "Telescope TODOs" },
 
         -- Git
-        { "<leader>fld", require("telescope.builtin").git_status, desc = "Telescope git diff" },
+        {
+            "<leader>fld",
+            function()
+                require("telescope.builtin").git_status()
+            end,
+            desc = "Telescope git diff",
+        },
 
-        { "<leader>flc", require("telescope.builtin").git_commits, desc = "Telescope git commits" },
+        {
+            "<leader>flc",
+            function()
+                require("telescope.builtin").git_commits()
+            end,
+            desc = "Telescope git commits",
+        },
 
-        { "<leader>flf", require("telescope.builtin").git_files, desc = "Telescope git files" },
+        {
+            "<leader>flf",
+            function()
+                require("telescope.builtin").git_files()
+            end,
+            desc = "Telescope git files",
+        },
 
         -- Recent Commands
         { "<leader>foc", ":Telescope command_history<CR>", desc = "Telescope recent commands" },
@@ -39,7 +85,13 @@ return {
         { "<leader>fos", ":Telescope search_history<CR>",  desc = "Telescope recent searches" },
 
         -- Old Files
-        { "<leader>fr", require("telescope.builtin").oldfiles, desc = "Telescope recent files" },
+        {
+            "<leader>fr",
+            function()
+                require("telescope.builtin").old_files()
+            end,
+            desc = "Telescope recent files",
+        },
 
         -- Quickfix Items
         { "<leader>fq", ":Telescope quickfix<CR>",            desc = "Telescope quickfix items" },
@@ -77,7 +129,7 @@ return {
             extensions = {
                 frecency = {
                     db_safe_mode = false,
-                    matcher = "fuzzy"
+                    matcher = "fuzzy",
                 },
             },
         })

nvim/lua/plugins/nav/toggleterm.lua

@@ -2,8 +2,7 @@ return {
     -- literally the name, quick term toggle
     "akinsho/toggleterm.nvim",
     version = "*",
-    config = function()
-        require("toggleterm").setup({
+    opts = {
         insert_mappings = false,
         terminal_mappings = false,
         open_mapping = "<leader>t",
@@ -11,7 +10,9 @@ return {
         float_opts = {
             border = "curved",
         },
-        })
-        vim.keymap.set("t", "<S-Esc>", [[<cmd>ToggleTerm<CR>]], {}) -- close terminal wih esc
-    end,
+    },
+    keys = {
+        { "<S-Esc>",   "<CMD>ToggleTerm<CR>", desc = "Close Terminal", mode = "t" }, -- close terminal wih esc
+        { "<leader>t", "<CMD>ToggleTerm<CR>", desc = "Open Terminal" },      -- close terminal wih esc
+    },
 }

nvim/lua/plugins/util/move.lua

@@ -1,4 +1,5 @@
 return {
+    opts = {},
     "fedepujol/move.nvim",
     keys = {
         { "<A-S-k>",    ":MoveLine(-1)<CR>",      desc = "Move line up" },

nvim/lua/plugins/util/treesitter.lua

@@ -1,6 +1,7 @@
 return {
     -- syntax highlighting
     "nvim-treesitter/nvim-treesitter",
+    event = { "BufRead", "BufNewFile" },
     build = ":TSUpdate",
     config = function()
         require("nvim-treesitter.configs").setup({