From 0ed6f24866a97b0b61434c7a0e4e24e62a8a3c3c Mon Sep 17 00:00:00 2001 From: Michael Peters Date: Tue, 27 Sep 2022 09:25:37 -0700 Subject: [PATCH] Git blame command, remove telescope fuzzy finder --- lua/configs/telescope.lua | 14 +++++++------- lua/keybinds.lua | 7 +++++-- lua/plugins.lua | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/lua/configs/telescope.lua b/lua/configs/telescope.lua index 771548e..4ff5815 100644 --- a/lua/configs/telescope.lua +++ b/lua/configs/telescope.lua @@ -7,7 +7,7 @@ function M.config() end local actions = require "telescope.actions" - telescope.load_extension "fzf" + --telescope.load_extension "fzf" telescope.setup { defaults = { @@ -86,12 +86,12 @@ function M.config() }, }, extensions = { - fzf = { - fuzzy = true, - override_generic_sorter = true, - override_file_sorter = true, - case_mode = "smart_case", - }, + -- fzf = { + -- fuzzy = true, + -- override_generic_sorter = true, + -- override_file_sorter = true, + -- case_mode = "smart_case", + -- }, }, } end diff --git a/lua/keybinds.lua b/lua/keybinds.lua index f0847e4..f8107ee 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -31,7 +31,8 @@ map('n', 'w', 'cclose', opts) -- Navigate buffers map("n", "", "bnext", opts) map("n", "", "bprevious", opts) -map("n", "q", "Bdelete!", opts) +map("n", "c", "Bdelete", opts) -- don't close if unsaved +map("n", "q", "Bdelete!", opts) -- close it no matter what B) -- Toggle Diagnostics map("n", "de", "lua vim.diagnostic.enable()", opts) @@ -62,7 +63,9 @@ map("n", "la", "Lspsaga code_action", opts) map("n", "", "lua require('lspsaga.action').smart_scroll_with_saga(-1)", opts) map("n", "", "lua require('lspsaga.action').smart_scroll_with_saga(1)", opts) --- LSP (See also configs/lsp-installer.lua) +map("n", "b", "GitBlameToggle", opts) + +-- LSP (See configs/lsp-installer.lua) -- vim.api.nvim_buf_set_keymap(bufnr, "n", "K", "lua vim.lsp.buf.hover()", opts) -- vim.api.nvim_buf_set_keymap(bufnr, "n", "gl", "lua vim.diagnostic.open_float({ source = true, prefix = function(d, i, ttl) return string.rep(' ', #tostring(ttl) - #tostring(i)) .. tostring(i) .. ': ', nil end })") -- vim.api.nvim_buf_set_keymap(bufnr, "n", "gD", "lua vim.lsp.buf.declaration()", opts) diff --git a/lua/plugins.lua b/lua/plugins.lua index 35a542d..c6d275a 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -67,7 +67,7 @@ packer.startup { -- Telescope (find files, words, git commits, etc) use { 'nvim-telescope/telescope.nvim', config = function() require'configs.telescope'.config() end } - use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } + -- use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } -- -- Treesitter