Merge remote-tracking branch 'origin/nixos' into nixos
This commit is contained in:
commit
033ae38d5c
3 changed files with 62 additions and 51 deletions
|
@ -50,6 +50,9 @@ require("nvim-treesitter.configs").setup({
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- load cmp on InsertEnter
|
||||||
|
vim.api.nvim_create_autocmd("InsertEnter", {
|
||||||
|
callback = function()
|
||||||
local cmp = require("cmp")
|
local cmp = require("cmp")
|
||||||
local luasnip = require("luasnip")
|
local luasnip = require("luasnip")
|
||||||
require("copilot_cmp").setup()
|
require("copilot_cmp").setup()
|
||||||
|
@ -104,6 +107,8 @@ cmp.setup({
|
||||||
{ name = "orgmode", priority = 9 },
|
{ name = "orgmode", priority = 9 },
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
---merge tables
|
---merge tables
|
||||||
---@param ... table[]
|
---@param ... table[]
|
||||||
|
|
|
@ -5,4 +5,5 @@ lib.composeManyExtensions [
|
||||||
(import ./packages.nix { inherit inputs lib; })
|
(import ./packages.nix { inherit inputs lib; })
|
||||||
(import ./vimPlugins.nix { inherit inputs lib; })
|
(import ./vimPlugins.nix { inherit inputs lib; })
|
||||||
(import ./wayland.nix { inherit inputs lib; })
|
(import ./wayland.nix { inherit inputs lib; })
|
||||||
|
(import ./lib.nix { inherit inputs lib; })
|
||||||
]
|
]
|
||||||
|
|
5
overlays/lib.nix
Normal file
5
overlays/lib.nix
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
{ lib, inputs }:
|
||||||
|
|
||||||
|
final: prev: {
|
||||||
|
inherit lib;
|
||||||
|
}
|
Loading…
Reference in a new issue