builder: allow using modules

2026-07-19 12:53:01 +02:00
parent 4b6c84e63d
commit 6c301d87fd
1 changed files with 15 additions and 12 deletions
@@ -5,23 +5,26 @@
  pwd,
  config,
  inputs,
+  outputs,
  ...
 }: {
-  imports = [
-    inputs.disko.nixosModules.disko
+  imports =
+    [
+      inputs.disko.nixosModules.disko

-    ./disko.nix
-    ./hardware-configuration.nix
+      ./disko.nix
+      ./hardware-configuration.nix

-    "${pwd}/features-nixos/global/fish.nix" # fish for admin
-    "${pwd}/features-nixos/global/locale.nix"
-    "${pwd}/features-nixos/global/nix.nix"
-    "${pwd}/features-nixos/global/sops.nix"
-    "${pwd}/features-nixos/global/root.nix"
+      "${pwd}/features-nixos/global/fish.nix" # fish for admin
+      "${pwd}/features-nixos/global/locale.nix"
+      "${pwd}/features-nixos/global/nix.nix"
+      "${pwd}/features-nixos/global/sops.nix"
+      "${pwd}/features-nixos/global/root.nix"

-    # "${pwd}/features-nixos/optional/hydra.nix"
-    # "${pwd}/features-nixos/optional/jenkins-agent.nix"
-  ];
+      # "${pwd}/features-nixos/optional/hydra.nix"
+      # "${pwd}/features-nixos/optional/jenkins-agent.nix"
+    ]
+    ++ (builtins.attrValues outputs.nixosModules);

  frajul.gitlab-runner = {
    enable = false;