From 32c807e064e5efa1c6290cc196c464b990c045a9 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Wed, 27 Mar 2024 16:34:51 +0800
Subject: [PATCH] flake-parts/setups: correct module type for custom modules
 attr

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

diff --git a/modules/flake-parts/setups/home-manager.nix b/modules/flake-parts/setups/home-manager.nix
index afb092ff..f4457ab0 100644
--- a/modules/flake-parts/setups/home-manager.nix
+++ b/modules/flake-parts/setups/home-manager.nix
@@ -169,7 +169,7 @@ in
 {
   options.setups.home-manager = {
     sharedModules = lib.mkOption {
-      type = with lib.types; listOf raw;
+      type = with lib.types; listOf deferredModule;
       default = [ ];
       description = ''
         A list of modules to be shared by all of the declarative home-manager
@@ -183,7 +183,7 @@ in
     };
 
     standaloneConfigModules = lib.mkOption {
-      type = with lib.types; listOf raw;
+      type = with lib.types; listOf deferredModule;
       default = [ ];
       internal = true;
       description = ''
diff --git a/modules/flake-parts/setups/nixos.nix b/modules/flake-parts/setups/nixos.nix
index 1a8b187c..cbb1625f 100644
--- a/modules/flake-parts/setups/nixos.nix
+++ b/modules/flake-parts/setups/nixos.nix
@@ -123,7 +123,7 @@ let
       };
 
       additionalModules = lib.mkOption {
-        type = with lib.types; listOf raw;
+        type = with lib.types; listOf deferredModule;
         description = ''
           A list of additional home-manager modules to be added with the
           user.
@@ -344,9 +344,10 @@ let
       (lib.mkIf (config.homeManagerUsers.users != { })
         (
           let
+            inherit (config.homeManagerUsers) nixpkgsInstance;
+
             setupConfig = config;
             hasHomeManagerUsers = config.homeManagerUsers.users != { };
-            inherit (config.homeManagerUsers) nixpkgsInstance;
             isNixpkgs = state: hasHomeManagerUsers && nixpkgsInstance == state;
           in
           { config, lib, pkgs, ... }: {
@@ -473,7 +474,7 @@ in
 {
   options.setups.nixos = {
     sharedModules = lib.mkOption {
-      type = with lib.types; listOf raw;
+      type = with lib.types; listOf deferredModule;
       default = [ ];
       description = ''
         A list of modules to be shared by all of the declarative NixOS setups.
diff --git a/modules/flake-parts/setups/nixvim.nix b/modules/flake-parts/setups/nixvim.nix
index d1023ad1..5b439bbb 100644
--- a/modules/flake-parts/setups/nixvim.nix
+++ b/modules/flake-parts/setups/nixvim.nix
@@ -23,7 +23,7 @@ let
     };
 
   modulesOption = lib.mkOption {
-    type = with lib.types; listOf raw;
+    type = with lib.types; listOf deferredModule;
     default = [ ];
   };
   modulesOption' = configEnv: modulesOption // {