Merge remote-tracking branch 'refs/remotes/origin/master'

3 files changed, 2 insertions, 26 deletions

diff --git a/nvim/lua/config/fzf.lua b/nvim/lua/config/fzf.lua
index ef85a94..35e9c88 100644
--- a/nvim/lua/config/fzf.lua
+++ b/nvim/lua/config/fzf.lua
@@ -2,8 +2,8 @@ require('fzf-lua').setup({})
 
 local opts = { silent = true }
 
-vim.keymap.set('n', '<leader>f', ':FzfLua global<CR>', opts)
+vim.keymap.set('n', '<leader>o', ':FzfLua global<CR>', opts) -- o means Open
 vim.keymap.set('n', '<leader>r', ':FzfLua lsp_references<CR>', opts)
-vim.keymap.set('n', '<leader>g', ':FzfLua live_grep<CR>', opts)
+vim.keymap.set('n', '<leader>f', ':FzfLua live_grep<CR>', opts) -- f means Find
 vim.keymap.set('n', '<leader>b', ':FzfLua buffers<CR>', opts)
 vim.keymap.set('n', '<leader>?', ':FzfLua keymaps<CR>', opts)
diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua
index 913bacb..18fb522 100644
--- a/nvim/lua/config/lazy.lua
+++ b/nvim/lua/config/lazy.lua
@@ -58,7 +58,6 @@ require("lazy").setup({
 			opts = {},
 		},
 		{ "prettier/vim-prettier" },
-		require("config.lazygit"),
 		require("config.blink-cmp"),
 	},
 	install = { colorscheme = { "gruvbox" } },
diff --git a/nvim/lua/config/lazygit.lua b/nvim/lua/config/lazygit.lua
deleted file mode 100644
index e1c548e..0000000
--- a/nvim/lua/config/lazygit.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-vim.g.lazygit_floating_window_scaling_factor = 1
-vim.g.lazygit_floating_window_border_chars = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '}
-
-return {
-	"kdheepak/lazygit.nvim",
-	lazy = true,
-	cmd = {
-		"LazyGit",
-		"LazyGitConfig",
-		"LazyGitCurrentFile",
-		"LazyGitFilter",
-		"LazyGitFilterCurrentFile",
-	},
-	-- optional for floating window border decoration
-	dependencies = {
-		"nvim-lua/plenary.nvim",
-	},
-	-- setting the keybinding for LazyGit with 'keys' is recommended in
-	-- order to load the plugin when the command is run for the first time
-	keys = {
-		{ "<leader>lg", "<cmd>LazyGit<cr>", desc = "LazyGit" }
-	}
-}