From 403336d4c4d6e93916f523d5c2657c92b57fc970 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sun, 12 Dec 2021 00:18:41 +0100
Subject: [PATCH] modules: introduce more arguments at top-level

---
 modules/default.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/modules/default.nix b/modules/default.nix
index adf9c74..3a78ef3 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,6 +1,12 @@
 # Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE.
 
-{ pkgs ? import <nixpkgs> { }, home-manager-path ? <home-manager>, config ? null, isFlake ? false }:
+{ config ? null
+, extraModules ? [ ]
+, extraSpecialArgs ? { }
+, pkgs ? import <nixpkgs> { }
+, home-manager-path ? <home-manager>
+, isFlake ? false
+}:
 
 with pkgs.lib;
 
@@ -16,12 +22,17 @@ let
   rawModule = evalModules {
     modules = [
       {
-        _module.args.home-manager-path = home-manager-path;
-        _module.args.pkgs = mkDefault pkgs;
-        _module.args.isFlake = isFlake;
+        _module.args =
+          {
+            inherit home-manager-path isFlake;
+            pkgs = mkDefault pkgs;
+          }
+          // extraSpecialArgs;
       }
       configModule
-    ] ++ import ./module-list.nix { inherit pkgs isFlake; };
+    ]
+    ++ extraModules
+    ++ import ./module-list.nix { inherit pkgs isFlake; };
   };
 
   failedAssertions = map (x: x.message) (filter (x: !x.assertion) rawModule.config.assertions);