Merge branch 'update_flake_lock_action'

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/9e565f0d9d41c19a94f55af205c328ec5177fc0a' (2023-01-07)
  → 'github:nix-community/home-manager/08a778d80308353f4f65c9dcd3790b5da02d6306' (2023-01-28)
• Updated input 'nixos-stable':
    'github:NixOS/nixpkgs/2dea8991d89b9f1e78d874945f78ca15f6954289' (2023-01-06)
  → 'github:NixOS/nixpkgs/ce20e9ebe1903ea2ba1ab006ec63093020c761cb' (2023-01-28)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/a518c77148585023ff56022f09c4b2c418a51ef5' (2023-01-05)
  → 'github:NixOS/nixpkgs/9b97ad7b4330aacda9b2343396eb3df8a853b4fc' (2023-01-25)
• Updated input 'retiolum':
    'git+https://git.thalheim.io/Mic92/retiolum?ref=refs%2fheads%2fmaster&rev=33ac7efb37d36e1939b62a93494570bce1be4dac' (2023-01-07)
  → 'git+https://git.thalheim.io/Mic92/retiolum?ref=refs%2fheads%2fmaster&rev=a396ad8139cb934e36f0bf0bde84786b2704c6bd' (2023-01-26)
• Updated input 'stockholm':
    'git+https://cgit.lassul.us/stockholm?ref=refs%2fheads%2fmaster&rev=895440aab0d360bd805338fa41874282a3209df0' (2023-01-07)
  → 'git+https://cgit.lassul.us/stockholm?ref=refs%2fheads%2fmaster&rev=e01e296e5d34aa74a4d6edf8203b3dd015a94112' (2023-01-28)

.bin/calendars.sh

@@ -6,12 +6,12 @@ clean() {
   rm -rf "$directory"
 }
 
-year=2022
+year=$(date +%Y)
 output=/tmp/$year.pdf
 
 for month in $(seq 1 12); do
   printf "\r%d" "$month" 1>&2
-  astrolog -zN Berlin -qm "$month" "$year" -X -K -XA -R Uranus Neptune Pluto -Xr -Xm -Xb -Xo "$(printf "%s/%02d.bmp" "$directory" "$month")" -Xw 1080 720 2>/dev/null
+  astrolog -zN Berlin -qm "$month" "$year" -X -K -XA -Xr -Xm -Xb -Xo "$(printf "%s/%02d.bmp" "$directory" "$month")" -Xw 1080 720 2>/dev/null
 done
 printf "\r"
 

