aboutsummaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorpml68 <tutorialmester@gmail.com>2024-05-02 17:32:34 +0200
committerpml68 <tutorialmester@gmail.com>2024-05-02 17:32:34 +0200
commitd2ded00f063e6ba1f6e9f42aeda14cb684ddd875 (patch)
treec17303c904e5d393c848b97c8abad63f054e10b6 /lua
parentfix: remove accidental User FilePost events causing plugins to never load (diff)
downloadnvim-d2ded00f063e6ba1f6e9f42aeda14cb684ddd875.tar.gz
feat: remove lazygit term, get **best possible** startup time down to 16ms
Diffstat (limited to '')
-rw-r--r--lua/pml68/configs/telescope.lua7
-rw-r--r--lua/pml68/configs/toggleterm.lua15
-rw-r--r--lua/pml68/plugins.lua5
-rw-r--r--lua/pml68/remap.lua50
4 files changed, 30 insertions, 47 deletions
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', '<leader>ff', builtin.find_files, {})
-vim.keymap.set('n', '<leader>fw', builtin.live_grep, {})
-vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
-vim.keymap.set('n', '<leader>fz', builtin.current_buffer_fuzzy_find, {})
-vim.keymap.set('n', '<leader>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", "<leader>g", "<cmd> lua _lazygit_toggle() <CR>", { noremap = true, silent = true })
function _G.set_terminal_keymaps()
local opts = { buffer = 0 }
vim.keymap.set('t', '<C-x>', [[<C-\><C-n>]], 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", "<leader>e", vim.cmd.Ex)
-vim.keymap.set("n", "<leader>gB", "<cmd> Git blame <CR>")
+vim.keymap.set("n", "<leader>gB", "<cmd>Git blame<CR>")
vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<CR>")
-vim.keymap.set("n", "<leader>n", "<cmd> set nu! <CR>")
-vim.keymap.set("n", "<leader>rn", "<cmd> set rnu! <CR>")
+vim.keymap.set("n", "<leader>n", "<cmd>set nu!<CR>")
+vim.keymap.set("n", "<leader>rn", "<cmd>set rnu!<CR>")
vim.keymap.set("n", "<leader>fo", "=ap")
-- VimTex
@@ -13,6 +13,18 @@ vim.keymap.set("n", "<leader>vl", "<cmd>VimtexView<CR>")
-- Screenkey
vim.keymap.set("n", "<leader>sk", "<cmd>Screenkey<CR>")
+-- Telescope
+vim.keymap.set('n', '<leader>ff', "<cmd>Telescope find_files<CR>", {})
+vim.keymap.set('n', '<leader>fw', "<cmd>Telescope live_grep<CR>", {})
+vim.keymap.set('n', '<leader>fb', "<cmd>Telescope buffers<CR>", {})
+vim.keymap.set('n', '<leader>fh', "<cmd>Telescope help_tags<CR>", {})
+vim.keymap.set('n', '<leader>fz', "<cmd>Telescope current_buffer_fuzzy_find<CR>", {})
+vim.keymap.set('n', '<leader>fg', "<cmd>Telescope git_files<CR>", {})
+
+-- Toggleterm
+vim.keymap.set("n", "<leader>h", "<cmd>ToggleTerm direction=horizontal<CR>")
+vim.keymap.set("n", "<leader>v", "<cmd>ToggleTerm direction=vertical<CR>")
+
-- highlights
vim.keymap.set("n", "<Esc>", "<cmd>nohl<CR>")
@@ -23,32 +35,28 @@ vim.keymap.set("n", "<C-j>", "<C-w>j")
vim.keymap.set("n", "<C-k>", "<C-w>k")
-- close current buffer
-vim.keymap.set("n", "<leader>x", "<cmd> bd <CR>")
-
--- termtoggle
-vim.keymap.set("n", "<leader>h", "<cmd> ToggleTerm direction=horizontal <CR>")
-vim.keymap.set("n", "<leader>v", "<cmd> ToggleTerm direction=vertical <CR>")
+vim.keymap.set("n", "<leader>x", "<cmd>bd<CR>")
-- Diagnostics, LSP
-vim.keymap.set('n', 'gl', '<cmd>lua vim.diagnostic.open_float()<cr>')
-vim.keymap.set('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
-vim.keymap.set('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
+vim.keymap.set('n', 'gl', '<cmd>lua vim.diagnostic.open_float()<CR>')
+vim.keymap.set('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>')
+vim.keymap.set('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>')
vim.api.nvim_create_autocmd('LspAttach', {
desc = 'LSP actions',
callback = function(event)
local opts = { buffer = event.buf }
- vim.keymap.set('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>', opts)
- vim.keymap.set('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>', opts)
- vim.keymap.set('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>', opts)
- vim.keymap.set('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>', opts)
- vim.keymap.set('n', 'go', '<cmd>lua vim.lsp.buf.type_definition()<cr>', opts)
- vim.keymap.set('n', 'gr', '<cmd>lua vim.lsp.buf.references()<cr>', opts)
- vim.keymap.set('n', 'gs', '<cmd>lua vim.lsp.buf.signature_help()<cr>', opts)
- vim.keymap.set('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<cr>', opts)
- vim.keymap.set({ 'n', 'x' }, '<F3>', '<cmd>lua vim.lsp.buf.format({async = true})<cr>', opts)
- vim.keymap.set('n', 'gc', '<cmd>lua vim.lsp.buf.code_action()<cr>', opts)
+ vim.keymap.set('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
+ vim.keymap.set('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+ vim.keymap.set('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
+ vim.keymap.set('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
+ vim.keymap.set('n', 'go', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+ vim.keymap.set('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
+ vim.keymap.set('n', 'gs', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
+ vim.keymap.set('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+ vim.keymap.set({ 'n', 'x' }, '<F3>', '<cmd>lua vim.lsp.buf.format({async = true})<CR>', opts)
+ vim.keymap.set('n', 'gc', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
end
})