update colorschemes

6 files changed, 28 insertions, 30 deletions

diff --git a/pkgs/astal/src/style/style.scss b/pkgs/astal/src/style/style.scss
index ddef6c7..3812245 100644
--- a/pkgs/astal/src/style/style.scss
+++ b/pkgs/astal/src/style/style.scss
@@ -13,47 +13,47 @@
 }
 
 window {
-    color: $fg;
+    color: $text;
     font-family: $font-name;
 }
 
 button {
-    color: $fg;
-    background: $surface-bg;
+    color: $text;
+    background: $surface;
 
     &:hover {
-        background: $hover-bg;
+        background: $overlay;
     }
 
     &.primary {
-        color: $bg;
+        color: $base;
         background: $primary;
     }
 }
 
 menu {
-    background: $bg;
+    background: $base;
     padding: $inner-gap 0;
     border-radius: $outer-radius;
 
     menuitem {
-        color: $fg;
+        color: $text;
         margin: $inner-gap $outer-gap;
         padding: $inner-gap;
         border-radius: $inner-radius;
 
         &:hover,
         &:selected {
-            background: $surface-bg;
+            background: $surface;
         }
 
         &:disabled {
-            color: darken($fg, 5%);
+            color: darken($text, 5%);
         }
     }
 
     separator {
-        background-color: $surface-bg;
+        background-color: $surface;
         min-height: 1px;
         margin: $inner-gap 0;
     }
diff --git a/pkgs/astal/src/style/widget/bar.scss b/pkgs/astal/src/style/widget/bar.scss
index 01e73ce..69ab270 100644
--- a/pkgs/astal/src/style/widget/bar.scss
+++ b/pkgs/astal/src/style/widget/bar.scss
@@ -1,6 +1,6 @@
 
 .bar {
-  background: $bg;
+  background: $base;
 
   .workspaces {
     margin: $inner-gap $outer-gap;
@@ -23,7 +23,7 @@
     .tray {
       margin: $inner-gap $outer-gap;
       margin-right: 0px;
-      background: $surface-bg;
+      background: $surface;
       border-radius: $inner-radius;
       padding: 0px $outer-gap;
 
diff --git a/pkgs/astal/src/style/widget/corners.scss b/pkgs/astal/src/style/widget/corners.scss
index 53cdb9b..a5015cb 100644
--- a/pkgs/astal/src/style/widget/corners.scss
+++ b/pkgs/astal/src/style/widget/corners.scss
@@ -3,7 +3,7 @@
   $radius: $outer-radius + $outer-gap;
 
   box {
-    box-shadow: 0 0 0 $radius $bg;
+    box-shadow: 0 0 0 $radius $base;
     border-radius: $radius $radius 0 0;
   }
 }
diff --git a/pkgs/astal/src/style/widget/deck.scss b/pkgs/astal/src/style/widget/deck.scss
index adf8c00..64cfc9d 100644
--- a/pkgs/astal/src/style/widget/deck.scss
+++ b/pkgs/astal/src/style/widget/deck.scss
@@ -9,8 +9,8 @@ $deck-scale: $font-size * 4;
 
     .notification {
         > box {
-            color: $fg;
-            background: $bg;
+            color: $text;
+            background: $base;
             border-radius: $outer-radius;
             margin-bottom: $outer-gap;
             min-width: $deck-scale * 6;
@@ -33,7 +33,7 @@ $deck-scale: $font-size * 4;
 
     .header {
         padding: $outer-gap;
-        color: gtkalpha($fg, 0.5);
+        color: gtkalpha($text, 0.5);
 
         .app-icon {
             margin-left: $inner-gap;
@@ -63,14 +63,14 @@ $deck-scale: $font-size * 4;
 
     separator {
         margin: 0 $outer-gap;
-        background: gtkalpha($fg, .1);
+        background: gtkalpha($text, .1);
     }
 
     .content {
         margin: $outer-gap;
 
         .body {
-            color: gtkalpha($fg, 0.8);
+            color: gtkalpha($text, 0.8);
         }
 
         .image {
diff --git a/pkgs/astal/src/style/widget/launcher.scss b/pkgs/astal/src/style/widget/launcher.scss
index 3b05aca..d39f06f 100644
--- a/pkgs/astal/src/style/widget/launcher.scss
+++ b/pkgs/astal/src/style/widget/launcher.scss
@@ -2,14 +2,14 @@
 .launcher {
 	> box {
 		padding: 5em;
-		background: gtkalpha($bg, 0.7);
+		background: gtkalpha($base, 0.7);
 		border-radius: $outer-radius $outer-radius 0 0;
 	}
 
 	.search {
 		margin-bottom: 5em;
-		color: $surface-fg;
-		background: $surface-bg;
+		color: $text;
+		background: $surface;
 		padding: $outer-gap;
 		border-radius: $outer-radius;
 		min-width: 20em;
@@ -25,7 +25,7 @@
 
 		&:hover,
 		&.selected {
-			background: gtkalpha($hover-bg, .5);
+			background: gtkalpha($overlay, .5);
 		}
 
 		icon {
@@ -35,7 +35,7 @@
 		.name {
 			margin-top: $outer-gap;
 			font-size: 1.25em;
-			color: gtkalpha($fg, 0.9);
+			color: gtkalpha($text, 0.9);
 		}
 	}
 
diff --git a/pkgs/astal/theme.nix b/pkgs/astal/theme.nix
index 2802d6c..9774012 100644
--- a/pkgs/astal/theme.nix
+++ b/pkgs/astal/theme.nix
@@ -1,13 +1,11 @@
 {options, ...}: ''
 
-  $fg: #${options.theme.colors.fg};
-  $bg: #${options.theme.colors.bg};
+  $text: #${options.theme.colors.text};
+  $subtext: #${options.theme.colors.subtext};
 
-  $surface-fg: #${options.theme.colors.surface.fg};
-  $surface-bg: #${options.theme.colors.surface.bg};
-
-  $hover-fg: #${options.theme.colors.hover.fg};
-  $hover-bg: #${options.theme.colors.hover.bg};
+  $base: #${options.theme.colors.base};
+  $surface: #${options.theme.colors.surface};
+  $overlay: #${options.theme.colors.overlay};
 
   $primary: #${options.theme.colors.primary};
   $success: #${options.theme.colors.success};