From ea2f17615e31783ace1271a3325e9cac27c3b4d8 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Fri, 16 Jun 2023 11:10:24 +0200
Subject: [PATCH] khal: improve module (#4088)
* khal: Do not hard code globbing.
---
modules/programs/khal-calendar-accounts.nix | 2 +-
modules/programs/khal.nix | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules/programs/khal-calendar-accounts.nix b/modules/programs/khal-calendar-accounts.nix
index 40856ccab..6910d627a 100644
--- a/modules/programs/khal-calendar-accounts.nix
+++ b/modules/programs/khal-calendar-accounts.nix
@@ -8,7 +8,7 @@ with lib;
type = types.nullOr (types.enum [ "calendar" "discover" ]);
default = null;
description = ''
- There is no description of this option.
+ Either a single calendar (calendar which is the default) or a directory with multiple calendars (discover).
'';
};
diff --git a/modules/programs/khal.nix b/modules/programs/khal.nix
index b9ff170f6..555a3b805 100644
--- a/modules/programs/khal.nix
+++ b/modules/programs/khal.nix
@@ -29,7 +29,6 @@ let
"path = ${
value.local.path + "/"
+ (optionalString (value.khal.type == "discover") value.khal.glob)
- + "/*"
}"
] ++ optional (value.khal.readOnly) "readonly = True" ++ [
(toKeyValueIfDefined (getAttrs [ "type" "color" "priority" ] value.khal))