From 6c528d6a0f74633d66f9b306f0cc89bc668a5c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Thu, 16 Apr 2020 19:27:09 +0200
Subject: [PATCH] fix(newsboat): set $NEWSBOAT_HOME correctly, add to
 i3status-rust

---
 configs/newsboat.nix  | 13 ++++++++-----
 dot/i3status-rust.nix | 10 ++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/configs/newsboat.nix b/configs/newsboat.nix
index 29902bb..56cc41b 100644
--- a/configs/newsboat.nix
+++ b/configs/newsboat.nix
@@ -1,10 +1,13 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 let
-  newsboat-home = "~/cloud/syncthing/common/newsboat";
+  newsboat-home = "${config.users.users.me.home}/cloud/syncthing/common/newsboat";
   linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";
 in
 {
-  environment.shellAliases.newsboat = "${pkgs.newsboat}/bin/newsboat -u ${newsboat-home}/urls";
+  environment = {
+    variables.NEWSBOAT_HOME = newsboat-home;
+    shellAliases.newsboat = "${pkgs.newsboat}/bin/newsboat -u \"$NEWSBOAT_HOME/urls\"";
+  };
 
   home-manager.users.me = {
     programs.newsboat = {
@@ -41,9 +44,9 @@ in
         color listfocus_unread yellow default bold
         color info red black bold
 
-        browser ${linkhandler-bin}/bin/linkhandler
+        browser ${linkhandler-bin}
         macro , open-in-browser
-        macro v set browser "${pkgs.utillinux}/bin/setsid ${pkgs.coreutils}/bin/nohup ${pkgs.mpv}/bin/mpv"; open-in-browser ; set browser ${linkhandler-bin}
+        macro v set browser "${pkgs.utillinux}/bin/setsid ${pkgs.utillinux}/bin/setsid ${pkgs.mpv}/bin/mpv"; open-in-browser ; set browser ${linkhandler-bin}
         macro w set browser "${pkgs.w3m}/bin/w3m"; open-in-browser ; set browser ${linkhandler-bin}
       '';
     };
diff --git a/dot/i3status-rust.nix b/dot/i3status-rust.nix
index 85faffa..cfa22f2 100644
--- a/dot/i3status-rust.nix
+++ b/dot/i3status-rust.nix
@@ -58,6 +58,16 @@
           | ${pkgs.gawk}/bin/awk -F'│' '{print "CORONA " $3 " (" $4 ") †" $5 " (" $6 ")"}'
       '';
     }
+    {
+      block = "custom";
+      interval = 2 * 60;
+      command = pkgs.writers.writeDash "rss" ''
+        ${pkgs.newsboat}/bin/newsboat -u "$NEWSBOAT_HOME/urls" -x print-unread | ${pkgs.gawk}/bin/awk '{ print "RSS " $1 }'
+      '';
+      on_click = pkgs.writers.writeDash "updateNewsboat" ''
+        ${pkgs.newsboat}/bin/newsboat -u "$NEWSBOAT_HOME/urls" -x reload && ${pkgs.libnotify}/bin/notify-send newsboat "Feeds updated."
+      '';
+    }
     {
       block = "net";
       device = wifi-interface;