Merge remote-tracking branch 'origin/nixos' into nixos

nixos
Moritz Böhme 2023-03-09 16:21:51 +01:00
commit 033ae38d5c
Signed by: moritz
GPG Key ID: 970C6E89EB0547A9
3 changed files with 62 additions and 51 deletions

View File

@ -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

View File

@ -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; })
]

5
overlays/lib.nix Normal file
View File

@ -0,0 +1,5 @@
{ lib, inputs }:
final: prev: {
inherit lib;
}