From a458449e4ce0c616f2eada0ec8dcb627aa76f261 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Sun, 25 Feb 2024 17:26:06 +0800
Subject: [PATCH] flake: update Bahaghari module imports

---
 configs/flake-parts/bahaghari.nix    | 17 ++---------------
 configs/flake-parts/home-manager.nix |  9 ++-------
 configs/flake-parts/nixos.nix        |  9 ++-------
 configs/flake-parts/nixvim.nix       |  9 ++-------
 4 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/configs/flake-parts/bahaghari.nix b/configs/flake-parts/bahaghari.nix
index b952e3c5..059c0372 100644
--- a/configs/flake-parts/bahaghari.nix
+++ b/configs/flake-parts/bahaghari.nix
@@ -2,19 +2,6 @@
 { ... }:
 
 {
-  flake = {
-    nixosModules = {
-      "bahaghari/tinted-theming" = ../../subprojects/bahaghari/modules/tinted-theming;
-    };
-
-    homeModules = {
-      "bahaghari/tinted-theming" = ../../subprojects/bahaghari/modules/tinted-theming;
-    };
-
-    nixvimModules = {
-      "bahaghari/tinted-theming" = ../../subprojects/bahaghari/modules/tinted-theming;
-    };
-
-    bahaghariLib = ../../subprojects/bahaghari/lib;
-  };
+  # We'll simply copy over Bahaghari's default exports.
+  flake = import ../../subprojects/bahaghari { };
 }
diff --git a/configs/flake-parts/home-manager.nix b/configs/flake-parts/home-manager.nix
index f1a1ec92..8d1fe0a1 100644
--- a/configs/flake-parts/home-manager.nix
+++ b/configs/flake-parts/home-manager.nix
@@ -46,13 +46,8 @@
       inputs.sops-nix.homeManagerModules.sops
       inputs.nix-index-database.hmModules.nix-index
 
-      # Setting up Bahaghari.
-      ({ config, lib, pkgs, ... }: {
-        imports = [ inputs.self.homeModules."bahaghari/tinted-theming" ];
-
-        _module.args.bahaghariLib =
-          import inputs.self.bahaghariLib { inherit pkgs; };
-      })
+      # The rainbow road to ricing your raw materials.
+      inputs.self.homeModules.bahaghari
 
       # The default shared config for our home-manager configurations. This
       # is also to be used for sharing modules among home-manager users from
diff --git a/configs/flake-parts/nixos.nix b/configs/flake-parts/nixos.nix
index cc265958..1ac8b9e8 100644
--- a/configs/flake-parts/nixos.nix
+++ b/configs/flake-parts/nixos.nix
@@ -87,13 +87,8 @@
       inputs.sops-nix.nixosModules.sops
       inputs.disko.nixosModules.disko
 
-      # Setting up Bahaghari.
-      ({ config, lib, pkgs, ... }: {
-        imports = [ inputs.self.nixosModules."bahaghari/tinted-theming" ];
-
-        _module.args.bahaghariLib =
-          import inputs.self.bahaghariLib { inherit pkgs; };
-      })
+      # The rainbow road to ricing your raw materials.
+      inputs.self.nixosModules.bahaghari
 
       # Bring our own teeny-tiny snippets of configurations.
       defaultNixConf
diff --git a/configs/flake-parts/nixvim.nix b/configs/flake-parts/nixvim.nix
index 9571fc08..f32e1f7d 100644
--- a/configs/flake-parts/nixvim.nix
+++ b/configs/flake-parts/nixvim.nix
@@ -22,13 +22,8 @@
   };
 
   setups.nixvim.sharedModules = [
-    # Setting up Bahaghari.
-    ({ config, lib, pkgs, ... }: {
-      imports = [ inputs.self.nixvimModules."bahaghari/tinted-theming" ];
-
-      _module.args.bahaghariLib =
-        import inputs.self.bahaghariLib { inherit pkgs; };
-    })
+    # The rainbow road to ricing your raw materials.
+    inputs.self.nixvimModules.bahaghari
   ];
 
   flake = {