diff --git a/lua/basics.lua b/lua/basics.lua index d338225..28a94cd 100644 --- a/lua/basics.lua +++ b/lua/basics.lua @@ -18,6 +18,7 @@ set.expandtab = true vim.cmd [[autocmd FileType markdown setlocal spell spelllang=de,en]] vim.cmd [[autocmd bufnewfile,bufread *.tsx set filetype=typescriptreact]] vim.cmd [[autocmd bufnewfile,bufread *.jsx set filetype=javascriptreact]] +vim.cmd [[autocmd bufnewfile,bufread Jenkinsfile set filetype=groovy]] set.splitright = true set.splitbelow = true diff --git a/lua/keys.lua b/lua/keys.lua index ba81c40..3fea0d5 100644 --- a/lua/keys.lua +++ b/lua/keys.lua @@ -25,3 +25,21 @@ function _G.toggle_venn() end -- toggle keymappings for venn using v vim.api.nvim_set_keymap("n", "v", ":lua toggle_venn()", {noremap = true}) +vim.api.nvim_set_keymap( + "v", + "mc", + "lua require('nvim-magic.flows').append_completion(require('nvim-magic').backends.default)", + {} +) +vim.api.nvim_set_keymap( + "v", + "ma", + "lua require('nvim-magic.flows').suggest_alteration(require('nvim-magic').backends.default)", + {} +) +vim.api.nvim_set_keymap( + "v", + "md", + "lua require('nvim-magic.flows').suggest_docstring(require('nvim-magic').backends.default)", + {} +) diff --git a/lua/plugins.lua b/lua/plugins.lua index 5898dd8..4852abd 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -198,5 +198,21 @@ return require("packer").startup( end } use "jbyuki/venn.nvim" + use "editorconfig/editorconfig-vim" + use( + { + "jameshiew/nvim-magic", + config = function() + require("nvim-magic").setup({ + use_default_keymap = false + }) + end, + tag = "v0.2.1", -- recommended to pin to a tag and update manually as there may be breaking changes + requires = { + "nvim-lua/plenary.nvim", + "MunifTanjim/nui.nvim" + } + } + ) end ) diff --git a/lua/plugins/compe.lua b/lua/plugins/compe.lua index af1dd68..3970f3d 100644 --- a/lua/plugins/compe.lua +++ b/lua/plugins/compe.lua @@ -21,6 +21,8 @@ require "compe".setup { } vim.api.nvim_set_keymap("i", "", "compe#complete()", {silent = true, expr = true}) +vim.api.nvim_set_keymap("i", "", "compe#complete()", {silent = true, expr = true}) vim.api.nvim_set_keymap("i", "", "compe#confirm('')", {silent = true, expr = true}) vim.api.nvim_set_keymap("i", "", "compe#close('')", {silent = true, expr = true}) -vim.api.nvim_set_keymap("i", "", "compe#complete()", {silent = true, expr = true}) +-- vim.api.nvim_set_keymap("i", "", "compe#scroll({ 'delta': +4 })", {silent = true, expr = true}) +-- vim.api.nvim_set_keymap("i", "", "compe#scroll({ 'delta': -4 })", {silent = true, expr = true})