From d2ded00f063e6ba1f6e9f42aeda14cb684ddd875 Mon Sep 17 00:00:00 2001 From: pml68 Date: Thu, 2 May 2024 17:32:34 +0200 Subject: feat: remove lazygit term, get **best possible** startup time down to 16ms --- lua/pml68/configs/telescope.lua | 7 ------ lua/pml68/configs/toggleterm.lua | 15 ------------ lua/pml68/plugins.lua | 5 +--- lua/pml68/remap.lua | 50 +++++++++++++++++++++++----------------- 4 files changed, 30 insertions(+), 47 deletions(-) delete mode 100644 lua/pml68/configs/telescope.lua diff --git a/lua/pml68/configs/telescope.lua b/lua/pml68/configs/telescope.lua deleted file mode 100644 index 54ddb0e..0000000 --- a/lua/pml68/configs/telescope.lua +++ /dev/null @@ -1,7 +0,0 @@ -local builtin = require("telescope.builtin") -vim.keymap.set('n', 'ff', builtin.find_files, {}) -vim.keymap.set('n', 'fw', builtin.live_grep, {}) -vim.keymap.set('n', 'fb', builtin.buffers, {}) -vim.keymap.set('n', 'fh', builtin.help_tags, {}) -vim.keymap.set('n', 'fz', builtin.current_buffer_fuzzy_find, {}) -vim.keymap.set('n', 'fg', builtin.git_files, {}) diff --git a/lua/pml68/configs/toggleterm.lua b/lua/pml68/configs/toggleterm.lua index e2681b5..4f5ca6e 100644 --- a/lua/pml68/configs/toggleterm.lua +++ b/lua/pml68/configs/toggleterm.lua @@ -1,18 +1,3 @@ -local Terminal = require('toggleterm.terminal').Terminal -local lazygit = Terminal:new({ - cmd = "lazygit", - hidden = true, - direction = "float", - float_opts = { - border = "double", - }, -}) - -function _lazygit_toggle() - lazygit:toggle() -end - -vim.keymap.set("n", "g", " lua _lazygit_toggle() ", { noremap = true, silent = true }) function _G.set_terminal_keymaps() local opts = { buffer = 0 } vim.keymap.set('t', '', [[]], opts) diff --git a/lua/pml68/plugins.lua b/lua/pml68/plugins.lua index 0720d0a..d53141d 100644 --- a/lua/pml68/plugins.lua +++ b/lua/pml68/plugins.lua @@ -139,13 +139,10 @@ local plugins = { { "nvim-telescope/telescope.nvim", tag = "0.1.6", - event = "VeryLazy", + cmd = "Telescope", dependencies = { "nvim-lua/plenary.nvim" }, - config = function() - require("pml68.configs.telescope") - end }, --Colorscheme { diff --git a/lua/pml68/remap.lua b/lua/pml68/remap.lua index 45237ae..8590afb 100644 --- a/lua/pml68/remap.lua +++ b/lua/pml68/remap.lua @@ -1,9 +1,9 @@ vim.g.mapleader = " " vim.keymap.set("n", "e", vim.cmd.Ex) -vim.keymap.set("n", "gB", " Git blame ") +vim.keymap.set("n", "gB", "Git blame") vim.keymap.set("n", "u", "UndotreeToggle") -vim.keymap.set("n", "n", " set nu! ") -vim.keymap.set("n", "rn", " set rnu! ") +vim.keymap.set("n", "n", "set nu!") +vim.keymap.set("n", "rn", "set rnu!") vim.keymap.set("n", "fo", "=ap") -- VimTex @@ -13,6 +13,18 @@ vim.keymap.set("n", "vl", "VimtexView") -- Screenkey vim.keymap.set("n", "sk", "Screenkey") +-- Telescope +vim.keymap.set('n', 'ff', "Telescope find_files", {}) +vim.keymap.set('n', 'fw', "Telescope live_grep", {}) +vim.keymap.set('n', 'fb', "Telescope buffers", {}) +vim.keymap.set('n', 'fh', "Telescope help_tags", {}) +vim.keymap.set('n', 'fz', "Telescope current_buffer_fuzzy_find", {}) +vim.keymap.set('n', 'fg', "Telescope git_files", {}) + +-- Toggleterm +vim.keymap.set("n", "h", "ToggleTerm direction=horizontal") +vim.keymap.set("n", "v", "ToggleTerm direction=vertical") + -- highlights vim.keymap.set("n", "", "nohl") @@ -23,32 +35,28 @@ vim.keymap.set("n", "", "j") vim.keymap.set("n", "", "k") -- close current buffer -vim.keymap.set("n", "x", " bd ") - --- termtoggle -vim.keymap.set("n", "h", " ToggleTerm direction=horizontal ") -vim.keymap.set("n", "v", " ToggleTerm direction=vertical ") +vim.keymap.set("n", "x", "bd") -- Diagnostics, LSP -vim.keymap.set('n', 'gl', 'lua vim.diagnostic.open_float()') -vim.keymap.set('n', '[d', 'lua vim.diagnostic.goto_prev()') -vim.keymap.set('n', ']d', 'lua vim.diagnostic.goto_next()') +vim.keymap.set('n', 'gl', 'lua vim.diagnostic.open_float()') +vim.keymap.set('n', '[d', 'lua vim.diagnostic.goto_prev()') +vim.keymap.set('n', ']d', 'lua vim.diagnostic.goto_next()') vim.api.nvim_create_autocmd('LspAttach', { desc = 'LSP actions', callback = function(event) local opts = { buffer = event.buf } - vim.keymap.set('n', 'K', 'lua vim.lsp.buf.hover()', opts) - vim.keymap.set('n', 'gd', 'lua vim.lsp.buf.definition()', opts) - vim.keymap.set('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) - vim.keymap.set('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - vim.keymap.set('n', 'go', 'lua vim.lsp.buf.type_definition()', opts) - vim.keymap.set('n', 'gr', 'lua vim.lsp.buf.references()', opts) - vim.keymap.set('n', 'gs', 'lua vim.lsp.buf.signature_help()', opts) - vim.keymap.set('n', '', 'lua vim.lsp.buf.rename()', opts) - vim.keymap.set({ 'n', 'x' }, '', 'lua vim.lsp.buf.format({async = true})', opts) - vim.keymap.set('n', 'gc', 'lua vim.lsp.buf.code_action()', opts) + vim.keymap.set('n', 'K', 'lua vim.lsp.buf.hover()', opts) + vim.keymap.set('n', 'gd', 'lua vim.lsp.buf.definition()', opts) + vim.keymap.set('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) + vim.keymap.set('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) + vim.keymap.set('n', 'go', 'lua vim.lsp.buf.type_definition()', opts) + vim.keymap.set('n', 'gr', 'lua vim.lsp.buf.references()', opts) + vim.keymap.set('n', 'gs', 'lua vim.lsp.buf.signature_help()', opts) + vim.keymap.set('n', '', 'lua vim.lsp.buf.rename()', opts) + vim.keymap.set({ 'n', 'x' }, '', 'lua vim.lsp.buf.format({async = true})', opts) + vim.keymap.set('n', 'gc', 'lua vim.lsp.buf.code_action()', opts) end }) -- cgit v1.2.3