diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index 673a302..dd8fbef 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -1,4 +1,10 @@ return { 'tpope/vim-fugitive', cmd = 'Git', + init = function() + local u = require('utils') + local map = u.set_keymap + + map('n', '<leader>vg', ':vert Git<cr>', { desc = 'Git status' }) + end, } diff --git a/lua/plugins/telescope/config.lua b/lua/plugins/telescope/config.lua index 47581a8..e1c603f 100644 --- a/lua/plugins/telescope/config.lua +++ b/lua/plugins/telescope/config.lua @@ -1,5 +1,4 @@ local actions = require('telescope.actions') -local config = require('config') local icons = require('utils.icons') local u = require('utils') @@ -15,6 +14,7 @@ local default_mappings = { }, } +--[[ mewo ]] local opts_cursor = { initial_mode = 'normal', sorting_strategy = 'ascending', @@ -47,7 +47,7 @@ local opts_flex = { }, } -require('telescope').setup(u.merge({ +require('telescope').setup({ defaults = { selection_caret = icons.folder.arrow_closed, file_ignore_patterns = { @@ -69,10 +69,10 @@ require('telescope').setup(u.merge({ }, extensions = { fzf = { - fuzzy = true, -- false will only do exact matching + fuzzy = true, -- false will only do exact matching override_generic_sorter = true, -- override the generic sorter - override_file_sorter = true, -- override the file sorter - case_mode = 'smart_case', -- or "ignore_case" or "respect_case" + override_file_sorter = true, -- override the file sorter + case_mode = 'smart_case', -- or "ignore_case" or "respect_case" -- the default case_mode is "smart_case" }, }, @@ -131,6 +131,6 @@ require('telescope').setup(u.merge({ mappings = default_mappings, }), }, -}, config.plugins.telescope or {})) +}) require('telescope').load_extension('fzf') diff --git a/lua/plugins/telescope/init.lua b/lua/plugins/telescope/init.lua index 2211016..b802520 100644 --- a/lua/plugins/telescope/init.lua +++ b/lua/plugins/telescope/init.lua @@ -24,7 +24,6 @@ return { -- git navigation map('n', '<leader>vc', ':Telescope git_commits<cr>', { desc = 'Git commits' }) - map('n', '<leader>vg', ':Telescope git_status<cr>', { desc = 'Git status' }) config.lsp.add_on_attach_mapping(function(_, bufnr) local buf_map = u.create_buf_map(bufnr)