diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e458ed5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.worktrees/ diff --git a/hosts/jpporta-nixos/home.nix b/hosts/jpporta-nixos/home.nix index 3f91f3a..5474253 100644 --- a/hosts/jpporta-nixos/home.nix +++ b/hosts/jpporta-nixos/home.nix @@ -114,6 +114,7 @@ ]; programs = { + nvm.enable = true; zen-browser.enable = true; git = { enable = true; diff --git a/modules/home-manager/ntfy-notify/default.nix b/modules/home-manager/ntfy-notify/default.nix index 51d1ba8..c76b83a 100644 --- a/modules/home-manager/ntfy-notify/default.nix +++ b/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. - # ntfy subscribe (without args) reads subscriptions from here. + # Client config with subscription → notify-send command mappings. + # 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" - + '' notify-send -a "Kanban" -u "${sub.priority}" "Kanban Update" "$m"'' + + " command: ${cmd}" ) cfg.subscriptions; }; @@ -78,9 +71,7 @@ in }; Service = { Type = "simple"; - ExecStart = '' - ${pkgs.ntfy}/bin/ntfy subscribe - ''; + ExecStart = "${pkgs.ntfy-sh}/bin/ntfy subscribe"; Restart = "on-failure"; RestartSec = 10; };