nix: tidy up neovimConfig & wrapper call

1 files changed, 10 insertions, 11 deletions

diff --git a/neovim.nix b/neovim.nix
index 66017c0..b42ccbd 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -77,19 +77,18 @@ self: {
   ];
 
   neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
-    withPython3 = true;
-    withRuby = false;
     plugins = plugins ++ [config];
-    customRC = ''
-      lua require("getchoo")
-    '';
   };
 in
-  pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped (lib.recursiveUpdate
+  pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped (
     neovimConfig
-    {
+    // {
+      luaRcContent = ''
+        require("getchoo")
+      '';
+
       wrapperArgs =
-        lib.escapeShellArgs neovimConfig.wrapperArgs
-        + " "
-        + ''--suffix PATH : "${lib.makeBinPath extraPackages}"'';
-    })
+        neovimConfig.wrapperArgs
+        ++ ["--suffix" "PATH" ":" "${lib.makeBinPath extraPackages}"];
+    }
+  )