fix: generate valid YAML in client.yml
The previous >- block scalar indentation was wrong, causing ntfy to fail with 'yaml: line 7: could not find expected :'. Switched to inline command strings which produce clean, parsable YAML.
This commit is contained in:
@@ -1,5 +1,3 @@
|
|||||||
Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or directory.
|
|
||||||
Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or directory.
|
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
@@ -8,15 +6,6 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
|
|||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
cfg = config.custom.ntfy-notify;
|
cfg = config.custom.ntfy-notify;
|
||||||
|
|
||||||
# Escape the whole command string for the YAML config. Since ntfy reads this
|
|
||||||
# from client.yml directly (not from systemd), we pass notify-send arguments
|
|
||||||
# as a shell command string — ntfy will spawn a shell to run it.
|
|
||||||
mkSubscription = topic: priority:
|
|
||||||
lib.generators.toYaml { } [{
|
|
||||||
topic = "${cfg.server}/${topic}";
|
|
||||||
command = ''notify-send -a "Kanban" -u "${priority}" "Kanban Update" "''${m}"'';
|
|
||||||
}];
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.custom.ntfy-notify = {
|
options.custom.ntfy-notify = {
|
||||||
@@ -58,17 +47,19 @@ in
|
|||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
home.packages = [ pkgs.ntfy-sh ];
|
home.packages = [ pkgs.ntfy-sh ];
|
||||||
|
|
||||||
# Client config with subscription → notify-send mappings.
|
# Client config with subscription → notify-send command mappings.
|
||||||
# ntfy subscribe (without args) reads subscriptions from here.
|
# ntfy subscribe (without args) reads subscriptions from client.yml.
|
||||||
xdg.configFile."ntfy/client.yml" = {
|
xdg.configFile."ntfy/client.yml" = {
|
||||||
text = ''
|
text = ''
|
||||||
# Generated by ndots ntfy-notify module.
|
# Generated by ndots ntfy-notify module.
|
||||||
# Each incoming message spawns a notify-send → your notification daemon.
|
# Each message spawns notify-send → your notification daemon.
|
||||||
subscribe:
|
subscribe:
|
||||||
'' + lib.concatMapStringsSep "\n" (sub:
|
'' + lib.concatMapStringsSep "\n" (sub:
|
||||||
|
let
|
||||||
|
cmd = "notify-send -a Kanban -u ${sub.priority} \"Kanban Update\" \"$m\"";
|
||||||
|
in
|
||||||
" - topic: ${cfg.server}/${sub.topic}\n"
|
" - topic: ${cfg.server}/${sub.topic}\n"
|
||||||
+ " command: >-\n"
|
+ " command: ${cmd}"
|
||||||
+ '' notify-send -a "Kanban" -u "${sub.priority}" "Kanban Update" "$m"''
|
|
||||||
) cfg.subscriptions;
|
) cfg.subscriptions;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user