update caelestia and its theming

2 files changed, 20 insertions, 26 deletions

diff --git a/home/apps/caelestia/scheme.nix b/home/apps/caelestia/scheme.nix
index b454b78..06991d9 100644
--- a/home/apps/caelestia/scheme.nix
+++ b/home/apps/caelestia/scheme.nix
@@ -1,8 +1,10 @@
 {
   lib,
   config,
+  inputs,
   ...
-}: let
+}:
+with inputs.self.lib; let
   inherit (lib) mkIf;
   cfg = config.apps.caelestia;
   theme = config.theme.colors;
@@ -16,7 +18,6 @@ in {
       colours = {
         primary_paletteKeyColor = theme.primary;
         secondary_paletteKeyColor = theme.secondary;
-        tertiary_paletteKeyColor = theme.tertiary;
         neutral_paletteKeyColor = theme.overlay;
         neutral_variant_paletteKeyColor = "777680";
         background = theme.base;
@@ -24,11 +25,11 @@ in {
         surface = theme.surface;
         surfaceDim = theme.base;
         surfaceBright = theme.overlay;
-        surfaceContainerLowest = theme.base;
-        surfaceContainerLow = theme.base;
-        surfaceContainer = theme.base;
-        surfaceContainerHigh = theme.surface;
-        surfaceContainerHighest = theme.overlay;
+        surfaceContainerLowest = mixColor 0.80 theme.base theme.primary;
+        surfaceContainerLow = mixColor 0.72 theme.base theme.primary;
+        surfaceContainer = mixColor 0.68 theme.base theme.primary;
+        surfaceContainerHigh = mixColor 0.64 theme.base theme.primary;
+        surfaceContainerHighest = mixColor 0.60 theme.base theme.primary;
         onSurface = theme.text;
         surfaceVariant = theme.text;
         onSurfaceVariant = theme.subtext;
@@ -41,33 +42,25 @@ in {
         surfaceTint = theme.primary;
         primary = theme.primary;
         onPrimary = theme.surface;
-        primaryContainer = theme.primary;
-        onPrimaryContainer = theme.surface;
+        primaryContainer = mixColor 0.66 theme.base theme.primary;
+        onPrimaryContainer = theme.primary;
         inversePrimary = theme.surface;
         secondary = theme.secondary;
         onSecondary = theme.surface;
-        secondaryContainer = theme.secondary;
-        onSecondaryContainer = theme.surface;
-        tertiary = theme.tertiary;
-        onTertiary = theme.surface;
-        tertiaryContainer = theme.tertiary;
-        onTertiaryContainer = theme.surface;
+        secondaryContainer = mixColor 0.66 theme.base theme.secondary;
+        onSecondaryContainer = theme.secondary;
         error = theme.error;
-        onError = theme.text;
-        errorContainer = theme.error;
-        onErrorContainer = theme.text;
+        onError = theme.surface;
+        errorContainer = mixColor 0.66 theme.base theme.error;
+        onErrorContainer = theme.error;
         primaryFixed = theme.primary;
         primaryFixedDim = theme.primary;
-        onPrimaryFixed = theme.primary;
-        onPrimaryFixedVariant = theme.primary;
+        onPrimaryFixed = theme.base;
+        onPrimaryFixedVariant = theme.base;
         secondaryFixed = theme.secondary;
         secondaryFixedDim = theme.primary;
-        onSecondaryFixed = theme.secondary;
-        onSecondaryFixedVariant = theme.secondary;
-        tertiaryFixed = theme.tertiary;
-        tertiaryFixedDim = theme.tertiary;
-        onTertiaryFixed = theme.tertiary;
-        onTertiaryFixedVariant = theme.tertiary;
+        onSecondaryFixed = theme.base;
+        onSecondaryFixedVariant = theme.base;
         term0 = theme.normal.black;
         term1 = theme.normal.red;
         term2 = theme.normal.green;
diff --git a/home/apps/caelestia/settings.nix b/home/apps/caelestia/settings.nix
index de81df7..9168d86 100644
--- a/home/apps/caelestia/settings.nix
+++ b/home/apps/caelestia/settings.nix
@@ -186,6 +186,7 @@ in {
           brightnessIncrement = 0.1;
           maxVolume = 1.0;
           useFahrenheit = false;
+          useFahrenheitPerformance = false;
           useTwelveHourClock = false;
         };