diff --git a/modules/home/profiles.nix b/modules/home/profiles.nix
index 5744658..0453c5c 100644
--- a/modules/home/profiles.nix
+++ b/modules/home/profiles.nix
@@ -45,6 +45,7 @@ in {
 
       programs = {
         amfora = enabled;
+        cava = enabled;
         cheat = enabled;
         fzf = enabled;
         gh = enabled;
diff --git a/snowflake/modules/home/programs/tui/cava/default.nix b/modules/home/programs/cava.nix
similarity index 56%
rename from snowflake/modules/home/programs/tui/cava/default.nix
rename to modules/home/programs/cava.nix
index 1b84e39..899066d 100644
--- a/snowflake/modules/home/programs/tui/cava/default.nix
+++ b/modules/home/programs/cava.nix
@@ -1,22 +1,21 @@
 {
-  lib,
   config,
+  osConfig,
+  lib,
+  pkgs,
   ...
 }: let
   cfg = config.marleyos.programs.cava;
+  has-mpd = osConfig.services.mpd.enable || config.services.mpd.enable;
 in {
   options.marleyos.programs.cava.enable = lib.mkEnableOption "cava";
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
     programs.cava = {
-      # FIX: Re-enable once https://github.com/NixOS/nixpkgs/pull/355948 is
-      # ported to nixpkgs/unstable
-      enable = false;
+      enable = true;
 
-      # TODO: disable this when mpd is not enabled? Can that be detected on non
-      # NixOS systems?
       settings = {
-        input = {
+        input = lib.mkIf has-mpd {
           method = "fifo";
           source = "/tmp/mpd.fifo";
         };
diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix
index d32d4cb..9862a1a 100644
--- a/modules/home/programs/default.nix
+++ b/modules/home/programs/default.nix
@@ -4,6 +4,7 @@
     ./amfora
     ./bat.nix
     ./btop.nix
+    ./cava.nix
     ./cheat.nix
     ./curl.nix
     ./eza.nix