treewide: Use `extra_modules` to import dependency modules

7 files changed, 15 insertions, 15 deletions

diff --git a/modules/by-name/ag/age/module.nix b/modules/by-name/ag/age/module.nix
index 9a498ab6..6eb0f9c4 100644
--- a/modules/by-name/ag/age/module.nix
+++ b/modules/by-name/ag/age/module.nix
@@ -1,7 +1,7 @@
 {
   config,
   lib,
-  modules,
+  extra_modules,
   pkgs,
   ...
 }: let
@@ -12,7 +12,7 @@ in {
   };
 
   imports = [
-    modules.agenix.nixosModules.default
+    extra_modules.nixos.agenix
   ];
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix
index 86ad58da..8d3cbe5f 100644
--- a/modules/by-name/bo/boot/module.nix
+++ b/modules/by-name/bo/boot/module.nix
@@ -11,7 +11,7 @@
   config,
   lib,
   pkgs,
-  modules,
+  extra_modules,
   modulesPath,
   system,
   specialArgs,
@@ -94,7 +94,7 @@ in {
   };
 
   imports = [
-    modules.lanzaboote.nixosModules.lanzaboote
+    extra_modules.nixos.lanzaboote
   ];
 
   config = lib.mkIf cfg.enable {
@@ -130,7 +130,7 @@ in {
             lanzabooteInstallHook = import "${modulesPath}/../lib/eval-config.nix" {
               inherit system specialArgs;
               modules = [
-                modules.lanzaboote.nixosModules.lanzaboote
+                extra_modules.nixos.lanzaboote
 
                 {
                   # Copy the relevant config into the eval-module context.
diff --git a/modules/by-name/di/disks/module.nix b/modules/by-name/di/disks/module.nix
index ed5c939a..0a46c402 100644
--- a/modules/by-name/di/disks/module.nix
+++ b/modules/by-name/di/disks/module.nix
@@ -11,7 +11,7 @@
   config,
   lib,
   pkgs,
-  modules,
+  extra_modules,
   ...
 }: let
   cfg = config.soispha.disks;
@@ -42,7 +42,7 @@ in {
   };
 
   imports = [
-    modules.disko.nixosModules.default
+    extra_modules.nixos.disko
   ];
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/ho/home-manager/module.nix b/modules/by-name/ho/home-manager/module.nix
index d7eccbd6..e20cfa6d 100644
--- a/modules/by-name/ho/home-manager/module.nix
+++ b/modules/by-name/ho/home-manager/module.nix
@@ -11,7 +11,7 @@
   config,
   lib,
   system,
-  modules,
+  extra_modules,
   ...
 }: let
   cfg = config.soispha.home-manager;
@@ -21,7 +21,7 @@ in {
   };
 
   imports = [
-    modules.home-manager.nixosModules.home-manager
+    extra_modules.nixos.home-manager
   ];
 
   # TODO: Find a way to throw this error below, when a user `enable`s a home-manager
diff --git a/modules/by-name/im/impermanence/module.nix b/modules/by-name/im/impermanence/module.nix
index 0fbd7425..0de6f3e6 100644
--- a/modules/by-name/im/impermanence/module.nix
+++ b/modules/by-name/im/impermanence/module.nix
@@ -1,7 +1,7 @@
 {
   config,
   lib,
-  modules,
+  extra_modules,
   ...
 }: let
   cfg = config.vhack.persist;
@@ -46,7 +46,7 @@ in {
   };
 
   imports = [
-    modules.impermanence.nixosModules.impermanence
+    extra_modules.nixos.impermanence
   ];
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/ni/nix-index/module.nix b/modules/by-name/ni/nix-index/module.nix
index 72be6b52..269c6f95 100644
--- a/modules/by-name/ni/nix-index/module.nix
+++ b/modules/by-name/ni/nix-index/module.nix
@@ -10,7 +10,7 @@
 {
   config,
   lib,
-  modules,
+  extra_modules,
   ...
 }: let
   cfg = config.soispha.programs.nix-index;
@@ -27,7 +27,7 @@ in {
 
     home-manager.users.soispha = {
       imports = [
-        modules.nix-index-database.homeModules.nix-index
+        extra_modules.home.nix-index-database
       ];
 
       programs.nix-index = {
diff --git a/modules/by-name/nv/nvim/module.nix b/modules/by-name/nv/nvim/module.nix
index f6f9ba95..f6e2162e 100644
--- a/modules/by-name/nv/nvim/module.nix
+++ b/modules/by-name/nv/nvim/module.nix
@@ -11,7 +11,7 @@
   pkgs,
   lib,
   config,
-  modules,
+  extra_modules,
   libraries,
   ...
 }: let
@@ -51,7 +51,7 @@ in {
 
     home-manager.users.soispha = {
       imports = [
-        modules.nixvim.homeModules.nixvim
+        extra_modules.home.nixvim
       ];
 
       home.sessionVariables = {