mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 08:35:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bugfix: fix #17

Browse source
This commit is contained in:
Pedro Alves 2022-05-03 17:43:52 +01:00
parent d934a33ab5
commit c298e98002
1 changed files with 137 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

23
nixvim.nix
View file

@ -23,7 +23,9 @@ let
}; };
}; };
mapOption = types.oneOf [ types.str (types.submodule { mapOption = types.oneOf [
types.str
(types.submodule {
options = { options = {
silent = mkOption { silent = mkOption {
type = types.bool; type = types.bool;
@ -72,7 +74,8 @@ let
default = null; default = null;
}; };
}; };
}) ]; })
];
mapOptions = mode: mkOption { mapOptions = mode: mkOption {
description = "Mappings for ${mode} mode"; description = "Mappings for ${mode} mode";
@ -183,7 +186,8 @@ in
./plugins ./plugins
]; ];
config = let config =
let
neovimConfig = pkgs.neovimUtils.makeNeovimConfig { neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
configure = cfg.configure; configure = cfg.configure;
plugins = cfg.extraPlugins; plugins = cfg.extraPlugins;
@ -209,7 +213,8 @@ in
''; '';
packages.nixvim = { packages.nixvim = {
start = filter (f: f != null) (map (x: start = filter (f: f != null) (map
(x:
if x ? plugin && x.optional == true then null else (x.plugin or x)) if x ? plugin && x.optional == true then null else (x.plugin or x))
cfg.extraPlugins); cfg.extraPlugins);
opt = filter (f: f != null) opt = filter (f: f != null)
@ -257,16 +262,18 @@ in
(helpers.genMaps "!" cfg.maps.insertCommand) ++ (helpers.genMaps "!" cfg.maps.insertCommand) ++
(helpers.genMaps "c" cfg.maps.command); (helpers.genMaps "c" cfg.maps.command);
in mkIf cfg.enable (if nixos then { in
mkIf cfg.enable (if nixos then {
environment.systemPackages = [ wrappedNeovim ]; environment.systemPackages = [ wrappedNeovim ];
programs.neovim = { programs.neovim = {
configure = configure; configure = configure;
extraConfigLua = extraConfigLua;
}; };
programs.nixvim.extraConfigLua = extraConfigLua;
environment.etc."xdg/nvim/sysinit.vim".text = neovimConfig.neovimRcContent; environment.etc."xdg/nvim/sysinit.vim".text = neovimConfig.neovimRcContent;
} else (if homeManager then { } else
(if homeManager then {
programs.nixvim.extraConfigLua = extraConfigLua; programs.nixvim.extraConfigLua = extraConfigLua;
programs.neovim = { programs.neovim = {
enable = true; enable = true;