ghoscht/nix-config
ghoscht/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add neovim git conflict plugin

Browse source
This commit is contained in:
GHOSCHT 2023-12-10 11:20:55 +01:00
parent 37356b7b48
commit a307b26fa4
Signed by: ghoscht
GPG key ID: 2C2C1C62A5388E82
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
rsc/config/nvim/plugins.lua
View file

@ -1,6 +1,7 @@
local cmp = require "cmp" local cmp = require "cmp"
local plugins = { local plugins = {
{'akinsho/git-conflict.nvim', version = "*", config = true, lazy = false,},
{ {
'numToStr/Comment.nvim', 'numToStr/Comment.nvim',
lazy = false, lazy = false,
@ -43,19 +44,19 @@ local plugins = {
require("nvim-dap-virtual-text").setup() require("nvim-dap-virtual-text").setup()
end end
}, },
{ -- {
"hrsh7th/nvim-cmp", -- "hrsh7th/nvim-cmp",
opts = function() -- opts = function()
local M = require "plugins.configs.cmp" -- local M = require "plugins.configs.cmp"
M.completion.completeopt = "menu,menuone,noselect" -- M.completion.completeopt = "menu,menuone,noselect"
M.mapping["<CR>"] = cmp.mapping.confirm { -- M.mapping["<CR>"] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Insert, -- behavior = cmp.ConfirmBehavior.Insert,
select = false, -- select = false,
} -- }
table.insert(M.sources, {name = "crates"}) -- table.insert(M.sources, {name = "crates"})
return M -- return M
end, -- end,
}, -- },
{ {
"m4xshen/hardtime.nvim", "m4xshen/hardtime.nvim",
dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" },