flora-6: merge main branch #178

Merged
teutat3s merged 12 commits from flora-6/merge-main into infra 2023-03-08 17:32:29 +00:00
2 changed files with 4 additions and 1 deletions
Showing only changes of commit 1c6a726d01 - Show all commits

View file

@ -55,6 +55,7 @@ in {
programs.neovim = import ./nvim {
inherit config;
inherit pkgs;
inherit lib;
};
programs.fzf = import ./fzf {
inherit config;

View file

@ -1,6 +1,7 @@
{
config,
pkgs,
lib,
...
}: let
psCfg = config.pub-solar;
@ -42,7 +43,8 @@ in {
universal-ctags
];
plugins = with pkgs.vimPlugins; [
plugins = with pkgs.vimPlugins; [ ]
++ lib.optionals (!cfg.lite) [
nvim-cmp
cmp-nvim-lsp
cmp_luasnip