From 11f62453c83405745b148702a4babc9c26613ba1 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sat, 28 Jul 2018 00:29:56 +0200
Subject: [PATCH] Fix habitask

---
 home-manager/default.nix                   |  1 +
 home-manager/modules/habitask.nix          |  2 +-
 home-manager/packages/habitask/src/main.rs | 21 +++------------------
 hosts/hera/home.nix                        |  1 +
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/home-manager/default.nix b/home-manager/default.nix
index 69ad76dd..b222ed78 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -22,6 +22,7 @@ imports = [
   ./modules/unlock.nix
   ./modules/weechat
   ./modules/update_tasks.nix
+  ./modules/habitask.nix
   ../common
 #   ./sort-mail.nix
 #   ./morgenreport.nix
diff --git a/home-manager/modules/habitask.nix b/home-manager/modules/habitask.nix
index 4aa665f0..106edf97 100644
--- a/home-manager/modules/habitask.nix
+++ b/home-manager/modules/habitask.nix
@@ -16,7 +16,7 @@ config = mkIf config.m-0.habitask.enable {
         ExecStart="${pkgs.habitask}/bin/habitask";
       };
     };
-    timers.update_tasks = {
+    timers.habitask = {
       Timer = {
         OnCalendar = "19:56:00";
       };
diff --git a/home-manager/packages/habitask/src/main.rs b/home-manager/packages/habitask/src/main.rs
index bfc0535e..442c6a4c 100644
--- a/home-manager/packages/habitask/src/main.rs
+++ b/home-manager/packages/habitask/src/main.rs
@@ -66,7 +66,7 @@ struct Response {
 impl Habitask {
     fn new() -> Habitask {
         let mut s = Config::new();
-        s.merge(Environment::with_prefix("habatisk"));
+        s.merge(Environment::with_prefix("habitask"));
         let s: Settings = s.try_into().unwrap();
         Habitask {
             client: Client::new(),
@@ -112,7 +112,6 @@ impl Habitask {
             .json(&map)
             .send()
             .unwrap();
-        println!("{:?}", res);
         let Response { data } = res.json().unwrap();
         data
     }
@@ -125,7 +124,6 @@ impl Habitask {
         ).json(&map)
             .send()
             .unwrap();
-        println!("{:?}", res);
         let Response { data } = res.json().unwrap();
         data
     }
@@ -138,7 +136,6 @@ impl Habitask {
         ).json(&map)
             .send()
             .unwrap();
-        println!("{:?}", res);
     }
     fn score_task(&self, id: &str) {
         let client = Client::new();
@@ -148,7 +145,6 @@ impl Habitask {
         ).json(&map)
             .send()
             .unwrap();
-        println!("{:?}", res);
     }
 }
 
@@ -156,8 +152,8 @@ fn main() {
     let habitask = Habitask::new();
     let new = "-DELETED entry.after:now-24h";
     let done = "+COMPLETED end.after:now-24h";
-    let after = "entry.after:new-";
-    let before = "entry.before:new-";
+    let after = "entry.after:now-";
+    let before = "entry.before:now-";
     let mask = "-auto";
     let habitask = Habitask::new();
     let instant_done = query(format!("{} -TAGGED {}48h {}", done, after, mask));
@@ -174,17 +170,6 @@ fn main() {
     ));
     let very_old = query(format!("{} {}1year {}3month {}", done, after, before, mask));
     let crazy_old = query(format!("{} {}1year {}", done, before, mask));
-    println!(
-        "{},{},{},{},{},{},{},{}",
-        tasks.len(),
-        routines.len(),
-        instant_done.len(),
-        created.len(),
-        a_little_old.len(),
-        old.len(),
-        very_old.len(),
-        crazy_old.len()
-    );
     for _ in created {
         habitask.score_task("note");
         blink();
diff --git a/hosts/hera/home.nix b/hosts/hera/home.nix
index ccd681d2..b343407b 100644
--- a/hosts/hera/home.nix
+++ b/hosts/hera/home.nix
@@ -9,6 +9,7 @@ imports = [
 m-0 = {
   hostName = "hera";
   taskwarrior.enable = true;
+  habitask.enable = true;
   weechat = {
     enable = true;
     user = config.m-0.private.hackint.user;