From 322d923722d9c061f90cdf7ba988b5dfa84a9749 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 9 Dec 2020 21:11:07 +0100
Subject: [PATCH] Package logfeed

---
 home-manager/roles/weechat/default.nix | 12 ++++++------
 nix/sources.json                       |  6 ++++++
 overlays/logfeed/default.nix           |  3 +++
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 overlays/logfeed/default.nix

diff --git a/home-manager/roles/weechat/default.nix b/home-manager/roles/weechat/default.nix
index e6ecb311..f05a1af4 100644
--- a/home-manager/roles/weechat/default.nix
+++ b/home-manager/roles/weechat/default.nix
@@ -113,27 +113,27 @@ in {
 
   systemd.user = {
     timers.logfeed = {
-      Timer = { OnCalendar = "19:55"; };
-      Install = { WantedBy = [ "timers.target" ]; };
+      Timer.OnCalendar = "19:55";
+      Install.WantedBy = [ "timers.target" ];
     };
     services = {
       logfeed = {
-        Unit = { Description = "Logfeed"; };
+        Unit.Description = "Logfeed";
         Service = {
           ExecStart =
-            "${config.home.homeDirectory}/.cabal/bin/logfeed /var/www/rss/chats.xml";
+            "${pkgs.logfeed}/bin/logfeed /var/www/rss/chats.xml";
           Type = "oneshot";
         };
       };
       weechat = {
-        Unit = { Description = "Weechat Tmux Session"; };
+        Unit.Description = "Weechat Tmux Session";
         Service = {
           Type = "forking";
           ExecStart =
             "${pkgs.tmux}/bin/tmux -L weechat -2 new-session -d -s irc -n weechat '${weechat}/bin/weechat'";
           Restart = "always";
         };
-        Install = { WantedBy = [ "default.target" ]; };
+        Install.WantedBy = [ "default.target" ];
       };
     };
   };
diff --git a/nix/sources.json b/nix/sources.json
index 2f53ddd5..e64c78e6 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -35,6 +35,12 @@
         "rev": "312a8bc1fd1ed04c6564be4db4d08b7bcdc64764",
         "type": "git"
     },
+    "logfeed": {
+        "branch": "master",
+        "repo": "git@hera.m-0.eu:logfeed",
+        "rev": "6f0132abbab58da56e109cedf851a9d9f8a2f8c6",
+        "type": "git"
+    },
     "nixos-20.09": {
         "branch": "nixos-20.09",
         "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels",
diff --git a/overlays/logfeed/default.nix b/overlays/logfeed/default.nix
new file mode 100644
index 00000000..446e1785
--- /dev/null
+++ b/overlays/logfeed/default.nix
@@ -0,0 +1,3 @@
+final: prev: let
+  master = import prev.sources.nixpkgs-master {};
+in master.haskellPackages.callCabal2nix "logfeed" prev.sources.logfeed {}