Extract modules from roles

host/bachtel.nix

@@ -4,16 +4,7 @@
 
 { config, pkgs, ... }: {
 
-  imports = [
-    ../hardware/apu.nix
-    ../hardware/wle900vx.nix
-    ../role/base
-    ../role/wwan
-    ../role/router
-    ../role/router-dhcp
-    ../role/router-dns
-    ../role/router-wireless-ap
-  ];
+  imports = [ ../role/base ../hardware/apu.nix ../hardware/wle900vx.nix ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/360a6bc9-fc4e-4803-bd53-69320ac32ac5";

host/calanda.nix

@@ -5,14 +5,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ../hardware/apu.nix
-    ../hardware/wle200nx.nix
-    ../role/base
-    ../role/router
-    ../role/router-dns
-    ../role/router-wireless-ap
-  ];
+  imports = [ ../hardware/apu.nix ../hardware/wle200nx.nix ../role/base ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/16efc5db-0697-4f39-b64b-fc18ac318625";

host/etzel.nix

@@ -10,10 +10,6 @@
     ../hardware/wle200nx.nix
     ../hardware/wle600vx.nix
     ../role/base
-    ../role/router
-    ../role/router-dhcp
-    ../role/router-dns
-    ../role/router-wireless-ap
   ];
 
   nix.distributedBuilds = true;

modules/default.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, ... }: {
+
+  imports = [ ./router ./router-dhcp ./router-dns ./router-wireless-ap ./wwan ];
+
+}

role/base/default.nix

@@ -2,6 +2,8 @@
 { config, lib, pkgs, ... }:
 
 {
+  imports = [ ../../modules ];
+
   system.autoUpgrade.enable = true;
   system.autoUpgrade.allowReboot = false;