From dcf2fa523bb73eea2be5ffaa0c62bf578b4b849b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Wed, 16 Nov 2022 11:21:22 +0100
Subject: [PATCH] feat(tt-rss): replace freshrss

---
 configs/newsboat.nix         | 12 ++++++------
 systems/makanek/freshrss.nix | 32 ++++++++------------------------
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/configs/newsboat.nix b/configs/newsboat.nix
index 3503dfa..5f50d35 100644
--- a/configs/newsboat.nix
+++ b/configs/newsboat.nix
@@ -87,12 +87,11 @@
     color listfocus_unread blue default bold
     color info red default bold
 
-    urls-source "freshrss"
-    freshrss-url "https://feed.kmein.de/api/greader.php"
-    freshrss-login "k"
-    freshrss-password "${lib.strings.fileContents <secrets/freshrss/password>}"
-    freshrss-min-items 100
-    freshrss-flag-star "e"
+    urls-source "ttrss"
+    ttrss-url "https://feed.kmein.de"
+    ttrss-login "k"
+    ttrss-password "${lib.strings.fileContents <secrets/freshrss/password>}"
+    ttrss-mode "multi"
   '';
 
   newsboat-sql = "${pkgs.sqlite}/bin/sqlite3 ${newsboat-home}/cache.db";
@@ -100,6 +99,7 @@ in {
   nixpkgs.config.packageOverrides = pkgs: {
     newsboat = pkgs.writers.writeDashBin "newsboat" ''
       ${pkgs.newsboat}/bin/newsboat -C ${newsboat-config} -u ${pkgs.writeText "newsboat-urls" ''
+        "query:🕒 Read Later:flags # \"e\""
         "query:📥 Unread:unread = \"yes\""
         " "
       ''} "$@"
diff --git a/systems/makanek/freshrss.nix b/systems/makanek/freshrss.nix
index 17ef596..a241675 100644
--- a/systems/makanek/freshrss.nix
+++ b/systems/makanek/freshrss.nix
@@ -5,32 +5,16 @@
 }: let
   domain = "feed.kmein.de";
 in {
-  imports = [<nixos-unstable/nixos/modules/services/web-apps/freshrss.nix>];
-
-  nixpkgs.config.packageOverrides = pkgs: {
-    freshrss = (import <nixos-unstable> {}).freshrss;
-  };
-
-  # services.tt-rss = {
-  #   enable = true;
-  #   logDestination = "syslog";
-  #   root = "/var/lib/tt-rss";
-  #   selfUrlPath = "https://${domain}";
-  #   virtualHost = domain;
-  #   registration = {
-  #     enable = true;
-  #     maxUsers = 3;
-  #   };
-  # };
-
-  services.freshrss = {
+  services.tt-rss = {
     enable = true;
-    baseUrl = "https://${domain}";
-    dataDir = "/var/lib/freshrss";
-    database.type = "sqlite";
-    defaultUser = "k";
-    passwordFile = pkgs.writeText "freshrss-password" (lib.strings.fileContents <secrets/freshrss/password>);
+    logDestination = "syslog";
+    root = "/var/lib/tt-rss";
+    selfUrlPath = "https://${domain}";
     virtualHost = domain;
+    registration = {
+      enable = true;
+      maxUsers = 3;
+    };
   };
 
   services.nginx.virtualHosts.${domain} = {