diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua index af54282..05ea4df 100644 --- a/lua/core/mappings.lua +++ b/lua/core/mappings.lua @@ -379,21 +379,22 @@ M.fzf_lua = {--{{{ n = { -- find - [""] = { " FzfLua files ", "find files" }, + [""] = { " FzfLua files ", "FzfLua find files" }, + ["fl"] = { " FzfLua lines ", "FzfLua grep in lines" }, -- grep - ["fw"] = { " FzfLua grep_cword ", "grep cword" }, - ["f."] = { " FzfLua live_grep_native ", "grep live native" }, - ["f*"] = { " FzfLua live_grep_glob ", "grep with glob (SPACE-- globs)"}, + ["fw"] = { " FzfLua grep_cword ", "FzfLua grep cword" }, + ["f."] = { " FzfLua live_grep_native ", "FzfLua grep live native" }, + ["f*"] = { " FzfLua live_grep_glob ", "FzfLua grep with glob (SPACE-- globs)"}, -- continue - ["ff"] = { " FzfLua resume ", "resume last search"}, + ["ff"] = { " FzfLua resume ", "FzfLua resume last search"}, - [";"] = { " FzfLua buffers ", "find buffers" }, + [";"] = { " FzfLua buffers ", "FzfLua find buffers" }, ["fb"] = { " FzfLua builtins ", "FzfLua builtins" }, - ["fh"] = { " FzfLua help_tags ", "find help pages" }, - ["fo"] = { " FzfLua oldfiles ", "find oldfiles" }, - ["tk"] = { " lua require'custom.plugins.fzflua'.keymaps() ", "show keymaps" }, + ["fh"] = { " FzfLua help_tags ", "FzfLua find help pages" }, + ["fo"] = { " FzfLua oldfiles ", "FzfLua find oldfiles" }, + ["tk"] = { " lua require'custom.plugins.fzflua'.keymaps() ", "FzfLua show keymaps" }, } }--}}} diff --git a/lua/custom/plugins/fzflua.lua b/lua/custom/plugins/fzflua.lua index 2b36183..73f39f6 100644 --- a/lua/custom/plugins/fzflua.lua +++ b/lua/custom/plugins/fzflua.lua @@ -19,7 +19,7 @@ M.keymaps = function(opts) local add_keymap = function(keymap) -- hijack fields local keymap_desc = keymap.desc == nil and keymap.rhs or keymap.desc - keymap.str = string.format("%s │ %-40ls │ %s", + keymap.str = string.format("%s │ %-40s │ %s", utils.ansi_codes[modes[keymap.mode] or "blue"](keymap.mode), keymap.lhs:gsub("%s", ""), keymap_desc) diff --git a/lua/custom/plugins/info.lua b/lua/custom/plugins/info.lua new file mode 100644 index 0000000..392ec14 --- /dev/null +++ b/lua/custom/plugins/info.lua @@ -0,0 +1,24 @@ +local M = {} + +M.set_mappings = function () + vim.cmd [[ + nnoremap I :tab Info + augroup INFO + au! + au FileType info nnoremap i + au FileType info nmap (InfoUp) + au FileType info nmap iu (InfoUp) + au FileType info nmap (InfoMenu) + au FileType info nmap im (InfoMenu) + au FileType info nmap (InfoFollow) + au FileType info nmap if (InfoFollow) + au FileType info nmap (InfoNext) + au FileType info nmap in (InfoNext) + au FileType info nmap (InfoPrev) + au FileType info nmap ip (InfoPrev) + au FileType info nmap ig (InfoGoto) + augroup END + ]] +end + +return M diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 5e5459a..fb5d5ad 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -1,9 +1,9 @@ return { ["nvim-treesitter/nvim-treesitter-textobjects"] = { after = "nvim-treesitter", - -- config = function() - -- require("custom.plugins.configs.treesitter-to") - -- end + config = function() + require("custom.plugins.configs.treesitter-to") + end }, ["mfussenegger/nvim-dap"] = { module = "dap" @@ -38,6 +38,9 @@ return { vim.g.asyncrun_open = 8 end }, + ["tpope/vim-fugitive"] = { + cmd = "G*" + }, -- restore view ["vim-scripts/restore_view.vim"] = {},