diff --git a/home-manager/default.nix b/home-manager/default.nix
index 81c2f47e..d73b8b64 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -137,8 +137,16 @@ fonts.fontconfig.enableProfileFonts = true;
 
 systemd.user.startServices = true;
 
+services = {
+  gpg-agent = {
+    enable = true;
+    defaultCacheTtl = 31536000;
+  };
+};
+
 home.packages = with pkgs; [
   neovim
+  rust_scripts
 ];
 xdg.enable = true;
 }
diff --git a/home-manager/modules/eventd.nix b/home-manager/modules/eventd.nix
index f0ed4859..e73e4d6c 100644
--- a/home-manager/modules/eventd.nix
+++ b/home-manager/modules/eventd.nix
@@ -21,7 +21,7 @@ config = mkIf config.m-0.eventd.enable {
           PartOf = [ "graphical-session.target" ];
         };
         Install = {
-          WantedBy = [ "graphical-session.target" ];
+          WantedBy = [ "default.target" ];
         };
         Service = {
           Type="notify";
@@ -54,7 +54,7 @@ config = mkIf config.m-0.eventd.enable {
     };
   };
   xdg = {
-    configFile = {
+    configFile = mkIf config.m-0.graphical.enable {
       "eventd/eventd.conf".text = lib.generators.toINI {} {
         "Queue default" = {
           Margin = 10;
diff --git a/home-manager/modules/graphical/default.nix b/home-manager/modules/graphical/default.nix
index 0477c57f..363fafe7 100644
--- a/home-manager/modules/graphical/default.nix
+++ b/home-manager/modules/graphical/default.nix
@@ -48,7 +48,6 @@ config = mkIf config.m-0.graphical.enable {
   };
   home = {
     packages = with pkgs; [
-      rust_scripts
       tasktree
       st
       shutter
@@ -89,11 +88,6 @@ config = mkIf config.m-0.graphical.enable {
       imageDirectory = "%h/data/aktuell/media/bilder/wallpaper/";
       interval = "15minutes";
     };
-    gpg-agent = {
-      enable = true;
-      defaultCacheTtl = 900;
-      defaultCacheTtlSsh = 900;
-    };
     redshift = {
       enable = true;
       temperature.day = 6500;
diff --git a/home-manager/modules/weechat/default.nix b/home-manager/modules/weechat/default.nix
index 30f38f2f..ee3dc6ff 100644
--- a/home-manager/modules/weechat/default.nix
+++ b/home-manager/modules/weechat/default.nix
@@ -77,6 +77,16 @@ config = mkIf config.m-0.weechat.enable {
         hackint.autojoin = "${config.m-0.weechat.channels}"
       '';
     };
+    alias = {
+      target = ".weechat/alias.conf";
+      text = ''
+        [cmd]
+        yes = "/msg beschlussbot .yes"
+        no = "/msg beschlussbot .no"
+        cancel = "/msg beschlussbot .cancel"
+        votes = "/msg beschlussbot .votes"
+      '';
+    };
   };
 
   systemd.user.services = {
diff --git a/hosts/hera/home.nix b/hosts/hera/home.nix
index b48b437a..f1eb0111 100644
--- a/hosts/hera/home.nix
+++ b/hosts/hera/home.nix
@@ -12,12 +12,20 @@ m-0 = {
   habitask.enable = true;
   bugwarrior.enable = true;
   rustdev.enable = true;
+  update_tasks.enable = true;
+  eventd.enable = true;
   weechat = {
     enable = true;
     user = config.m-0.private.hackint.user;
     pw = config.m-0.private.hackint.hackint_pw;
     channels = config.m-0.private.hackint.channels;
   };
+  mail = {
+    enable = true;
+    boxes = with config.m-0.private.mail; [ private work work2 ];
+    sendmail = with config.m-0.private.sendmail; [ private work work2 club club2 ];
+    default = config.m-0.private.sendmail.private;
+  };
 };
 
 }