From 687814fc09e4b803e0b0c1d9903911aa379533b4 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 27 Nov 2025 21:21:57 +0100
Subject: kartei: pass whole arg to modules

---
 kartei/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kartei/default.nix')

diff --git a/kartei/default.nix b/kartei/default.nix
index 046efdd7b..24a9e22b5 100644
--- a/kartei/default.nix
+++ b/kartei/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }: let
+{ lib, ... }@arg: let
   removeTemplate =
     # TODO don't remove during CI
     lib.flip builtins.removeAttrs ["template"];
@@ -9,7 +9,7 @@ in {
         (name: _type: let
           path = ./. + "/${name}";
         in {
-          krebs = import path { inherit config lib; };
+          krebs = import path arg;
         })
         (removeTemplate
           (lib.filterAttrs
-- 
cgit v1.2.3


From e1363dcb1df2a455700ac3e28045f34d63e4c465 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 27 Nov 2025 21:22:41 +0100
Subject: kartei: lib.mkMerge -> imports

Use imports instead of lib.mkMerge and sprinkle some _file attributes to
facilitate debugging.
---
 kartei/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kartei/default.nix')

diff --git a/kartei/default.nix b/kartei/default.nix
index 24a9e22b5..7624807a0 100644
--- a/kartei/default.nix
+++ b/kartei/default.nix
@@ -3,12 +3,12 @@
     # TODO don't remove during CI
     lib.flip builtins.removeAttrs ["template"];
 in {
-  config =
-    lib.mkMerge
+  imports =
       (lib.mapAttrsToList
         (name: _type: let
           path = ./. + "/${name}";
         in {
+          _file = toString path;
           krebs = import path arg;
         })
         (removeTemplate
-- 
cgit v1.2.3