chayleaf/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

home/nvim: allow not setting plugin package

Browse source
This commit is contained in:
chayleaf 2024-10-10 03:31:55 +07:00
parent 34ed24d470
commit 7e111b4021
Signed by: chayleaf
GPG key ID: 78171AD46227E68E
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
home/modules/nvim.nix
View file

@ -73,9 +73,9 @@
luasnip = REQ "luasnip"; luasnip = REQ "luasnip";
plugins = let ps = pkgs.vimPlugins; in [ plugins = let ps = pkgs.vimPlugins; in [
ps.vim-svelte { plugin = ps.vim-svelte; }
# vim-nix isn't necessary for syntax highlighting, but it improves overall editing experience # vim-nix isn't necessary for syntax highlighting, but it improves overall editing experience
ps.vim-nix { plugin = ps.vim-nix; }
{ plugin = pkgs.vimUtils.buildVimPlugin { { plugin = pkgs.vimUtils.buildVimPlugin {
pname = "vscode-nvim"; pname = "vscode-nvim";
version = "2023-02-10"; version = "2023-02-10";
@ -124,8 +124,8 @@
}; };
}) })
])); } ])); }
ps.vim-sleuth { plugin = ps.vim-sleuth; }
ps.luasnip { plugin = ps.luasnip; }
{ plugin = ps.nvim-cmp; { plugin = ps.nvim-cmp;
config = let config = let
border = (name: [ border = (name: [
@ -200,9 +200,9 @@
]; ];
} }
)); } )); }
ps.lspkind-nvim { plugin = ps.lspkind-nvim; }
ps.cmp_luasnip { plugin = ps.cmp_luasnip; }
ps.cmp-nvim-lsp { plugin = ps.cmp-nvim-lsp; }
{ plugin = ps.nvim-autopairs; { plugin = ps.nvim-autopairs;
config = (LET config = (LET
(REQ "cmp") (REQ "nvim-autopairs.completion.cmp") (REQ "nvim-autopairs") (REQ "cmp") (REQ "nvim-autopairs.completion.cmp") (REQ "nvim-autopairs")
@ -413,7 +413,7 @@
vimdiffAlias = true; vimdiffAlias = true;
extraConfigLua = compile "main" ( extraConfigLua = compile "main" (
builtins.concatLists (map (x: if x?plugin then lib.toList x.config else [ ]) plugins) ++ [ builtins.concatLists (map (x: if x?plugin && x?config then lib.toList x.config else [ ]) plugins) ++ [
(kmSetNs { (kmSetNs {
"<C-X>" = { "<C-X>" = {
rhs = DEFUN (vim.fn.system [ "chmod" "+x" (vim.fn.expand "%") ]); rhs = DEFUN (vim.fn.system [ "chmod" "+x" (vim.fn.expand "%") ]);
@ -475,6 +475,6 @@
} }
)) ))
]); ]);
extraPlugins = map (x: x.plugin or x) plugins; extraPlugins = builtins.filter (x: x != null) (map (x: x.plugin or null) plugins);
}; };
} }