diff --git a/init.lua b/init.lua index 34a17b6..023b570 100755 --- a/init.lua +++ b/init.lua @@ -17,3 +17,4 @@ require('plugins/neoscroll') require('plugins/marks') require('plugins/null-ls') require('plugins/nvim-mapper') +--`require('plugins/nvim-octo') diff --git a/lua/keymaps.lua b/lua/keymaps.lua index d743418..d24153e 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -46,3 +46,10 @@ map('n', 'ff', ':Telescope find_files', default_opts) map('n', 'fg', ':Telescope live_grep', default_opts) map('n', 'fb', ':Telescope buffers', default_opts) map('n', 'fe', ':Telescope file_browser', default_opts) + +Mapper = require("nvim-mapper") +local M = Mapper.map +-- For Neovim >= 0.7.0 +M('n', 'P', ":MarkdownPreview", {silent = true, noremap = true}, "Markdown", "md_preview", "Display Markdown preview in Qutebrowser") +M('n', 'fe', ":Telescope file_browser", {silent=true, noremap=true}, "Telescope", "telescope-file-browser", "Find files and directories in telescope") + diff --git a/lua/plugins/nvim-mapper.lua b/lua/plugins/nvim-mapper.lua index 8ee598d..002fe60 100644 --- a/lua/plugins/nvim-mapper.lua +++ b/lua/plugins/nvim-mapper.lua @@ -3,7 +3,7 @@ require("nvim-mapper").setup({ no_map = false, -- where should ripgrep look for your keybinds definitions. -- Default config search path is ~/.config/nvim/lua - search_path = os.getenv("HOME") .. "/.config/nvim/lua", + search_path = os.getenv("~/.config/nvim/lua/keymaps.lua"), -- what should be done with the selected keybind when pressing enter. -- Available actions: -- * "definition" - Go to keybind definition (default) diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index fef8d53..6aa570d 100755 --- a/lua/plugins/plugins.lua +++ b/lua/plugins/plugins.lua @@ -20,6 +20,13 @@ return require'packer'.startup(function() 'neovim/nvim-lspconfig', } + -- Manage all your Keymaps! + use { + "lazytanuki/nvim-mapper", + config = function() require("nvim-mapper").setup{} end, + before = "telescope.nvim" +} + -- Neovim Autocomplete with LSP use { 'hrsh7th/nvim-cmp', @@ -82,13 +89,6 @@ return require'packer'.startup(function() end } - -- Manage all your Keymaps! - use { - "lazytanuki/nvim-mapper", - config = function() require("nvim-mapper").setup{} end, - before = "telescope.nvim" -} - -- Close your brackets easily use { 'windwp/nvim-autopairs', diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 76db320..69b2475 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -13,7 +13,6 @@ local telescope_installer = require('telescope').setup({ -- map actions.which_key to (default: ) -- actions.which_key shows the mappings for your picker, -- e.g. git_{create, delete, ...}_branch for the git_branches picker - [""] = "which_key" } } }, @@ -29,6 +28,10 @@ local telescope_installer = require('telescope').setup({ hijack_netrw = true, mappings = { ["i"] = { + [""] = fb_actions.create, + [""] = fb_actions.remove, + [""] = fb_actions.copy, + [""] = fb_actions.move, }, ["n"] = { @@ -39,3 +42,4 @@ local telescope_installer = require('telescope').setup({ }) require("telescope").load_extension "file_browser" +require("telescope").load_extension "mapper" diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index 44b4dcd..dd442dd 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -335,38 +335,38 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: todo-comments.nvim -time([[Config for todo-comments.nvim]], true) -try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18todo-comments\frequire\0", "config", "todo-comments.nvim") -time([[Config for todo-comments.nvim]], false) --- Config for: tmux.nvim -time([[Config for tmux.nvim]], true) -try_loadstring("\27LJ\2\n2\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\ttmux\frequire\0", "config", "tmux.nvim") -time([[Config for tmux.nvim]], false) --- Config for: nvim-mapper -time([[Config for nvim-mapper]], true) -try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\16nvim-mapper\frequire\0", "config", "nvim-mapper") -time([[Config for nvim-mapper]], false) --- Config for: mkdnflow.nvim -time([[Config for mkdnflow.nvim]], true) -try_loadstring("\27LJ\2\nš\2\0\0\6\0\23\0\0316\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\21\0005\3\5\0005\4\4\0005\5\3\0>\5\1\4=\4\6\0035\4\b\0005\5\a\0>\5\1\4=\4\t\0035\4\v\0005\5\n\0>\5\1\4=\4\f\0035\4\14\0005\5\r\0>\5\1\4=\4\15\0035\4\17\0005\5\16\0>\5\1\4=\4\18\0035\4\19\0=\4\20\3=\3\22\2B\0\2\1K\0\1\0\rmappings\1\0\0\19MkdnFollowLink\1\3\0\0\6n\14p\rMkdnSTab\1\3\0\0\0\f\1\2\0\0\6i\fMkdnTab\1\3\0\0\0\n\1\2\0\0\6i\14MkdnEnter\1\3\0\0\0\t\1\2\0\0\6n\20MkdnNewListItem\1\3\0\0\0\t\1\2\0\0\6i\19MkdnToggleToDo\1\0\1\22MkdnTableNextCell\1\1\3\0\0\0\14\1\3\0\0\6i\6n\nsetup\rmkdnflow\frequire\0", "config", "mkdnflow.nvim") -time([[Config for mkdnflow.nvim]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) -- Config for: trouble.nvim time([[Config for trouble.nvim]], true) try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0", "config", "trouble.nvim") time([[Config for trouble.nvim]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14telescope\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) +-- Config for: mkdnflow.nvim +time([[Config for mkdnflow.nvim]], true) +try_loadstring("\27LJ\2\nš\2\0\0\6\0\23\0\0316\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\21\0005\3\5\0005\4\4\0005\5\3\0>\5\1\4=\4\6\0035\4\b\0005\5\a\0>\5\1\4=\4\t\0035\4\v\0005\5\n\0>\5\1\4=\4\f\0035\4\14\0005\5\r\0>\5\1\4=\4\15\0035\4\17\0005\5\16\0>\5\1\4=\4\18\0035\4\19\0=\4\20\3=\3\22\2B\0\2\1K\0\1\0\rmappings\1\0\0\19MkdnFollowLink\1\3\0\0\6n\14p\rMkdnSTab\1\3\0\0\0\f\1\2\0\0\6i\fMkdnTab\1\3\0\0\0\n\1\2\0\0\6i\14MkdnEnter\1\3\0\0\0\t\1\2\0\0\6n\20MkdnNewListItem\1\3\0\0\0\t\1\2\0\0\6i\19MkdnToggleToDo\1\0\1\22MkdnTableNextCell\1\1\3\0\0\0\14\1\3\0\0\6i\6n\nsetup\rmkdnflow\frequire\0", "config", "mkdnflow.nvim") +time([[Config for mkdnflow.nvim]], false) -- Config for: nvim-autopairs time([[Config for nvim-autopairs]], true) try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") time([[Config for nvim-autopairs]], false) +-- Config for: nvim-mapper +time([[Config for nvim-mapper]], true) +try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\16nvim-mapper\frequire\0", "config", "nvim-mapper") +time([[Config for nvim-mapper]], false) +-- Config for: tmux.nvim +time([[Config for tmux.nvim]], true) +try_loadstring("\27LJ\2\n2\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\ttmux\frequire\0", "config", "tmux.nvim") +time([[Config for tmux.nvim]], false) -- Config for: mind.nvim time([[Config for mind.nvim]], true) try_loadstring("\27LJ\2\n2\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\tmind\frequire\0", "config", "mind.nvim") time([[Config for mind.nvim]], false) +-- Config for: todo-comments.nvim +time([[Config for todo-comments.nvim]], true) +try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18todo-comments\frequire\0", "config", "todo-comments.nvim") +time([[Config for todo-comments.nvim]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then