From a9c78cbaa959544b39e3340dfa35dd576669c7bb Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 30 Oct 2024 16:32:34 +0000
Subject: [PATCH] Move btm and cava into their own files

---
 system/home/shell/bottom.nix  | 31 +++++++++++++++++++++++
 system/home/shell/cava.nix    | 18 ++++++++++++++
 system/home/shell/default.nix | 46 +++--------------------------------
 3 files changed, 52 insertions(+), 43 deletions(-)
 create mode 100644 system/home/shell/bottom.nix
 create mode 100644 system/home/shell/cava.nix

diff --git a/system/home/shell/bottom.nix b/system/home/shell/bottom.nix
new file mode 100644
index 00000000..0f03d896
--- /dev/null
+++ b/system/home/shell/bottom.nix
@@ -0,0 +1,31 @@
+{ config, ... }:
+{
+  programs.bottom = {
+    enable = true;
+    settings = {
+      flags = {
+        group_processes = true;
+        temperature_type = "celsius";
+        battery = true;
+        enable_gpu = true;
+        enable_cache_memory = true;
+      };
+      colors =
+        let
+          scheme = config.lib.stylix.scheme.withHashtag;
+          rainbow = with scheme; [
+            red
+            yellow
+            green
+            cyan
+            blue
+            magenta
+          ];
+        in
+        {
+          cpu_core_colors = rainbow;
+          gpu_core_colors = rainbow;
+        };
+    };
+  };
+}
diff --git a/system/home/shell/cava.nix b/system/home/shell/cava.nix
new file mode 100644
index 00000000..64cf6f1a
--- /dev/null
+++ b/system/home/shell/cava.nix
@@ -0,0 +1,18 @@
+{ 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 b30347f4..bfb17648 100644
--- a/system/home/shell/default.nix
+++ b/system/home/shell/default.nix
@@ -1,9 +1,11 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ./git.nix
     ./ssh.nix
     ./starship.nix
+    ./bottom.nix
+    ./cava.nix
   ];
   home.shellAliases = {
     sync-all = "sync-emacs; sync-git; vdirsyncer sync; mbsync -a";
@@ -22,48 +24,6 @@
       enable = true;
       config.style = "plain,numbers,changes";
     };
-    bottom = {
-      enable = true;
-      settings = {
-        flags = {
-          group_processes = true;
-          temperature_type = "celsius";
-          battery = true;
-          enable_gpu = true;
-          enable_cache_memory = true;
-        };
-        colors =
-          let
-            rainbow = with config.lib.stylix.scheme.withHashtag; [
-              red
-              yellow
-              green
-              cyan
-              blue
-              magenta
-            ];
-          in
-          {
-            cpu_core_colors = rainbow;
-            gpu_core_colors = rainbow;
-          };
-      };
-    };
-    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;