From 3bdaa63231b54ac95ed66fca676cf896ce323ff5 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Tue, 30 Jan 2024 13:32:25 +0800
Subject: [PATCH] flake-parts/setups: include private modules as part of
 default shared modules

---
 configs/flake-parts/home-manager.nix        | 6 ++----
 configs/flake-parts/nixos.nix               | 4 +---
 modules/flake-parts/setups/home-manager.nix | 7 ++++++-
 modules/flake-parts/setups/nixos.nix        | 3 +++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/configs/flake-parts/home-manager.nix b/configs/flake-parts/home-manager.nix
index 0590abdc..43157bfe 100644
--- a/configs/flake-parts/home-manager.nix
+++ b/configs/flake-parts/home-manager.nix
@@ -40,11 +40,9 @@
       plover.systems = [ "x86_64-linux" ];
     };
 
-    # This is to be used by the NixOS `home-manager.sharedModules` anyways.
+    # Pretty much the baseline home-manager configuration for the whole
+    # cluster.
     sharedModules = [
-      # Import our private modules...
-      ../../modules/home-manager/_private
-
       # ...plus a bunch of third-party modules.
       inputs.sops-nix.homeManagerModules.sops
       inputs.nix-index-database.hmModules.nix-index
diff --git a/configs/flake-parts/nixos.nix b/configs/flake-parts/nixos.nix
index 58e61928..6a4f9383 100644
--- a/configs/flake-parts/nixos.nix
+++ b/configs/flake-parts/nixos.nix
@@ -81,10 +81,8 @@
       };
     };
 
+    # Basically the baseline NixOS configuration of the whole cluster.
     sharedModules = [
-      # Import our private modules.
-      ../../modules/nixos/_private
-
       # Only have third-party modules with optional NixOS modules.
       inputs.nix-index-database.nixosModules.nix-index
       inputs.sops-nix.nixosModules.sops
diff --git a/modules/flake-parts/setups/home-manager.nix b/modules/flake-parts/setups/home-manager.nix
index 0080c2a3..7f26f892 100644
--- a/modules/flake-parts/setups/home-manager.nix
+++ b/modules/flake-parts/setups/home-manager.nix
@@ -224,7 +224,12 @@ in
 
   config = lib.mkIf (cfg.configs != { }) {
     # Import our own home-manager modules.
-    setups.home-manager.sharedModules = [ homeManagerModules ];
+    setups.home-manager.sharedModules = [
+      homeManagerModules
+
+      # Import our private modules...
+      ../../home-manager/_private
+    ];
 
     flake =
       let
diff --git a/modules/flake-parts/setups/nixos.nix b/modules/flake-parts/setups/nixos.nix
index 54bc13a2..9aca5c36 100644
--- a/modules/flake-parts/setups/nixos.nix
+++ b/modules/flake-parts/setups/nixos.nix
@@ -508,6 +508,9 @@ in
       # Import our own public NixOS modules.
       nixosModules
 
+      # Import our private modules.
+      ../../nixos/_private
+
       # Set the home-manager-related settings.
       ({ lib, ... }: {
         home-manager.sharedModules = partsConfig.setups.home-manager.sharedModules;