.: module imports cleanup

flake.nix

@@ -70,23 +70,16 @@
 
       overlays = import ./overlays;
 
-      nixosModules = {
-        nibylandia-boot.imports = [ ./modules/boot.nix ];
-
-        nibylandia-secureboot.imports = [ ./modules/secureboot.nix ];
-
-        nibylandia-common.imports = [ ./modules/common.nix ];
-
-        nibylandia-graphical.imports = [ ./modules/graphical.nix ];
-
-        nibylandia-laptop.imports = [ ./modules/laptop.nix ];
-
-        nibylandia-gaming.imports = [ ./modules/gaming.nix ];
-
-        nibylandia-monitoring.imports = [ ./modules/monitoring.nix ];
-
-        nibylandia-ci-runners.imports = [ ./modules/ci-runners.nix ];
-      };
+      nixosModules = nixpkgs.lib.genAttrs [
+        "boot"
+        "secureboot"
+        "common"
+        "graphical"
+        "laptop"
+        "gaming"
+        "monitoring"
+        "ci-runners"
+      ] (modname: { imports = [ (./modules/. + "/${modname}.nix") ]; });
 
       nixosConfigurations = builtins.mapAttrs (name: value:
         nixpkgs.lib.nixosSystem {

modules/boot.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.nibylandia-boot;
+let cfg = config.boot;
 in {
-  options.nibylandia-boot = {
+  options.boot = {
     uefi.enable = lib.mkEnableOption "Boot via UEFI";
     ryzen.enable = lib.mkEnableOption "Enable AMD Ryzen-specific options";
   };

modules/common.nix

@@ -8,7 +8,7 @@ in {
 
     microvm.nixosModules.host
 
-    self.nixosModules.nibylandia-boot
+    self.nixosModules.boot
   ];
 
   deployment = {

modules/graphical.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, inputs, ... }:
 
 {
-  imports = [ inputs.self.nixosModules.nibylandia-common ];
+  imports = [ inputs.self.nixosModules.common ];
 
   boot = {
     extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];

modules/secureboot.nix

@@ -13,5 +13,5 @@
     privateKeyFile = config.age.secrets.secureboot-key.path;
   };
 
-  nibylandia-boot.uefi.enable = lib.mkForce false;
+  boot.uefi.enable = lib.mkForce false;
 }

nixos/khas/default.nix

@@ -7,10 +7,10 @@
   imports = with inputs.self.nixosModules; [
     ./hardware-configuration.nix
 
-    nibylandia-graphical
-    nibylandia-laptop
-    nibylandia-secureboot
-    nibylandia-gaming
+    graphical
+    laptop
+    secureboot
+    gaming
   ];
 
   boot.kernelPatches = with lib.kernel; [{

nixos/khas/hardware-configuration.nix

@@ -2,7 +2,7 @@
 
 {
   hardware.enableAllFirmware = true;
-  nibylandia-boot.ryzen.enable = true;
+  boot.ryzen.enable = true;
 
   boot.initrd.availableKernelModules =
     [ "nvme" "ehci_pci" "xhci_pci" "rtsx_pci_sdmmc" ];

nixos/microlith/default.nix

@@ -7,9 +7,9 @@
   imports = with inputs.self.nixosModules; [
     ./hardware-configuration.nix
 
-    nibylandia-graphical
-    nibylandia-gaming
-    nibylandia-secureboot
+    graphical
+    gaming
+    secureboot
   ];
   age.secrets.ar-password.file = ../../secrets/microlith-ar.age;
 

nixos/scylla/default.nix

@@ -23,11 +23,11 @@ in {
   imports = with inputs.self.nixosModules; [
     ./hardware-configuration.nix
 
-    nibylandia-common
-    nibylandia-ci-runners
+    common
+    ci-runners
   ];
 
-  nibylandia-boot.uefi.enable = true;
+  boot.uefi.enable = true;
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;

nixos/zorigami/default.nix

@@ -2,10 +2,10 @@
 
 {
   imports = with inputs.self.nixosModules; [
-    nibylandia-common
-    nibylandia-secureboot
-    nibylandia-monitoring
-    nibylandia-ci-runners
+    common
+    secureboot
+    monitoring
+    ci-runners
 
     inputs.simple-nixos-mailserver.nixosModule
 

nixos/zorigami/hardware.nix

@@ -9,7 +9,7 @@
   boot.zfs.enableUnstable = true;
   boot.supportedFilesystems = [ "zfs" ];
 
-  nibylandia-boot.ryzen.enable = true;
+  boot.ryzen.enable = true;
 
   networking.hostId = "7999af7c";