diff --git a/init.lua b/init.lua index 91fb276..34a17b6 100755 --- a/init.lua +++ b/init.lua @@ -16,3 +16,4 @@ require('plugins/snippets') require('plugins/neoscroll') require('plugins/marks') require('plugins/null-ls') +require('plugins/nvim-mapper') diff --git a/lua/plugins/nvim-lspconfig.lua b/lua/plugins/nvim-lspconfig.lua index 92d8b5e..e989aaa 100644 --- a/lua/plugins/nvim-lspconfig.lua +++ b/lua/plugins/nvim-lspconfig.lua @@ -127,7 +127,7 @@ end -- Use a loop to conveniently call 'setup' on multiple servers and -- map buffer local keybindings when the language server attaches. -- Add your language server below: -local servers = { 'bashls', 'pyright', 'clangd', 'html', 'cssls', 'tsserver' } +local servers = { 'bashls', 'pyright', 'clangd', 'html', 'cssls', 'tsserver', 'jedi-language-server' } -- Call setup for _, lsp in ipairs(servers) do diff --git a/lua/plugins/nvim-mapper.lua b/lua/plugins/nvim-mapper.lua new file mode 100644 index 0000000..8ee598d --- /dev/null +++ b/lua/plugins/nvim-mapper.lua @@ -0,0 +1,12 @@ +require("nvim-mapper").setup({ + -- do not assign the default keymap (MM) + 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", + -- what should be done with the selected keybind when pressing enter. + -- Available actions: + -- * "definition" - Go to keybind definition (default) + -- * "execute" - Execute the keybind command + action_on_enter = "definition", +}) diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index 835858b..fef8d53 100755 --- a/lua/plugins/plugins.lua +++ b/lua/plugins/plugins.lua @@ -14,8 +14,11 @@ return require'packer'.startup(function() ----------------------------------------------------------------- -- Easy Way to install Language Servers - use 'williamboman/mason.nvim' - use 'williamboman/mason-lspconfig.nvim' + use { + 'williamboman/mason.nvim', + 'williamboman/mason-lspconfig.nvim', + 'neovim/nvim-lspconfig', +} -- Neovim Autocomplete with LSP use { @@ -58,10 +61,9 @@ return require'packer'.startup(function() config = function() require("tmux").setup() end }) -- Find & Search LSP Tags - use 'liuchengxu/vista.vim' + -- Snippets - use 'rafamadriz/friendly-snippets' -- Rename and Work with Buffer & Tabs @@ -79,7 +81,15 @@ 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', config = function() diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 813f96e..76db320 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -29,10 +29,8 @@ local telescope_installer = require('telescope').setup({ hijack_netrw = true, mappings = { ["i"] = { - [""] = fb_actions.goto_home_dir }, ["n"] = { - [""] = fb_actions.create }, }, diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index 970fd88..44b4dcd 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -227,6 +227,12 @@ _G.packer_plugins = { path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", url = "https://github.com/neovim/nvim-lspconfig" }, + ["nvim-mapper"] = { + config = { "\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" }, + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/nvim-mapper", + url = "https://github.com/lazytanuki/nvim-mapper" + }, ["nvim-notify"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/nvim-notify", @@ -329,34 +335,38 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], 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: 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: 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: 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: 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: 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: 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: 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) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then