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.

.gitignore

@@ -0,0 +1 @@
+.worktrees/

hosts/jpporta-nixos/home.nix

@@ -36,7 +36,6 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
     ../../modules/home-manager/openspec
     ../../modules/home-manager/power-profiles
     ../../modules/home-manager/ntfy-notify
-    ../../modules/home-manager/pinentry
 
     inputs.zen-browser.homeModules.beta
   ];
@@ -151,7 +150,13 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
     gpg.enable = true;
   };
 
-  custom.pinentry.enable = true;
+  services.gpg-agent = {
+    enable = true;
+    pinentry.package = pkgs.pinentry-rofi;
+    enableSshSupport = true; # only if you use gpg keys as ssh keys
+    defaultCacheTtl = 3600;
+    maxCacheTtl = 86400;
+  };
 
   services.swaync.enable = true;
 }

modules/home-manager/ntfy-notify/default.nix

@@ -6,15 +6,6 @@
 }:
 let
   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
 {
   options.custom.ntfy-notify = {
@@ -54,19 +45,21 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = [ pkgs.ntfy ];
+    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" = {
       text = ''
         # 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:
       '' + lib.concatMapStringsSep "\n" (sub:
+        let
+          cmd = "notify-send -a Kanban -u ${sub.priority} \"Kanban Update\" \"$m\"";
+        in
         "  - topic: ${cfg.server}/${sub.topic}\n"
-        + "    command: >-\n"
+        + "    command: ${cmd}"
-        + ''      notify-send -a "Kanban" -u "${sub.priority}" "Kanban Update" "$m"''
       ) cfg.subscriptions;
     };
 
@@ -78,9 +71,7 @@ in
       };
       Service = {
         Type = "simple";
-        ExecStart = ''
+        ExecStart = "${pkgs.ntfy-sh}/bin/ntfy subscribe";
-          ${pkgs.ntfy}/bin/ntfy subscribe
-        '';
         Restart = "on-failure";
         RestartSec = 10;
       };

modules/home-manager/pinentry/default.nix

@@ -1,32 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-let
-  pinentry-wrapper = pkgs.writeShellScriptBin "pinentry-wrapper" ''
-    if [ -n "''${SSH_CONNECTION:-}" ] || [ -n "''${SSH_TTY:-}" ]; then
-      exec ${pkgs.pinentry-curses}/bin/pinentry-curses "$@"
-    else
-      exec ${pkgs.pinentry-rofi}/bin/pinentry-rofi "$@"
-    fi
-  '';
-in {
-  options.custom.pinentry = {
-    enable = lib.mkEnableOption "adaptive pinentry: rofi on TTY, curses on SSH";
-  };
-
-  config = lib.mkIf config.custom.pinentry.enable {
-    home.packages = [ pinentry-wrapper ];
-
-    services.gpg-agent = {
-      enable = true;
-      pinentry.package = pinentry-wrapper;
-      enableSshSupport = true;
-      defaultCacheTtl = 3600;
-      maxCacheTtl = 86400;
-    };
-  };
-}