From bbb199b87fff156a9b7b9b96558cc7a55c536fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 14 May 2023 17:45:40 +0200
Subject: [PATCH] fix importing nixos configuration

---
 terraform/targets/flake-module.nix | 43 +++++++++++++++---------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/terraform/targets/flake-module.nix b/terraform/targets/flake-module.nix
index e2fbdbd..9e0e92f 100644
--- a/terraform/targets/flake-module.nix
+++ b/terraform/targets/flake-module.nix
@@ -1,26 +1,25 @@
 { lib, self, ... }:
 let
-  collectNixosHosts = { directory }:
-    lib.mapAttrs'
-      (name: _:
-      lib.nameValuePair
-        name
-        (lib.nixosSystem {
-          system = "x86_64-linux";
-          # Make flake available in modules
-          specialArgs = {
-            self = {
-              inputs = self.inputs;
-              nixosModules = self.nixosModules;
-            };
-          };
-
-          modules = [ (directory + "/${name}/configuration.nix") ];
-        }))
-      (builtins.readDir directory);
+  entries = builtins.attrNames (builtins.readDir ./.);
+  configs = builtins.filter (dir: builtins.pathExists (./. + "/${dir}/configuration.nix")) entries;
 in
-{ 
-  flake.nixosConfigurations = collectNixosHosts {
-    directory = ".";
-  };
+{
+  flake.nixosConfigurations = lib.listToAttrs
+    (builtins.map
+      (name:
+        lib.nameValuePair
+          name
+          (lib.nixosSystem {
+            system = "x86_64-linux";
+            # Make flake available in modules
+            specialArgs = {
+              self = {
+                inputs = self.inputs;
+                nixosModules = self.nixosModules;
+              };
+            };
+
+            modules = [ (./. + "/${name}/configuration.nix") ];
+          }))
+      configs);
 }