diff --git a/home/hosts/charon.nix b/home/hosts/charon.nix
deleted file mode 100644
index 1e0835d4..00000000
--- a/home/hosts/charon.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  imports = [
-    ../snippets/everywhere.nix
-    ../snippets/my-systems.nix
-    ../snippets/morgenreport.nix
-    ../snippets/sort-mail.nix
-    ../snippets/habitask.nix
-  ];
-}
diff --git a/home/snippets/habitask.nix b/home/hosts/charon/habitask.nix
similarity index 62%
rename from home/snippets/habitask.nix
rename to home/hosts/charon/habitask.nix
index 75c2ece6..010f2df9 100644
--- a/home/snippets/habitask.nix
+++ b/home/hosts/charon/habitask.nix
@@ -9,5 +9,18 @@ let
      buildInputs = [ openssl pkgconfig ];
   };
 in {
-  home.packages = [ habitask ];
+  systemd.user = {
+    services.habitask = {
+      Unit = {
+        Description = "Update habitica Tasks";
+      };
+      Service = {
+        Type = "oneshot";
+        ExecStart="{habitask}/bin/habitask";
+      };
+    };
+    timers.habitask = {
+      Timer.OnCalendar = "6:00";
+    };
+  };
 }
diff --git a/home/hosts/charon/home.nix b/home/hosts/charon/home.nix
new file mode 100644
index 00000000..68322f25
--- /dev/null
+++ b/home/hosts/charon/home.nix
@@ -0,0 +1,9 @@
+{
+  imports = [
+    ../../snippets/everywhere.nix
+    ../../snippets/my-systems.nix
+    ./morgenreport.nix
+    ./sort-mail.nix
+    ./habitask.nix
+  ];
+}
diff --git a/home/snippets/morgenreport.nix b/home/hosts/charon/morgenreport.nix
similarity index 100%
rename from home/snippets/morgenreport.nix
rename to home/hosts/charon/morgenreport.nix
diff --git a/home/snippets/sort-mail.nix b/home/hosts/charon/sort-mail.nix
similarity index 100%
rename from home/snippets/sort-mail.nix
rename to home/hosts/charon/sort-mail.nix