diff --git a/home-manager/machines.nix b/home-manager/machines.nix
index ef9ff60e..cba117ef 100644
--- a/home-manager/machines.nix
+++ b/home-manager/machines.nix
@@ -110,6 +110,7 @@ let
         all ++ orgaExtra ++ [
           ./roles/games.nix
           ./roles/chat.nix
+          ./roles/leisure.nix
           (blockServer newsPages)
         ]
       );
@@ -117,6 +118,7 @@ let
         all ++ orgaExtra ++ [
           ./roles/games.nix
           ./roles/chat.nix
+          ./roles/leisure.nix
           (blockServer [ ])
         ]
       );
diff --git a/home-manager/roles/daily-driver-programs.nix b/home-manager/roles/daily-driver-programs.nix
index 35baccae..2377799f 100644
--- a/home-manager/roles/daily-driver-programs.nix
+++ b/home-manager/roles/daily-driver-programs.nix
@@ -1,76 +1,31 @@
 { pkgs, lib, config, ... }:
-let
-  serien = pkgs.writeShellScript "serien.rss" ''
-    cat <<EOF
-    <?xml version="1.0"?>
-    <rss version="2.0">
-       <channel>
-          <title>Neue Serien Folgen</title>
-          <link>https://www.pogdesign.co.uk/cat</link>
-          <description>Neue Serien Folgen via TV Calendar</description>
-    EOF
-    khal list now 14d -a Serien -df "" -f '<item><title>{title}</title><description>{description}</description><guid>{uid}</guid><pubDate>{start-date}</pubDate></item>'
-    cat <<EOF
-       </channel>
-    </rss>
-    EOF
-  '';
-in
 {
-  home = {
-    file = {
-      "newsboat-config" = {
-        target = ".newsboat/config";
-        text = "datetime-format \"%Y-%m-%d\"";
-      };
-      "newsboat-urls" = {
-        target = ".newsboat/urls";
-        text = lib.concatStringsSep "\n" [
-          # Haskell
-          "https://www.youtube.com/feeds/videos.xml?channel_id=UCI1Z201n-8OelkSg0DVOsng" # Tweag
-          "https://www.youtube.com/feeds/videos.xml?channel_id=UCxVE_2I_fsOe3Mgn_QlXqbQ" # Nomeata
+  home.packages = builtins.attrValues rec {
+    zoom = pkgs.zoom-us.overrideAttrs (old: {
+      postFixup = old.postFixup + ''
+        wrapProgram $out/bin/zoom-us --unset XDG_SESSION_TYPE
+        wrapProgram $out/bin/zoom --unset XDG_SESSION_TYPE
+      '';
+    });
 
-          "http://www.zdf.de/rss/podcast/video/zdf/comedy/die-anstalt"
+    inherit (pkgs.gnome) nautilus;
+    inherit (pkgs.xorg) xbacklight;
+    inherit (pkgs)
+      # web
+      chromium
 
-          "https://www.zdf.de/rss/zdf/show/mai-think-x-die-show"
-          "https://www.youtube.com/feeds/videos.xml?channel_id=UCyHDQ5C6z1NDmJ4g6SerW8g" # Mailab
+      skypeforlinux google-chrome
 
-          "https://www.youtube.com/feeds/videos.xml?channel_id=UC2C_jShtL725hvbm1arSV9w" # GCP Grey
+      mumble upower speedtest-cli acpi
 
-          "https://www.youtube.com/feeds/videos.xml?channel_id=UCpXBGqwsBkpvcYjsJBQ7LEQ" # Critical Role
-          "exec:${serien}"
-        ];
-      };
-    };
+      anki
 
-    packages = builtins.attrValues rec {
-      zoom = pkgs.zoom-us.overrideAttrs (old: {
-        postFixup = old.postFixup + ''
-          wrapProgram $out/bin/zoom-us --unset XDG_SESSION_TYPE
-          wrapProgram $out/bin/zoom --unset XDG_SESSION_TYPE
-        '';
-      });
+      # tools & office
+      feh gimp imagemagick libreoffice-fresh xournal musescore handbrake evince
+      abcde beets zbar
 
-      inherit (pkgs.gnome) nautilus;
-      inherit (pkgs.xorg) xbacklight;
-      inherit (pkgs)
-        # web
-        chromium
+      # media
+      ncpamixer pavucontrol deluge gmpc vlc mpv youtubeDL syncplay;
 
-        skypeforlinux google-chrome
-
-        mumble upower speedtest-cli acpi
-
-        anki
-
-        # tools & office
-        feh gimp imagemagick libreoffice-fresh xournal musescore handbrake evince
-        abcde beets zbar
-
-        # media
-        ncpamixer pavucontrol deluge gmpc vlc mpv youtubeDL syncplay
-
-        newsboat;
-    };
   };
 }
diff --git a/home-manager/roles/leisure.nix b/home-manager/roles/leisure.nix
new file mode 100644
index 00000000..0f75c042
--- /dev/null
+++ b/home-manager/roles/leisure.nix
@@ -0,0 +1,48 @@
+{ pkgs, lib, config, ... }:
+let
+  serien = pkgs.writeShellScript "serien.rss" ''
+    cat <<EOF
+    <?xml version="1.0"?>
+    <rss version="2.0">
+       <channel>
+          <title>Neue Serien Folgen</title>
+          <link>https://www.pogdesign.co.uk/cat</link>
+          <description>Neue Serien Folgen via TV Calendar</description>
+    EOF
+    khal list now 14d -a Serien -df "" -f '<item><title>{title}</title><description>{description}</description><guid>{uid}</guid><pubDate>{start-date}</pubDate></item>'
+    cat <<EOF
+       </channel>
+    </rss>
+    EOF
+  '';
+in
+{
+  home = {
+    file = {
+      "newsboat-config" = {
+        target = ".newsboat/config";
+        text = "datetime-format \"%Y-%m-%d\"";
+      };
+      "newsboat-urls" = {
+        target = ".newsboat/urls";
+        text = lib.concatStringsSep "\n" [
+          # Haskell
+          "https://www.youtube.com/feeds/videos.xml?channel_id=UCI1Z201n-8OelkSg0DVOsng" # Tweag
+          "https://www.youtube.com/feeds/videos.xml?channel_id=UCxVE_2I_fsOe3Mgn_QlXqbQ" # Nomeata
+
+          "http://www.zdf.de/rss/podcast/video/zdf/comedy/die-anstalt"
+
+          "https://www.zdf.de/rss/zdf/show/mai-think-x-die-show"
+          "https://www.youtube.com/feeds/videos.xml?channel_id=UCyHDQ5C6z1NDmJ4g6SerW8g" # Mailab
+
+          "https://www.youtube.com/feeds/videos.xml?channel_id=UC2C_jShtL725hvbm1arSV9w" # GCP Grey
+
+          "https://www.youtube.com/feeds/videos.xml?channel_id=UCpXBGqwsBkpvcYjsJBQ7LEQ" # Critical Role
+          "exec:${serien}"
+        ];
+      };
+    };
+
+    packages = builtins.attrValues rec { inherit (pkgs) newsboat; };
+  };
+}