Merge remote-tracking branch 'origin/nixos' into nixos
commit
033ae38d5c
|
@ -50,11 +50,14 @@ require("nvim-treesitter.configs").setup({
|
|||
},
|
||||
})
|
||||
|
||||
local cmp = require("cmp")
|
||||
local luasnip = require("luasnip")
|
||||
require("copilot_cmp").setup()
|
||||
-- load cmp on InsertEnter
|
||||
vim.api.nvim_create_autocmd("InsertEnter", {
|
||||
callback = function()
|
||||
local cmp = require("cmp")
|
||||
local luasnip = require("luasnip")
|
||||
require("copilot_cmp").setup()
|
||||
|
||||
cmp.setup({
|
||||
cmp.setup({
|
||||
formatting = {
|
||||
format = require("lspkind").cmp_format({
|
||||
mode = "symbol", -- show only symbol annotations
|
||||
|
@ -103,6 +106,8 @@ cmp.setup({
|
|||
{ name = "nvim_lsp", priority = 9 },
|
||||
{ name = "orgmode", priority = 9 },
|
||||
},
|
||||
})
|
||||
end,
|
||||
})
|
||||
|
||||
---merge tables
|
||||
|
|
|
@ -5,4 +5,5 @@ lib.composeManyExtensions [
|
|||
(import ./packages.nix { inherit inputs lib; })
|
||||
(import ./vimPlugins.nix { inherit inputs lib; })
|
||||
(import ./wayland.nix { inherit inputs lib; })
|
||||
(import ./lib.nix { inherit inputs lib; })
|
||||
]
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
{ lib, inputs }:
|
||||
|
||||
final: prev: {
|
||||
inherit lib;
|
||||
}
|
Loading…
Reference in New Issue