Improve diff handling and sort keybindings
This commit is contained in:
parent
ac8dc56fc4
commit
082bbd2bb2
@ -15,7 +15,6 @@ local function manage_plugins()
|
|||||||
local plugins = {
|
local plugins = {
|
||||||
["https://github.com/faerryn/plogins.nvim.git"] = {},
|
["https://github.com/faerryn/plogins.nvim.git"] = {},
|
||||||
["https://github.com/tpope/vim-sensible.git"] = {},
|
["https://github.com/tpope/vim-sensible.git"] = {},
|
||||||
["https://github.com/neovim/nvim-lspconfig.git"] = {},
|
|
||||||
["https://github.com/ojroques/nvim-hardline.git"] = {
|
["https://github.com/ojroques/nvim-hardline.git"] = {
|
||||||
packadd_hook = function()
|
packadd_hook = function()
|
||||||
require('hardline').setup()
|
require('hardline').setup()
|
||||||
@ -86,9 +85,9 @@ local function manage_plugins()
|
|||||||
-- documentation = cmp.config.window.bordered(),
|
-- documentation = cmp.config.window.bordered(),
|
||||||
},
|
},
|
||||||
mapping = cmp.mapping.preset.insert({
|
mapping = cmp.mapping.preset.insert({
|
||||||
['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
--['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
||||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
--['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||||
['<C-Space>'] = cmp.mapping.complete(),
|
--['<C-Space>'] = cmp.mapping.complete(),
|
||||||
['<C-e>'] = cmp.mapping.abort(),
|
['<C-e>'] = cmp.mapping.abort(),
|
||||||
['<CR>'] = cmp.mapping.confirm({ select = true }),
|
['<CR>'] = cmp.mapping.confirm({ select = true }),
|
||||||
["<Tab>"] = cmp.mapping(function(fallback)
|
["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
@ -149,7 +148,8 @@ local function manage_plugins()
|
|||||||
end
|
end
|
||||||
},
|
},
|
||||||
|
|
||||||
-- LSP servers
|
-- LSP configuration
|
||||||
|
["https://github.com/neovim/nvim-lspconfig.git"] = {},
|
||||||
["https://github.com/simrat39/rust-tools.nvim.git"] = {
|
["https://github.com/simrat39/rust-tools.nvim.git"] = {
|
||||||
packadd_after = {
|
packadd_after = {
|
||||||
["https://github.com/neovim/nvim-lspconfig.git"] = true,
|
["https://github.com/neovim/nvim-lspconfig.git"] = true,
|
||||||
@ -164,11 +164,11 @@ local function manage_plugins()
|
|||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
on_attach = function(_, bufnr)
|
on_attach = function(_, bufnr)
|
||||||
-- Hover actions
|
-- Hover actions
|
||||||
--vim.keymap.set("n", "<C-space>",
|
vim.keymap.set("n", "<C-space>",
|
||||||
--rt.hover_actions.hover_actions, { buffer = bufnr })
|
rt.hover_actions.hover_actions, { buffer = bufnr })
|
||||||
---- Code action groups
|
---- Code action groups
|
||||||
--vim.keymap.set("n", "<Leader>a",
|
vim.keymap.set("n", "<Leader>a",
|
||||||
--rt.code_action_group.code_action_group, { buffer = bufnr })
|
rt.code_action_group.code_action_group, { buffer = bufnr })
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
@ -191,6 +191,13 @@ local function manage_plugins()
|
|||||||
vim.cmd('set signcolumn=number')
|
vim.cmd('set signcolumn=number')
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
|
["https://github.com/nvim-lua/plenary.nvim.git"] = {},
|
||||||
|
["https://github.com/sindrets/diffview.nvim.git"] = {
|
||||||
|
packadd_after = { ["https://github.com/nvim-lua/plenary.nvim.git"] = true },
|
||||||
|
packadd_hook = function()
|
||||||
|
vim.api.nvim_set_keymap('n', '<leader>g', ":DiffviewOpen", {})
|
||||||
|
end
|
||||||
|
},
|
||||||
|
|
||||||
-- Syntax highlight
|
-- Syntax highlight
|
||||||
["https://github.com/nvim-treesitter/nvim-treesitter.git"] = {
|
["https://github.com/nvim-treesitter/nvim-treesitter.git"] = {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user