bugfix: fix #17

nixvim.nix

@@ -1,5 +1,5 @@
 { nixos ? false, nixOnDroid ? false, homeManager ? false }:
-{ pkgs , lib, config, ... }:
+{ pkgs, lib, config, ... }:
 with lib;
 let
   cfg = config.programs.nixvim;
@@ -23,7 +23,9 @@ let
     };
   };
 
-  mapOption = types.oneOf [ types.str (types.submodule {
+  mapOption = types.oneOf [
+    types.str
+    (types.submodule {
       options = {
         silent = mkOption {
           type = types.bool;
@@ -72,12 +74,13 @@ let
           default = null;
         };
       };
-  }) ];
+    })
+  ];
 
   mapOptions = mode: mkOption {
     description = "Mappings for ${mode} mode";
     type = types.attrsOf mapOption;
-    default = {};
+    default = { };
   };
 
   helpers = import ./plugins/helpers.nix { lib = lib; };
@@ -183,13 +186,14 @@ in
     ./plugins
   ];
 
-  config = let
+  config =
+    let
       neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
         configure = cfg.configure;
         plugins = cfg.extraPlugins;
       };
 
-    extraWrapperArgs = optionalString (cfg.extraPackages != [])
+      extraWrapperArgs = optionalString (cfg.extraPackages != [ ])
         ''--prefix PATH : "${makeBinPath cfg.extraPackages}"'';
 
       package = if (cfg.package != null) then cfg.package else pkgs.neovim;
@@ -209,16 +213,17 @@ in
         '';
 
         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))
             cfg.extraPlugins);
-        opt = filter (f: f!= null)
+          opt = filter (f: f != null)
             (map (x: if x ? plugin && x.optional == true then x.plugin else null)
               cfg.extraPlugins);
         };
       };
 
-    extraConfigLua = optionalString (cfg.globals != {}) ''
+      extraConfigLua = optionalString (cfg.globals != { }) ''
         -- Set up globals {{{
         local __nixvim_globals = ${helpers.toLuaObject cfg.globals}
 
@@ -226,7 +231,7 @@ in
           vim.g[k] = v
         end
         -- }}}
-    '' + optionalString (cfg.options != {}) ''
+      '' + optionalString (cfg.options != { }) ''
         -- Set up options {{{
         local __nixvim_options = ${helpers.toLuaObject cfg.options}
 
@@ -234,7 +239,7 @@ in
           vim.o[k] = v
         end
         -- }}}
-    '' + optionalString (mappings != []) ''
+      '' + optionalString (mappings != [ ]) ''
         -- Set up keybinds {{{
         local __nixvim_binds = ${helpers.toLuaObject mappings}
 
@@ -257,16 +262,18 @@ in
         (helpers.genMaps "!" cfg.maps.insertCommand) ++
         (helpers.genMaps "c" cfg.maps.command);
 
-  in mkIf cfg.enable (if nixos then {
+    in
+    mkIf cfg.enable (if nixos then {
       environment.systemPackages = [ wrappedNeovim ];
       programs.neovim = {
         configure = configure;
-
-      extraConfigLua = extraConfigLua;
       };
 
+      programs.nixvim.extraConfigLua = extraConfigLua;
+
       environment.etc."xdg/nvim/sysinit.vim".text = neovimConfig.neovimRcContent;
-  } else (if homeManager then {
+    } else
+      (if homeManager then {
         programs.nixvim.extraConfigLua = extraConfigLua;
         programs.neovim = {
           enable = true;
@@ -275,5 +282,5 @@ in
           extraConfig = configure.customRC;
           plugins = cfg.extraPlugins;
         };
-  } else {}));
+      } else { }));
 }