From 686c63b9dc7837578a5686eb9afc6d08ebe82e88 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 20 May 2024 21:12:29 -0400 Subject: nix: tidy up neovimConfig & wrapper call --- neovim.nix | 21 ++++++++++----------- 1 file 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}"]; + } + ) -- cgit v1.2.3