From e5ff96ac8f408aedf465f2ce72719f3dc9d4e3fe Mon Sep 17 00:00:00 2001
From: end-4 <97237370+end-4@users.noreply.github.com>
Date: Tue, 30 Jan 2024 22:32:46 +0700
Subject: [PATCH] ags: sync

---
 .../ags/scripts/templates/hypr/colors.conf    | 20 ++++---------------
 .config/ags/scss/_music.scss                  | 12 +++++------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/.config/ags/scripts/templates/hypr/colors.conf b/.config/ags/scripts/templates/hypr/colors.conf
index 0c1ba7f0..7588d93e 100644
--- a/.config/ags/scripts/templates/hypr/colors.conf
+++ b/.config/ags/scripts/templates/hypr/colors.conf
@@ -5,23 +5,11 @@ general {
     col.inactive_border = rgba({{ $secondaryContainer }}CC)
 }
 
-plugin {
-    droidbars { # This is my hyprbars mod that broke :(
-        # example config
-        bar_height = 30
-        background_color = rgba({{ $background }}FF)
-        # background_color_active = rgba({{ $surfaceVariant }}FF) # Not added yet
-        text_color = rgba({{ $onSecondaryContainer }}FF)
-        font_family = Rubik, Geist, AR One Sans, Reddit Sans, Inter, Roboto, Ubuntu, Noto Sans, sans-serif
-        button_font_fmily = JetBrainsMono NF
+misc {
+    background_color = rgba({{ $surface }}FF)
+}
 
-        # example buttons (R -> L)
-        # droidbars-button = [0]isLeft(0/1), [1]color, [2]color2, [3]width, [4]height, [5]icon, [6]buttonType, [7]on-click     
-        droidbars-button = 0, rgba({{ $onSecondaryContainer }}FF), rgba({{ $primary }}FF), 42, 16,‎    󰖭, normal, hyprctl dispatch killactive
-        droidbars-button = 0, rgba({{ $onSecondaryContainer }}FF), rgba({{ $primary }}FF), 42, 16,‎   , normal, hyprctl dispatch fullscreen 1
-        droidbars-button = 1, rgba({{ $onSecondaryContainer }}FF), rgba({{ $primary }}FF), 16, 16,‎󰐃, pin, hyprctl dispatch pin
-        droidbars-button = 1, rgba({{ $onSecondaryContainer }}FF), rgba({{ $primary }}FF), 16, 16,󰗘, float, hyprctl dispatch togglefloating
-    }
+plugin {
     hyprbars {
         # Honestly idk if it works like css, but well, why not
         bar_text_font = Rubik, Geist, AR One Sans, Reddit Sans, Inter, Roboto, Ubuntu, Noto Sans, sans-serif
diff --git a/.config/ags/scss/_music.scss b/.config/ags/scss/_music.scss
index d96441c9..8fcbdfea 100644
--- a/.config/ags/scss/_music.scss
+++ b/.config/ags/scss/_music.scss
@@ -41,7 +41,7 @@ $onSecondaryContainer: mix($color7, $color2, 90%);
 
 
 .osd-music-cover-fallback {
-    @include menu_decel;
+    @include element_decel;
     @include small-rounding;
     // margin: 1.023rem;
     min-width: 7.5rem;
@@ -73,21 +73,21 @@ $onSecondaryContainer: mix($color7, $color2, 90%);
 }
 
 .osd-music-title {
-    @include menu_decel;
+    @include element_decel;
     @include titlefont;
     font-size: 1.364rem;
     color: $onSecondaryContainer;
 }
 
 .osd-music-artists {
-    @include menu_decel;
+    @include element_decel;
     @include mainfont;
     font-size: 0.955rem;
     color: mix($onSecondaryContainer, $secondaryContainer, 80%);
 }
 
 .osd-music-pill {
-    @include menu_decel;
+    @include element_decel;
     @include full-rounding;
     @include titlefont;
     min-width: 1.833rem;
@@ -97,7 +97,7 @@ $onSecondaryContainer: mix($color7, $color2, 90%);
 }
 
 .osd-music-controls {
-    @include menu_decel;
+    @include element_decel;
     @include full-rounding;
     @include titlefont;
     min-width: 1.833rem;
@@ -123,7 +123,7 @@ $onSecondaryContainer: mix($color7, $color2, 90%);
 }
 
 .osd-music-controlbtn-txt {
-    @include menu_decel;
+    @include element_decel;
     transition: 100ms cubic-bezier(0.05, 0.7, 0.1, 1);
     @include icon-material;
     font-size: 1.364rem;