Home Gen505 @ 2025-05-03-01:35 by jonas@comfy-station

modules/default.nix

@@ -1,20 +1,34 @@
-{isHM ? null, ...}: {
+{
+  isHM ? null,
+  lib,
+  ...
+}: {
   assertions = [
     {
       assertion = isHM != null;
       message = "The \"home-manager\" flag isHM is required.";
     }
   ];
-  imports = [
-    ./bin/nix-scripts.nix
-    ./desktop/de
-    ./desktop/dm
-    ./hardware/bluetooth.nix
-    ./hardware/sound.nix
-    ./hardware/yubikey.nix
-    ./networking/wireguard
-    ./services/borg-server.nix
-    ./services/nextcloud-instance.nix
-    ./services/virt-manager.nix
-  ];
+  imports =
+    [
+      # modules containing both system and home-manager configs
+      ./bin/nix-scripts.nix
+    ]
+    ++ lib.optionals (! isHM) [
+      # pure system modules
+      ./desktop/de
+      ./desktop/dm
+      ./hardware/bluetooth.nix
+      ./hardware/sound.nix
+      ./hardware/yubikey.nix
+      ./networking/wireguard
+      ./services/borg-server.nix
+      ./services/nextcloud-instance.nix
+      ./services/virt-manager.nix
+    ]
+    ++ lib.optionals isHM [
+      # pure home-manager modules
+      ./home/doom
+      ./home/hyprland
+    ];
 }