From 417015af0dc2525557ab36528643c2d519ca4334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Fri, 8 Mar 2024 13:58:55 +0100 Subject: [PATCH] himalaya: adjust code for v1.0.0-beta.3 --- modules/programs/himalaya.nix | 2 +- .../modules/programs/himalaya/basic-expected.toml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix index a05782b0d..2d216c3dc 100644 --- a/modules/programs/himalaya.nix +++ b/modules/programs/himalaya.nix @@ -169,7 +169,7 @@ in { config.accounts.email.accounts; accountsConfig = lib.mapAttrs mkAccountConfig enabledAccounts; globalConfig = compactAttrs himalaya.settings; - allConfig = globalConfig // accountsConfig; + allConfig = globalConfig // { accounts = accountsConfig; }; in tomlFormat.generate "himalaya-config.toml" allConfig; systemd.user.services = let inherit (config.services.himalaya-watch) enable environment settings; diff --git a/tests/modules/programs/himalaya/basic-expected.toml b/tests/modules/programs/himalaya/basic-expected.toml index 55906e15c..16c70c868 100644 --- a/tests/modules/programs/himalaya/basic-expected.toml +++ b/tests/modules/programs/himalaya/basic-expected.toml @@ -1,32 +1,32 @@ -["hm@example.com"] +[accounts."hm@example.com"] backend = "imap" default = true display-name = "H. M. Test" email = "hm@example.com" -["hm@example.com".folder.alias] +[accounts."hm@example.com".folder.alias] drafts = "Drafts" inbox = "Inbox" sent = "Sent" trash = "Trash" -["hm@example.com".imap] +[accounts."hm@example.com".imap] encryption = "tls" host = "imap.example.com" login = "home.manager" port = 993 -["hm@example.com".imap.passwd] +[accounts."hm@example.com".imap.passwd] cmd = "password-command" -["hm@example.com".message.send] +[accounts."hm@example.com".message.send] backend = "smtp" -["hm@example.com".smtp] +[accounts."hm@example.com".smtp] encryption = "tls" host = "smtp.example.com" login = "home.manager" port = 465 -["hm@example.com".smtp.passwd] +[accounts."hm@example.com".smtp.passwd] cmd = "password-command"