Fixed tab not working with completion, adds overseer.nvim

This commit is contained in:
Michael Housh
2023-09-28 21:05:06 -04:00
parent a8c4191d96
commit 0e77478075
5 changed files with 27 additions and 19 deletions

View File

@@ -1,3 +1,4 @@
-- Key maps
require('user.mappings')

View File

@@ -15,20 +15,22 @@
"mason-lspconfig.nvim": { "branch": "main", "commit": "2451adb9bdb0fd32140bf3aa8dbc17ff60050db3" },
"mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "71f1841ba6c652908678cece623f52c1fea8a6cd" },
"neogit": { "branch": "master", "commit": "c4f4cd0116cbd969aa0f485c9f4154df1c3f3662" },
"neodev.nvim": { "branch": "main", "commit": "f4abc72add7d2d986371c9d619f7b6f8297aa5ee" },
"neogit": { "branch": "master", "commit": "dfacf16679b120c50c8a2dcefe00f77932523708" },
"nightfox.nvim": { "branch": "main", "commit": "ee3525fdfbe2ed81270a336ccbe62f433165357b" },
"nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
"nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
"nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" },
"nvim-lspconfig": { "branch": "master", "commit": "ede4114e1fd41acb121c70a27e1b026ac68c42d6" },
"nvim-treesitter": { "branch": "master", "commit": "f3fb301b267e85e4cbc725561da4a82b1c3089c8" },
"nvim-treesitter": { "branch": "master", "commit": "0960322686bfa38afd4f1e0b9660473cf77e24b6" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
"nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" },
"nvim-web-devicons": { "branch": "master", "commit": "480a756df82a0c231622c9bf2173bb6634713716" },
"overseer.nvim": { "branch": "master", "commit": "8065976876cea89d0b99ffef4d997b930296f0e8" },
"plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
"swift.nvim": { "branch": "main", "commit": "a84cb608b0076aef39d3d4b1d20448a86a73b2eb" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
"telescope.nvim": { "branch": "0.1.x", "commit": "54930e1abfc94409e1bb9266e752ef8379008592" },
"toggleterm.nvim": { "branch": "main", "commit": "61e8ad370d4da5d84c77e31671027bc094ac06ca" },
"toggleterm.nvim": { "branch": "main", "commit": "0427b908ebefcb3701c7f2cfbdafa37d11afe71a" },
"which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
"wrapping.nvim": { "branch": "master", "commit": "e1ce68aae5ea729fc20e5bc17fb569314f76b9bb" }
}

View File

@@ -100,26 +100,26 @@ return {
behavior = cmp.ConfirmBehavior.Replace,
select = false
},
-- ["<Tab>"] = cmp.mapping(function(fallback)
-- if cmp.visible() then
-- cmp.select_next_item()
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
-- elseif luasnip.expandable() then
-- luasnip.expand()
-- elseif luasnip.expand_or_jumpable() then
-- luasnip.expand_or_jump()
-- elseif has_words_before() then
-- cmp.complete()
-- else
-- fallback()
-- end
-- end, {"i", "s"}),
-- ["<S-Tab>"] = cmp.mapping(function()
-- if cmp.visible() then
-- cmp.select_prev_item()
elseif has_words_before() then
cmp.complete()
else
fallback()
end
end, {"i", "s"}),
["<S-Tab>"] = cmp.mapping(function()
if cmp.visible() then
cmp.select_prev_item()
-- elseif vim.fn["vsnip#jumpable"](-1) == 1 then
-- feedkey("<Plug>(vsnip-jump-prev)", "")
-- end
-- end, {"i", "s"})
end
end, {"i", "s"})
},
sources = {
{name = "nvim_lsp"},

View File

@@ -12,7 +12,8 @@ return {
"onsails/lspkind-nvim",
"famiu/bufdelete.nvim",
"ray-x/lsp_signature.nvim",
"neovim/nvim-lspconfig"
"neovim/nvim-lspconfig",
"folke/neodev.nvim",
},
opts = {
ensure_installed = {

View File

@@ -19,10 +19,14 @@ require("lazy").setup({
},
{ import = 'user.plugin.cmp' },
{ import = 'user.plugin.diffview' },
{ 'folke/neodev.nvim', opts = {} },
{ import = 'user.plugin.lsp' },
{ import = 'user.plugin.lualine' },
{ import = 'user.plugin.neogit' },
{ import = 'user.plugin.neo-tree' },
{ 'stevearc/overseer.nvim', opts = {
strategy = "toggleterm"
}},
{ import = 'user.plugin.swift' },
{ import = 'user.plugin.telescope' },
{ import = 'user.plugin.theme' },