From 09cc4e611004f2214597e565e2813c55cf6affe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Sat, 18 Jan 2025 11:48:50 +0100
Subject: [PATCH] fix(nvim): don't combine plugins unless standalone

Its causing errors sadly T-T
---
 flake-modules/nvim.nix | 7 +++++--
 nvim/standalone.nix    | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/flake-modules/nvim.nix b/flake-modules/nvim.nix
index f5085bc..7e5e988 100644
--- a/flake-modules/nvim.nix
+++ b/flake-modules/nvim.nix
@@ -3,7 +3,7 @@
   flake.overlays.nixvim = inputs.nixvim.overlays.default;
 
   perSystem =
-    { system, ... }:
+    { lib, system, ... }:
     let
       nixvimLib = inputs.nixvim.lib.${system};
       nixvim = inputs.nixvim.legacyPackages.${system};
@@ -12,7 +12,10 @@
         pkgs = inputs.unstable.legacyPackages.${system};
         module = {
           imports = [ ../nvim/standalone.nix ];
-          config = extraConfig;
+          config = lib.mkMerge [
+            { performance.combinePlugins.enable = true; }
+            extraConfig
+          ];
         };
       };
       moduleDev = nvimModule { };
diff --git a/nvim/standalone.nix b/nvim/standalone.nix
index 87bde7b..8e25d9e 100644
--- a/nvim/standalone.nix
+++ b/nvim/standalone.nix
@@ -42,7 +42,6 @@
       # Enable local configuration :h 'exrc'
       exrc = true; # safe since nvim 0.9
     };
-    performance.combinePlugins.enable = true;
     extraPlugins =
       let
         plugins = pkgs.vimPlugins;