From 2dadd171e9f6feff8f9191aebcaf63a301b5e9a8 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 25 Oct 2024 12:42:54 +0100
Subject: [PATCH] Add cava back, update some hyprland binds to use nixpkgs
 paths

---
 system/home/desktop/hyprland.nix |  6 +++---
 system/home/shell/cava.nix       | 18 ------------------
 system/home/shell/default.nix    | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 system/home/shell/cava.nix

diff --git a/system/home/desktop/hyprland.nix b/system/home/desktop/hyprland.nix
index 24f6adfe..f7507045 100644
--- a/system/home/desktop/hyprland.nix
+++ b/system/home/desktop/hyprland.nix
@@ -361,17 +361,17 @@
             # Terminal utilities
             "SUPER, S, exec, ${
               withTerm {
-                progname = "btm";
+                progname = "${config.programs.bottom.package}/bin/btm";
                 args = btm_args;
               }
             }"
             "SUPER SHIFT, S, exec, ${
               withTerm {
-                progname = "btm";
+                progname = "${config.programs.bottom.package}/bin/btm";
                 args = btm_args + " --basic";
               }
             }"
-            "SUPER, C, exec, ${withTerm { progname = "cava"; }}"
+            "SUPER, C, exec, ${withTerm { progname = "${config.programs.cava.package}/bin/cava"; }}"
 
             # Misc useful binds
             ",Print,exec,${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.swappy}/bin/swappy -f -"
diff --git a/system/home/shell/cava.nix b/system/home/shell/cava.nix
deleted file mode 100644
index 64cf6f1a..00000000
--- a/system/home/shell/cava.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, ... }:
-{
-  programs.cava = {
-    enable = true;
-    settings = {
-      color = with config.lib.stylix.colors.withHashtag; {
-        gradient = 1;
-        gradient_count = 6;
-        gradient_color_1 = "'${red}'";
-        gradient_color_2 = "'${yellow}'";
-        gradient_color_3 = "'${green}'";
-        gradient_color_4 = "'${cyan}'";
-        gradient_color_5 = "'${blue}'";
-        gradient_color_6 = "'${magenta}'";
-      };
-    };
-  };
-}
diff --git a/system/home/shell/default.nix b/system/home/shell/default.nix
index 207d9f3e..00eafce2 100644
--- a/system/home/shell/default.nix
+++ b/system/home/shell/default.nix
@@ -49,6 +49,21 @@
           };
       };
     };
+    cava = {
+      enable = true;
+      settings = {
+        color = with config.lib.stylix.colors.withHashtag; {
+          gradient = 1;
+          gradient_count = 6;
+          gradient_color_1 = "'${red}'";
+          gradient_color_2 = "'${yellow}'";
+          gradient_color_3 = "'${green}'";
+          gradient_color_4 = "'${cyan}'";
+          gradient_color_5 = "'${blue}'";
+          gradient_color_6 = "'${magenta}'";
+        };
+      };
+    };
     direnv = {
       enable = true;
       nix-direnv.enable = true;