feat: simplified themes module

home/modules/bottom/config/settings.nix

@@ -1,44 +1,49 @@
-{flake, ...}: let
-  inherit
-    (flake.config.aesthetics.themes.schemes.catppuccin-macchiato)
-    colours
+{ flake, ... }:
+let
+  inherit (flake.config.aesthetics.themes)
+    currentTheme
+    palettes
     ;
-in {
+
+  el = palettes.${currentTheme}.colours;
+in
+{
   colors = {
-    tableHeaderColor = colours.rosewater;
-    allCpuColor = colours.rosewater;
-    avgCpuColor = colours.maroon;
+    tableHeaderColor = el.base06;
+    allCpuColor = el.base06;
+    avgCpuColor = el.base12;
     cpuCoreColors = [
-      colours.sapphire
-      colours.peach
-      colours.yellow
-      colours.green
-      colours.sky
-      colours.mauve
+      el.base07
+      el.base16
+      el.base09
+      el.base0A
+      el.base0B
+      el.base15
+      el.base0E
     ];
-    ramColor = colours.green;
-    swapColor = colours.peach;
-    rxColor = colours.green;
-    txColor = colours.red;
-    widgetTitleColor = colours.flamingo;
-    borderColor = colours.surface2;
-    highlightedBorderColor = colours.pink;
-    textColor = colours.text;
-    graphColor = colours.subtext0;
-    cursorColor = colours.pink;
-    selectedTextColor = colours.crust;
-    selectedBgColor = colours.mauve;
-    highBatteryColor = colours.green;
-    mediumBatteryColor = colours.yellow;
-    lowBatteryColor = colours.red;
+    ramColor = el.base0B;
+    swapColor = el.base09;
+    rxColor = el.base0B;
+    txColor = el.base08;
+    widgetTitleColor = el.base0F;
+    borderColor = el.base04;
+    highlightedBorderColor = el.base17;
+    textColor = el.base05;
+    graphColor = el.base05;
+    cursorColor = el.base17;
+    selectedTextColor = el.base11;
+    selectedBgColor = el.base0E;
+    highBatteryColor = el.base0B;
+    mediumBatteryColor = el.base0A;
+    lowBatteryColor = el.base08;
     gpuCoreColors = [
-      colours.sky
-      colours.mauve
-      colours.red
-      colours.peach
-      colours.yellow
-      colours.green
+      el.base15
+      el.base0E
+      el.base08
+      el.base09
+      el.base0A
+      el.base0B
     ];
-    arcColor = colours.sky;
+    arcColor = el.base15;
   };
 }

home/modules/bottom/default.nix

@@ -1,13 +1,16 @@
-{flake, ...}: {
-  programs.bottom = let
-    configPath = ./config;
-    settingsPath = import (configPath + /settings.nix) {
-      inherit
-        flake
-        ;
+{ flake, ... }:
+{
+  programs.bottom =
+    let
+      configPath = ./config;
+      settingsPath = import (configPath + /settings.nix) {
+        inherit
+          flake
+          ;
+      };
+    in
+    {
+      enable = true;
+      settings = settingsPath;
     };
-  in {
-    enable = true;
-    settings = settingsPath;
-  };
 }