From bf7b8fca7bc548dc3e132c2ec9516c8f43c740c6 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Thu, 1 Aug 2024 14:09:31 +0200
Subject: [PATCH] Fix wrong default for imports

---
 lib/build-clan/module.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/build-clan/module.nix b/lib/build-clan/module.nix
index e0e6d3473..47c012053 100644
--- a/lib/build-clan/module.nix
+++ b/lib/build-clan/module.nix
@@ -70,7 +70,7 @@ let
         ++ [
           {
             # Autoinclude configuration.nix and hardware-configuration.nix
-            imports = builtins.filter (p: builtins.pathExists p) [
+            imports = builtins.filter builtins.pathExists [
               "${directory}/machines/${name}/configuration.nix"
               "${directory}/machines/${name}/hardware-configuration.nix"
             ];
@@ -81,7 +81,7 @@ let
           (machines.${name} or { })
           # Inherit the inventory assertions ?
           # { inherit (mergedInventory) assertions; }
-          { imports = serviceConfigs.${name} or { }; }
+          { imports = (serviceConfigs.${name} or [ ]); }
           (
             {
               # Settings
@@ -104,6 +104,7 @@ let
             // lib.optionalAttrs (pkgs != null) { nixpkgs.pkgs = lib.mkForce pkgs; }
           )
         ];
+
       specialArgs = {
         inherit clan-core;
       } // specialArgs;