From 87509bac1f73517d9bb5d696b6d73ba7622cef90 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Tue, 24 Sep 2024 11:25:43 +0100
Subject: [PATCH] wrappers: move assertion propagation to `_shared.nix`

---
 wrappers/_shared.nix |  3 +++
 wrappers/darwin.nix  | 15 ++++++---------
 wrappers/hm.nix      | 31 ++++++++++++++-----------------
 wrappers/nixos.nix   | 29 +++++++++++++----------------
 4 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/wrappers/_shared.nix b/wrappers/_shared.nix
index 9851d73f..4a891de2 100644
--- a/wrappers/_shared.nix
+++ b/wrappers/_shared.nix
@@ -53,6 +53,9 @@ in
       _module.args.nixvimLib = lib.mkDefault config.lib.nixvim.extendedLib;
     }
 
+    # Propagate nixvim's assertions to the host modules
+    (lib.mkIf cfg.enable { inherit (cfg) warnings assertions; })
+
     # Propagate extraFiles to the host modules
     (optionalAttrs (filesOpt != null) (
       mkIf (!cfg.wrapRc) (
diff --git a/wrappers/darwin.nix b/wrappers/darwin.nix
index 6c36aed0..40ae8062 100644
--- a/wrappers/darwin.nix
+++ b/wrappers/darwin.nix
@@ -37,13 +37,10 @@ in
 
   imports = [ (import ./_shared.nix { }) ];
 
-  config = mkIf cfg.enable (mkMerge [
-    {
-      environment.systemPackages = [
-        cfg.finalPackage
-        cfg.printInitPackage
-      ] ++ (lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs);
-    }
-    { inherit (cfg) warnings assertions; }
-  ]);
+  config = mkIf cfg.enable {
+    environment.systemPackages = [
+      cfg.finalPackage
+      cfg.printInitPackage
+    ] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs;
+  };
 }
diff --git a/wrappers/hm.nix b/wrappers/hm.nix
index ab518bb1..ec7701d9 100644
--- a/wrappers/hm.nix
+++ b/wrappers/hm.nix
@@ -43,21 +43,18 @@ in
     })
   ];
 
-  config = mkIf cfg.enable (mkMerge [
-    {
-      home.packages = [
-        cfg.finalPackage
-        cfg.printInitPackage
-      ] ++ (lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs);
-    }
-    {
-      inherit (cfg) warnings assertions;
-      home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "nvim"; };
-    }
-    {
-      programs.bash.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
-      programs.fish.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
-      programs.zsh.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
-    }
-  ]);
+  config = mkIf cfg.enable {
+    home.packages = [
+      cfg.finalPackage
+      cfg.printInitPackage
+    ] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs;
+
+    home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "nvim"; };
+
+    programs = mkIf cfg.vimdiffAlias {
+      bash.shellAliases.vimdiff = "nvim -d";
+      fish.shellAliases.vimdiff = "nvim -d";
+      zsh.shellAliases.vimdiff = "nvim -d";
+    };
+  };
 }
diff --git a/wrappers/nixos.nix b/wrappers/nixos.nix
index 516c8113..7033c3d1 100644
--- a/wrappers/nixos.nix
+++ b/wrappers/nixos.nix
@@ -45,20 +45,17 @@ in
     })
   ];
 
-  config = mkIf cfg.enable (mkMerge [
-    {
-      environment.systemPackages = [
-        cfg.finalPackage
-        cfg.printInitPackage
-      ] ++ (lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs);
-    }
-    {
-      inherit (cfg) warnings assertions;
-      programs.neovim.defaultEditor = cfg.defaultEditor;
-      environment.variables = {
-        VIM = mkIf (!cfg.wrapRc) "/etc/nvim";
-        EDITOR = mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim");
-      };
-    }
-  ]);
+  config = mkIf cfg.enable {
+    environment.systemPackages = [
+      cfg.finalPackage
+      cfg.printInitPackage
+    ] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs;
+
+    environment.variables = {
+      VIM = mkIf (!cfg.wrapRc) "/etc/nvim";
+      EDITOR = mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim");
+    };
+
+    programs.neovim.defaultEditor = cfg.defaultEditor;
+  };
 }