configs/mastodon-bot.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   systemd.services.imaginary-illuminations = {
-    enable = true;
+    enable = false;
     wants = ["network-online.target"];
     serviceConfig = {
       User = "kfm";

configs/newsboat.nix

@@ -87,26 +87,14 @@
     color listfocus_unread blue default bold
     color info red default bold
 
-    urls-source "ttrss"
-    ttrss-url "https://feed.kmein.de"
-    ttrss-login "k"
-    ttrss-flag-star "s"
-    ttrss-password "${lib.strings.fileContents <secrets/tt-rss/password>}"
-    ttrss-mode "multi"
+    urls-source "miniflux"
+    miniflux-url "https://feed.kmein.de"
+    miniflux-login "kfm"
+    miniflux-password "${lib.strings.fileContents <secrets/miniflux/password>}"
   '';
 
   newsboat-sql = "${pkgs.sqlite}/bin/sqlite3 ${newsboat-home}/cache.db";
 in {
-  nixpkgs.config.packageOverrides = pkgs: {
-    newsboat = pkgs.writers.writeDashBin "newsboat" ''
-      ${pkgs.newsboat}/bin/newsboat -C ${newsboat-config} -u ${pkgs.writeText "newsboat-urls" ''
-        https://feed.kmein.de/public.php?op=rss&id=-1&is_cat=0&q=&key=${lib.strings.fileContents <secrets/tt-rss/private-rss.key>} "foo"
-        "query:🕒 Read Later:flags # \"e\""
-        "query:📥 Unread:unread = \"yes\""
-      ''} "$@"
-    '';
-  };
-
   environment.systemPackages = [
     pkgs.newsboat
     (pkgs.writers.writeDashBin "newsboat-unread-count" ''

flake.lock

@@ -23,11 +23,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1673089714,
-        "narHash": "sha256-D58SGNOVe+s7r2iewnCA8q68gyrfQcOnD1TdJo1wFLY=",
+        "lastModified": 1674928308,
+        "narHash": "sha256-elVU4NUZEl11BdT4gC+lrpLYM8Ccxqxs19Ix84HTI9o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9e565f0d9d41c19a94f55af205c328ec5177fc0a",
+        "rev": "08a778d80308353f4f65c9dcd3790b5da02d6306",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
     },
     "nixos-stable": {
       "locked": {
-        "lastModified": 1672968032,
-        "narHash": "sha256-26Jns3GmHem44a06UN5Rj/KOD9qNJThyQrom02Ijur8=",
+        "lastModified": 1674868155,
+        "narHash": "sha256-eFNm2h6fNbgD7ZpO4MHikCB5pSnCJ7DTmwPisjetmwc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2dea8991d89b9f1e78d874945f78ca15f6954289",
+        "rev": "ce20e9ebe1903ea2ba1ab006ec63093020c761cb",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1672953546,
-        "narHash": "sha256-oz757DnJ1ITvwyTovuwG3l9cX6j9j6/DH9eH+cXFJmc=",
+        "lastModified": 1674641431,
+        "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a518c77148585023ff56022f09c4b2c418a51ef5",
+        "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
     },
     "retiolum": {
       "locked": {
-        "lastModified": 1673132416,
-        "narHash": "sha256-dSiQtni1+8NEd+FsAVdm1C+p799/+M3R7kqsWvEbOvU=",
+        "lastModified": 1674748815,
+        "narHash": "sha256-X1tPCbPu9Q8727DE8mjfSDyw/PkDkepTgSq2Ke7uXkg=",
         "ref": "refs/heads/master",
-        "rev": "33ac7efb37d36e1939b62a93494570bce1be4dac",
-        "revCount": 267,
+        "rev": "a396ad8139cb934e36f0bf0bde84786b2704c6bd",
+        "revCount": 276,
         "type": "git",
         "url": "https://git.thalheim.io/Mic92/retiolum"
       },
@@ -210,11 +210,11 @@
     "stockholm": {
       "flake": false,
       "locked": {
-        "lastModified": 1673131905,
-        "narHash": "sha256-fNrWxDX1a1r0bOnZndb3/2+LHDpCQVMXRKwc+9pa44Q=",
+        "lastModified": 1674939172,
+        "narHash": "sha256-vjevdxJcZaq6Tw1GhAM23dkHHOoN2hiqTfT1hBEZEEU=",
         "ref": "refs/heads/master",
-        "rev": "895440aab0d360bd805338fa41874282a3209df0",
-        "revCount": 11179,
+        "rev": "e01e296e5d34aa74a4d6edf8203b3dd015a94112",
+        "revCount": 11278,
         "type": "git",
         "url": "https://cgit.lassul.us/stockholm"
       },

systems/makanek/tt-rss.nix

@@ -5,26 +5,33 @@
   ...
 }: let
   domain = "feed.kmein.de";
+  port = 8181;
 in {
-  services.tt-rss = {
+  services.miniflux = {
     enable = true;
-    logDestination = "syslog";
-    root = "/var/lib/tt-rss";
-    selfUrlPath = "https://${domain}";
-    virtualHost = domain;
-    registration = {
-      enable = false;
-      maxUsers = 3;
+    adminCredentialsFile = pkgs.writeText "miniflux" ''
+      ADMIN_USERNAME='kfm'
+      ADMIN_PASSWORD='${lib.strings.fileContents <secrets/miniflux/password>}'
+    '';
+    config = {
+      FETCH_YOUTUBE_WATCH_TIME = "1";
+      POLLING_FREQUENCY = "20";
+      PORT = toString port;
+      BASE_URL = "https://feed.kmein.de";
+      # POCKET_CONSUMER_KEY = ...
     };
   };
 
   services.postgresqlBackup = {
     enable = true;
-    databases = [config.services.tt-rss.database.name];
+    databases = ["miniflux"];
   };
 
   services.nginx.virtualHosts.${domain} = {
     enableACME = true;
     forceSSL = true;
+    locations."/" = {
+      proxyPass = "http://127.0.0.1:${toString port}";
+    };
   };
 }