From 10bc1c4ef8dc559e0db605eb89116d8d062f238c Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Fri, 29 Dec 2023 18:17:08 +0700 Subject: [PATCH] ags: some migration i cry --- .config/ags/lib/notification.js | 80 +- .config/ags/lib/popupwindow.js | 12 +- .config/ags/lib/statusicons.js | 78 +- .config/ags/scss/_bar.scss | 2 +- .config/ags/style.css | 743 +++++++++--------- .config/ags/widgets/bar/leftspace.js | 12 +- .config/ags/widgets/bar/rightspace.js | 4 +- .config/ags/widgets/bar/system.js | 38 +- .config/ags/widgets/bar/tray.js | 8 +- .config/ags/widgets/bar/workspaces.js | 48 +- .../desktopbackground/timeandlaunches.js | 12 +- .config/ags/widgets/dock/dock.js | 41 +- .config/ags/widgets/indicators/colorscheme.js | 8 +- .../widgets/indicators/notificationpopups.js | 20 +- .../onscreenkeyboard/onscreenkeyboard.js | 4 +- .config/ags/widgets/sideleft/sideleft.js | 10 +- 16 files changed, 551 insertions(+), 569 deletions(-) diff --git a/.config/ags/lib/notification.js b/.config/ags/lib/notification.js index 93d6d70a0..1e647f1e2 100644 --- a/.config/ags/lib/notification.js +++ b/.config/ags/lib/notification.js @@ -161,18 +161,24 @@ export default ({ children: [ Overlay({ child: NotificationIcon(notifObject), - overlays: [ - AnimatedCircProg({ - className: `notif-circprog-${notifObject.urgency}`, - valign: Gtk.Align.CENTER, - initFrom: (isPopup ? 100 : 0), - initTo: 0, - initAnimTime: popupTimeout, - }) - ] + overlays: isPopup ? [AnimatedCircProg({ + className: `notif-circprog-${notifObject.urgency}`, + valign: Gtk.Align.CENTER, + initFrom: (isPopup ? 100 : 0), + initTo: 0, + initAnimTime: popupTimeout, + })] : [], }), ] }); + let notifTime = ''; + const messageTime = GLib.DateTime.new_from_unix_local(notifObject.time); + if (messageTime.get_day_of_year() == GLib.DateTime.new_now_local().get_day_of_year()) + notifTime = messageTime.format('%H:%M'); + else if (messageTime.get_day_of_year() == GLib.DateTime.new_now_local().get_day_of_year() - 1) + notifTime = 'Yesterday'; + else + notifTime = messageTime.format('%d/%m'); const notifText = Box({ valign: Gtk.Align.CENTER, vertical: true, @@ -188,27 +194,14 @@ export default ({ maxWidthChars: 24, truncate: 'end', ellipsize: 3, - // wrap: true, useMarkup: notifObject.summary.startsWith('<'), label: notifObject.summary, }), Label({ - valign: Gtk.Align.CENTER, + vpack: 'center', + justification: 'right', className: 'txt-smaller txt-semibold', - justify: Gtk.Justification.RIGHT, - setup: (label) => { - // Let's ignore how it won't work for Jan1 cuz I'm lazy - const messageTime = GLib.DateTime.new_from_unix_local(notifObject.time); - if (messageTime.get_day_of_year() == GLib.DateTime.new_now_local().get_day_of_year()) { - label.label = messageTime.format('%H:%M'); - } - else if (messageTime.get_day_of_year() == GLib.DateTime.new_now_local().get_day_of_year() - 1) { - label.label = messageTime.format('Yesterday'); - } - else { - label.label = messageTime.format('%d/%m'); - } - } + label: notifTime, }), ] }), @@ -243,17 +236,6 @@ export default ({ notifIcon, notifText, notifExpandButton, - - // what is this? i think it should be at the bottom not on the right - // Box({ - // className: 'actions', - // children: actions.map(action => Button({ - // className: 'action-button', - // onClicked: () => Notifications.invoke(id, action.id), - // hexpand: true, - // child: Label(action.label), - // })), - // }), ] }) @@ -284,16 +266,16 @@ export default ({ opacity: 0;`; const notificationBox = Box({ - properties: [ - ['leftAnim1', leftAnim1], - ['rightAnim1', rightAnim1], - ['middleClickClose', middleClickClose], - ['ready', false], - ], + attribute: { + 'leftAnim1': leftAnim1, + 'rightAnim1': rightAnim1, + 'middleClickClose': middleClickClose, + 'ready': false, + }, homogeneous: true, children: [notificationContent], - connections: [ - [gesture, self => { + setup: (self) => self + .hook(gesture, self => { var offset = gesture.get_offset()[1]; if (initialDir == 0 && offset != 0) initialDir = (offset > 0 ? 1 : -1) @@ -323,9 +305,8 @@ export default ({ if (widget.window) widget.window.set_cursor(Gdk.Cursor.new_from_name(display, 'grabbing')); - }, 'drag-update'], - - [gesture, self => { + }, 'drag-update') + .hook(gesture, self => { if (!self._ready) { wholeThing.revealChild = true; self._ready = true; @@ -362,9 +343,8 @@ export default ({ wholeThing._dragging = false; } initialDir = 0; - }, 'drag-end'], - - ], + }, 'drag-end') + , }) widget.add(notificationBox); wholeThing.child.children = [widget]; diff --git a/.config/ags/lib/popupwindow.js b/.config/ags/lib/popupwindow.js index e4a29c16f..4f7e63d2e 100644 --- a/.config/ags/lib/popupwindow.js +++ b/.config/ags/lib/popupwindow.js @@ -17,11 +17,13 @@ export default ({ child: Box({ className: `${showClassName} ${hideClassName}`, - connections: [[App, (self, currentName, visible) => { - if (currentName === name) { - self.toggleClassName(hideClassName, !visible); - } - }]], + setup: (self) => self + .hook(App, (self, currentName, visible) => { + if (currentName === name) { + self.toggleClassName(hideClassName, !visible); + } + }) + , child: child, }), }); \ No newline at end of file diff --git a/.config/ags/lib/statusicons.js b/.config/ags/lib/statusicons.js index d0db10ebd..48c0bce47 100644 --- a/.config/ags/lib/statusicons.js +++ b/.config/ags/lib/statusicons.js @@ -27,18 +27,18 @@ export const NotificationIndicator = (notifCenterName = 'sideright') => { transition: 150, transition: 'slide_left', revealChild: false, - connections: [ - [Notifications, (self, id) => { + setup: (self) => self + .hook(Notifications, (self, id) => { if (!id || Notifications.dnd) return; if (!Notifications.getNotification(id)) return; self.revealChild = true; - }, 'notified'], - [App, (self, currentName, visible) => { + }, 'notified') + .hook(App, (self, currentName, visible) => { if (visible && currentName === notifCenterName) { self.revealChild = false; } - }], - ], + }) + , child: Widget.Box({ children: [ MaterialIcon('notifications', 'norm'), @@ -50,20 +50,20 @@ export const NotificationIndicator = (notifCenterName = 'sideright') => { ['update', (self) => self.label = `${self._unreadCount}`], ['unreadCount', 0], ], - connections: [ - [Notifications, (self, id) => { + setup: (self) => self + .hook(Notifications, (self, id) => { if (!id || Notifications.dnd) return; if (!Notifications.getNotification(id)) return; self._increment(self); self._update(self); - }, 'notified'], - [App, (self, currentName, visible) => { + }, 'notified') + .hook(App, (self, currentName, visible) => { if (visible && currentName === notifCenterName) { self._markread(self); self._update(self); } - }], - ] + }) + , }) ] }) @@ -77,7 +77,11 @@ export const BluetoothIndicator = () => Widget.Stack({ ['true', Widget.Label({ className: 'txt-norm icon-material', label: 'bluetooth' })], ['false', Widget.Label({ className: 'txt-norm icon-material', label: 'bluetooth_disabled' })], ], - connections: [[Bluetooth, stack => { stack.shown = String(Bluetooth.enabled); }]], + setup: (self) => self + .hook(Bluetooth, stack => { + stack.shown = String(Bluetooth.enabled); + }) + , }); @@ -90,7 +94,7 @@ const NetworkWiredIndicator = () => Widget.Stack({ ['connected', Widget.Label({ className: 'txt-norm icon-material', label: 'lan' })], ['connecting', Widget.Label({ className: 'txt-norm icon-material', label: 'settings_ethernet' })], ], - connections: [[Network, stack => { + setup: (self) => self.hook(Network, stack => { if (!Network.wired) return; @@ -101,15 +105,15 @@ const NetworkWiredIndicator = () => Widget.Stack({ stack.shown = 'disconnected'; else stack.shown = 'fallback'; - }]], + }), }); const SimpleNetworkIndicator = () => Widget.Icon({ - connections: [[Network, self => { + setup: (self) => self.hook(Network, self => { const icon = Network[Network.primary || 'wifi']?.iconName; self.icon = icon || ''; self.visible = icon; - }]], + }), }); const NetworkWifiIndicator = () => Widget.Stack({ @@ -124,7 +128,7 @@ const NetworkWifiIndicator = () => Widget.Stack({ ['3', Widget.Label({ className: 'txt-norm icon-material', label: 'network_wifi_3_bar' })], ['4', Widget.Label({ className: 'txt-norm icon-material', label: 'signal_wifi_4_bar' })], ], - connections: [[Network, (stack) => { + setup: (self) => self.hook(Network, (stack) => { if (!Network.wifi) { return; } @@ -134,7 +138,7 @@ const NetworkWifiIndicator = () => Widget.Stack({ else if (Network.wifi.internet == 'disconnected' || Network.wifi.internet == 'connecting') { stack.shown = Network.wifi.internet; } - }]], + }), }); export const NetworkIndicator = () => Widget.Stack({ @@ -144,8 +148,8 @@ export const NetworkIndicator = () => Widget.Stack({ ['wifi', NetworkWifiIndicator()], ['wired', NetworkWiredIndicator()], ], - connections: [[Network, stack => { - if(!Network.primary) { + setup: (self) => self.hook(Network, stack => { + if (!Network.primary) { stack.shown = 'wifi'; return; } @@ -154,7 +158,7 @@ export const NetworkIndicator = () => Widget.Stack({ stack.shown = primary; else stack.shown = 'fallback'; - }]], + }), }); const KeyboardLayout = ({ useFlag } = {}) => { @@ -192,22 +196,20 @@ const KeyboardLayout = ({ useFlag } = {}) => { ...languageStackArray, ['undef', Widget.Label({ label: '?' })] ], - connections: [ - [Hyprland, (stack, kbName, layoutName) => { - if (!kbName) { - return; - } - var lang = languages.find(lang => layoutName.includes(lang.name)); - if (lang) { - widgetContent.shown = lang.layout; - } - else { // Attempt to support langs not listed - lang = languageStackArray.find(lang => isLanguageMatch(lang[0], layoutName)); - if (!lang) stack.shown = 'undef'; - else stack.shown = lang[0]; - } - }, 'keyboard-layout'] - ], + setup: (self) => self.hook(Hyprland, (stack, kbName, layoutName) => { + if (!kbName) { + return; + } + var lang = languages.find(lang => layoutName.includes(lang.name)); + if (lang) { + widgetContent.shown = lang.layout; + } + else { // Attempt to support langs not listed + lang = languageStackArray.find(lang => isLanguageMatch(lang[0], layoutName)); + if (!lang) stack.shown = 'undef'; + else stack.shown = lang[0]; + } + }, 'keyboard-layout'), }); widgetRevealer.child = widgetContent; return widgetRevealer; diff --git a/.config/ags/scss/_bar.scss b/.config/ags/scss/_bar.scss index 27229888f..b1bbd4378 100644 --- a/.config/ags/scss/_bar.scss +++ b/.config/ags/scss/_bar.scss @@ -72,7 +72,7 @@ $notchOnPrimary: $onPrimary; .bar-group-pad-music { padding-right: 1.023rem; - // padding-left: 0.273rem; + padding-left: 0.341rem; } .bar-group-pad-left { diff --git a/.config/ags/style.css b/.config/ags/style.css index 8d7f9d373..977572676 100644 --- a/.config/ags/style.css +++ b/.config/ags/style.css @@ -41,13 +41,13 @@ transition: 0ms; } .txt { - color: #e7e1e6; } + color: #e2e2e2; } .txt-primary { - color: #d6baff; } + color: #e2e2e2; } .txt-onSecondaryContainer { - color: #eadef7; } + color: #e2e2e2; } .txt-shadow { text-shadow: 1px 2px 8px rgba(0, 0, 0, 0.69); @@ -101,10 +101,10 @@ font-size: 0px; } .txt-subtext { - color: #a6a1a6; } + color: #a0a0a0; } .txt-action { - color: #c7c1c6; } + color: #c1c1c1; } .txt-semibold { font-weight: 500; } @@ -130,7 +130,7 @@ .separator-circle { border-radius: 9999px; -gtk-outline-radius: 9999px; - background-color: #e7e1e6; + background-color: #e2e2e2; margin: 0rem 0.682rem; min-width: 0.545rem; min-height: 0.545rem; } @@ -361,10 +361,10 @@ transition: 300ms cubic-bezier(0.85, 0, 0.15, 1); } * { - caret-color: #d6baff; } + caret-color: #e2e2e2; } * selection { - background-color: #cec2db; - color: #342d40; } + background-color: #e2e2e2; + color: #000000; } @keyframes appear { from { @@ -379,13 +379,13 @@ tooltip { animation-iteration-count: 1; } menu { - border-top: 1px solid rgba(59, 57, 61, 0.121); - border-left: 1px solid rgba(59, 57, 61, 0.121); - border-right: 1px solid rgba(45, 43, 47, 0.1105); - border-bottom: 1px solid rgba(45, 43, 47, 0.1105); + border-top: 1px solid rgba(35, 35, 35, 0.121); + border-left: 1px solid rgba(35, 35, 35, 0.121); + border-right: 1px solid rgba(19, 19, 19, 0.1105); + border-bottom: 1px solid rgba(19, 19, 19, 0.1105); padding: 0.681rem; - background: #28262b; - color: #cbc4cf; + background: #121212; + color: #e2e2e2; border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; animation-name: appear; @@ -408,53 +408,53 @@ menu > menuitem { menu > menuitem:hover, menu > menuitem:focus { - background-color: #38363b; } + background-color: #272727; } .separator-line { - background-color: #28262b; + background-color: #121212; min-width: 0.068rem; min-height: 0.068rem; } tooltip { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; - background-color: #28262b; - color: #cbc4cf; - border: 1px solid #cbc4cf; } + background-color: #121212; + color: #e2e2e2; + border: 1px solid #e2e2e2; } .configtoggle-box { padding: 0.205rem 0.341rem; border: 0.136rem solid transparent; } .configtoggle-box:focus { - border: 0.136rem solid #6e6b6f; } + border: 0.136rem solid #5c5c5c; } .switch-bg { transition: 300ms cubic-bezier(0.1, 1, 0, 1); border-radius: 9999px; -gtk-outline-radius: 9999px; - background-color: #171518; - border: 0.136rem solid #e7e1e6; + background-color: #050505; + border: 0.136rem solid #e2e2e2; min-width: 2.864rem; min-height: 1.637rem; } .switch-bg-true { - background-color: #d6baff; - border: 0.136rem solid #d6baff; } + background-color: #e2e2e2; + border: 0.136rem solid #e2e2e2; } .switch-fg { border-radius: 9999px; -gtk-outline-radius: 9999px; transition: 300ms cubic-bezier(0.1, 1, 0, 1); - background-color: #e7e1e6; - color: #1e1c20; + background-color: #e2e2e2; + color: #020202; min-width: 0.819rem; min-height: 0.819rem; margin-left: 0.477rem; } .switch-fg-true { - background-color: #3d1c70; - color: #d6baff; + background-color: #000000; + color: #e2e2e2; min-width: 1.431rem; min-height: 1.431rem; margin-left: 1.431rem; } @@ -467,14 +467,14 @@ tooltip { .segment-container { border-radius: 9999px; -gtk-outline-radius: 9999px; - border: 0.068rem solid #958f99; } + border: 0.068rem solid #a1a1a1; } .segment-container > *:first-child { border-top-left-radius: 9999px; border-bottom-left-radius: 9999px; } .segment-container > * { - border-right: 0.068rem solid #958f99; + border-right: 0.068rem solid #a1a1a1; padding: 0.341rem 0.682rem; } .segment-container > *:last-child { @@ -483,21 +483,21 @@ tooltip { border-bottom-right-radius: 9999px; } .segment-btn { - color: #e7e1e6; } + color: #e2e2e2; } .segment-btn:focus, .segment-btn:hover { - background-color: #28262b; - color: #cbc4cf; } + background-color: #121212; + color: #e2e2e2; } .segment-btn-enabled { - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .segment-btn-enabled:hover, .segment-btn-enabled:focus { - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .gap-v-5 { min-height: 0.341rem; } @@ -518,7 +518,7 @@ tooltip { min-width: 1.023rem; } .bar-bg { - background-color: #0f0d10; + background-color: #070707; min-height: 2.727rem; } .bar-sidespace { @@ -528,7 +528,7 @@ tooltip { padding: 0.2rem; } .bar-group { - background-color: rgba(30, 28, 32, 0.31); } + background-color: rgba(2, 2, 2, 0.31); } .bar-group-center { border-bottom-left-radius: 1.364rem; @@ -552,7 +552,8 @@ tooltip { padding-right: 0.547rem; } .bar-group-pad-music { - padding-right: 1.023rem; } + padding-right: 1.023rem; + padding-left: 0.341rem; } .bar-group-pad-left { padding-left: 1.364rem; @@ -600,18 +601,18 @@ tooltip { -gtk-outline-radius: 9999px; min-width: 0.341rem; min-height: 0.341rem; - background-color: rgba(50, 48, 52, 0.31); + background-color: rgba(24, 24, 24, 0.31); margin: 0rem 0.341rem; } .bar-clock { font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif; font-size: 1.2727rem; - color: #e7e1e6; } + color: #e2e2e2; } .bar-date { font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif; font-size: 1rem; - color: #e7e1e6; } + color: #e2e2e2; } .bar-ws { min-height: 1.636rem; @@ -631,8 +632,8 @@ tooltip { min-width: 1.5rem; font-size: 1.091rem; font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; - background-color: #d6baff; - color: #3d1c70; + background-color: #e2e2e2; + color: #000000; border-radius: 999px; margin: 0.068rem; } @@ -644,67 +645,67 @@ tooltip { margin: 0rem 0.409rem; } .bar-ws-occupied { - background-color: #4b4358; - color: #eadef7; + background-color: #313131; + color: #e2e2e2; min-width: 1.772rem; - border-top: 0.068rem solid #eadef7; - border-bottom: 0.068rem solid #eadef7; } + border-top: 0.068rem solid #e2e2e2; + border-bottom: 0.068rem solid #e2e2e2; } .bar-ws-occupied-left { - background-color: #4b4358; - color: #eadef7; + background-color: #313131; + color: #e2e2e2; min-width: 1.704rem; border-top-left-radius: 999px; border-bottom-left-radius: 999px; - border-left: 0.068rem solid #eadef7; - border-top: 0.068rem solid #eadef7; - border-bottom: 0.068rem solid #eadef7; + border-left: 0.068rem solid #e2e2e2; + border-top: 0.068rem solid #e2e2e2; + border-bottom: 0.068rem solid #e2e2e2; border-right: 0px solid transparent; } .bar-ws-occupied-right { - background-color: #4b4358; - color: #eadef7; + background-color: #313131; + color: #e2e2e2; min-width: 1.704rem; border-top-right-radius: 999px; border-bottom-right-radius: 999px; - border-right: 0.068rem solid #eadef7; - border-top: 0.068rem solid #eadef7; - border-bottom: 0.068rem solid #eadef7; + border-right: 0.068rem solid #e2e2e2; + border-top: 0.068rem solid #e2e2e2; + border-bottom: 0.068rem solid #e2e2e2; border-left: 0px solid transparent; } .bar-ws-occupied-left-right { border-radius: 9999px; -gtk-outline-radius: 9999px; - background-color: #4b4358; - color: #eadef7; + background-color: #313131; + color: #e2e2e2; min-width: 1.636rem; - border: 0.068rem solid #eadef7; } + border: 0.068rem solid #e2e2e2; } .bar-ws-empty { - color: #e7e1e6; + color: #e2e2e2; border-color: transparent; } .bar-batt { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 0rem 0.341rem; - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .bar-sidemodule { min-width: 26rem; } .bar-batt-low { - background-color: #ffb4a9; - color: #930006; } + background-color: #e2e2e2; + color: #000000; } .bar-batt-full { background-color: #374b3e; color: #d1e9d6; } .bar-batt-prog-low { - background-color: #ffb4a9; - color: #930006; } + background-color: #e2e2e2; + color: #000000; } .bar-batt-prog-full { background-color: #374b3e; @@ -714,23 +715,23 @@ tooltip { min-height: 1.770rem; min-width: 1.770rem; border-radius: 10rem; - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .bar-music-circprog { transition: 1000ms cubic-bezier(0.1, 1, 0, 1); min-width: 0.068rem; min-height: 1.770rem; padding: 0rem; - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .bar-music-playstate-playing { min-height: 1.770rem; min-width: 1.770rem; border-radius: 10rem; - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .bar-music-playstate-txt { transition: 100ms cubic-bezier(0.05, 0.7, 0.1, 1); @@ -798,10 +799,10 @@ tooltip { min-width: 0.680rem; margin: 0rem 0.137rem; border-radius: 10rem; - background-color: #eadef7; } + background-color: #e2e2e2; } .bar-prog-batt-low progress { - background-color: #930006; } + background-color: #000000; } .bar-prog-batt-full progress { background-color: #d1e9d6; } @@ -814,18 +815,18 @@ tooltip { border-radius: 10rem; min-width: 0.681rem; min-height: 0.681rem; - background-color: #eadef7; - color: #4b4358; } + background-color: #e2e2e2; + color: #313131; } .bar-batt-chargestate-charging-smaller { border-radius: 10rem; min-width: 0.409rem; min-height: 0.409rem; - background-color: #eadef7; - color: #4b4358; } + background-color: #e2e2e2; + color: #313131; } .bar-batt-chargestate-low { - background-color: #930006; } + background-color: #000000; } .bar-batt-chargestate-full { background-color: #d1e9d6; } @@ -836,7 +837,7 @@ tooltip { font-weight: 500; } .corner { - background-color: #0f0d10; + background-color: #070707; border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; } @@ -848,7 +849,7 @@ tooltip { .bar-topdesc { margin-top: -0.136rem; margin-bottom: -0.341rem; - color: #a6a1a6; } + color: #a0a0a0; } .bar-space-button { padding: 0.341rem; } @@ -891,22 +892,22 @@ tooltip { padding: 0rem 0.614rem; } .bar-statusicons-hover { - background-color: #252225; } + background-color: #1d1d1d; } .bar-statusicons-active { - background-color: #3a373b; } + background-color: #333333; } .cheatsheet-bg { border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 1px solid rgba(166, 162, 166, 0.19); - border-left: 1px solid rgba(166, 162, 166, 0.19); - border-right: 1px solid rgba(131, 127, 131, 0.145); - border-bottom: 1px solid rgba(131, 127, 131, 0.145); + border-top: 1px solid rgba(154, 154, 154, 0.19); + border-left: 1px solid rgba(154, 154, 154, 0.19); + border-right: 1px solid rgba(114, 114, 114, 0.145); + border-bottom: 1px solid rgba(114, 114, 114, 0.145); box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45); margin: 0.476rem; margin-bottom: 0.682rem; - background-color: #0f0d10; + background-color: #070707; padding: 1.364rem; } .cheatsheet-key { @@ -917,16 +918,16 @@ tooltip { padding: 0.136rem 0.205rem; border-radius: 0.409rem; -gtk-outline-radius: 0.409rem; - color: #d6baff; - border: 0.068rem solid #d6baff; - box-shadow: 0rem 0.136rem 0rem #d6baff; + color: #e2e2e2; + border: 0.068rem solid #e2e2e2; + box-shadow: 0rem 0.136rem 0rem #e2e2e2; font-weight: 500; } .cheatsheet-key-notkey { min-height: 1.364rem; padding: 0.136rem 0.205rem; margin: 0.17rem; - color: #ecdcff; } + color: #e2e2e2; } .cheatsheet-closebtn { transition: 300ms cubic-bezier(0.1, 1, 0, 1); @@ -937,10 +938,10 @@ tooltip { .cheatsheet-closebtn:hover, .cheatsheet-closebtn:focus { - background-color: #28262b; } + background-color: #121212; } .cheatsheet-closebtn:active { - background-color: #59555c; } + background-color: #505050; } .cheatsheet-category-title { font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif; @@ -955,12 +956,12 @@ tooltip { .bg-time-clock { font-family: 'Gabarito'; font-size: 5.795rem; - color: #e7e1e6; } + color: #e2e2e2; } .bg-time-date { font-family: 'Gabarito'; font-size: 2.591rem; - color: #e7e1e6; } + color: #e2e2e2; } .bg-distro-box { border-radius: 1.705rem; @@ -971,12 +972,12 @@ tooltip { .bg-distro-txt { font-family: 'Gabarito'; font-size: 1.432rem; - color: #e7e1e6; } + color: #e2e2e2; } .bg-distro-name { font-family: 'Gabarito'; font-size: 1.432rem; - color: #eadef7; } + color: #e2e2e2; } .bg-graph { color: rgba(255, 255, 255, 0.5); @@ -985,25 +986,25 @@ tooltip { .bg-quicklaunch-title { font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; - color: #cbc4cf; } + color: #e2e2e2; } .bg-quicklaunch-btn { font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; border-radius: 9999px; -gtk-outline-radius: 9999px; - background-color: #28262b; - color: #cbc4cf; - border: 0.068rem solid #a6a1a6; + background-color: #121212; + color: #e2e2e2; + border: 0.068rem solid #a0a0a0; min-width: 4.432rem; min-height: 2.045rem; padding: 0.273rem 0.682rem; } .bg-quicklaunch-btn:hover, .bg-quicklaunch-btn:focus { - background-color: #302e33; } + background-color: #1c1c1c; } .bg-quicklaunch-btn:active { - background-color: #38363b; } + background-color: #272727; } .bg-system-bg { border-radius: 1.159rem; @@ -1015,14 +1016,14 @@ tooltip { min-height: 4.091rem; font-size: 0px; padding: 0rem; - background-color: #28262b; } + background-color: #121212; } .dock-bg { border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45); margin: 0.476rem; - background-color: #0f0d10; + background-color: #070707; padding: 0.682rem; } .dock-app-btn { @@ -1032,10 +1033,10 @@ tooltip { .dock-app-btn:hover, .dock-app-btn:focus { - background-color: rgba(40, 38, 42, 0.31); } + background-color: rgba(13, 13, 13, 0.31); } .dock-app-btn:active { - background-color: rgba(60, 58, 62, 0.31); } + background-color: rgba(36, 36, 36, 0.31); } .dock-app-icon { min-width: 3.409rem; @@ -1043,14 +1044,14 @@ tooltip { .dock-separator { min-width: 0.068rem; - background-color: #28262b; } + background-color: #121212; } .osd-bg { min-width: 8.864rem; min-height: 3.409rem; } .osd-value { - background-color: #0f0d10; + background-color: #070707; border-radius: 1.023rem; padding: 0.625rem 1.023rem; padding-top: 0.313rem; @@ -1068,36 +1069,36 @@ tooltip { min-height: 0.954rem; min-width: 0.068rem; border-radius: 10rem; - background-color: #4b4358; } + background-color: #313131; } .osd-progress progress { transition: 200ms cubic-bezier(0.1, 1, 0, 1); min-height: 0.680rem; min-width: 0.680rem; margin: 0rem 0.137rem; border-radius: 10rem; - background-color: #eadef7; } + background-color: #e2e2e2; } .osd-icon { - color: #ecdcff; } + color: #e2e2e2; } .osd-label { font-size: 1.023rem; font-weight: 500; - color: #e7e1e6; + color: #e2e2e2; margin-top: 0.341rem; } .osd-value-txt { font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif; font-size: 1.688rem; font-weight: 500; - color: #e7e1e6; } + color: #e2e2e2; } .osd-notifs { padding-top: 0.313rem; } .osd-colorscheme { border-radius: 1.023rem; - background-color: #0f0d10; + background-color: #070707; padding: 1.023rem; box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45); margin: 0.476rem; } @@ -1115,46 +1116,46 @@ tooltip { margin: 0.409rem; } .osd-color-primary { - background-color: #d6baff; - color: #3d1c70; } + background-color: #e2e2e2; + color: #000000; } .osd-color-primary box { - background-color: #3d1c70; } + background-color: #000000; } .osd-color-primaryContainer { - background-color: #543588; - color: #ecdcff; } + background-color: #6b6b6b; + color: #e2e2e2; } .osd-color-primaryContainer box { - background-color: #ecdcff; } + background-color: #e2e2e2; } .osd-color-secondary { - background-color: #cec2db; - color: #342d40; } + background-color: #e2e2e2; + color: #000000; } .osd-color-secondary box { - background-color: #342d40; } + background-color: #000000; } .osd-color-secondaryContainer { - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .osd-color-secondaryContainer box { - background-color: #eadef7; } + background-color: #e2e2e2; } .osd-color-surfaceVariant { - background-color: #28262b; - color: #cbc4cf; } + background-color: #121212; + color: #e2e2e2; } .osd-color-surfaceVariant box { - background-color: #cbc4cf; } + background-color: #e2e2e2; } .osd-color-surface { - background-color: #1e1c20; - color: #e7e1e6; } + background-color: #020202; + color: #e2e2e2; } .osd-color-surface box { - background-color: #e7e1e6; } + background-color: #e2e2e2; } .osd-color-background { - background-color: #0f0d10; - color: #e7e1e6; } + background-color: #070707; + color: #e2e2e2; } .osd-color-background box { - background-color: #e7e1e6; } + background-color: #e2e2e2; } .overview-window { margin-top: 2.727rem; } @@ -1163,29 +1164,29 @@ tooltip { transition: 300ms cubic-bezier(0.1, 1, 0, 1); border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 1px solid rgba(166, 162, 166, 0.19); - border-left: 1px solid rgba(166, 162, 166, 0.19); - border-right: 1px solid rgba(131, 127, 131, 0.145); - border-bottom: 1px solid rgba(131, 127, 131, 0.145); + border-top: 1px solid rgba(154, 154, 154, 0.19); + border-left: 1px solid rgba(154, 154, 154, 0.19); + border-right: 1px solid rgba(114, 114, 114, 0.145); + border-bottom: 1px solid rgba(114, 114, 114, 0.145); box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45); margin: 0.476rem; min-width: 13.636rem; min-height: 3.409rem; padding: 0rem 1.364rem; padding-right: 2.864rem; - background-color: #0f0d10; - color: #e7e1e6; + background-color: #070707; + color: #e2e2e2; caret-color: transparent; } .overview-search-box selection { - background-color: #cec2db; - color: #342d40; } + background-color: #e2e2e2; + color: #000000; } .overview-search-box-extended { min-width: 25.909rem; - caret-color: #eadef7; } + caret-color: #e2e2e2; } .overview-search-prompt { - color: #a6a1a6; } + color: #a0a0a0; } .overview-search-icon { margin: 0rem 1.023rem; } @@ -1201,16 +1202,16 @@ tooltip { .overview-search-results { border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 1px solid rgba(166, 162, 166, 0.19); - border-left: 1px solid rgba(166, 162, 166, 0.19); - border-right: 1px solid rgba(131, 127, 131, 0.145); - border-bottom: 1px solid rgba(131, 127, 131, 0.145); + border-top: 1px solid rgba(154, 154, 154, 0.19); + border-left: 1px solid rgba(154, 154, 154, 0.19); + border-right: 1px solid rgba(114, 114, 114, 0.145); + border-bottom: 1px solid rgba(114, 114, 114, 0.145); box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45); margin: 0.476rem; min-width: 28.773rem; padding: 0.682rem; - background-color: #0f0d10; - color: #e7e1e6; } + background-color: #070707; + color: #e2e2e2; } .overview-search-results-icon { margin: 0rem 0.682rem; @@ -1244,43 +1245,43 @@ tooltip { .overview-tasks { border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 1px solid rgba(166, 162, 166, 0.19); - border-left: 1px solid rgba(166, 162, 166, 0.19); - border-right: 1px solid rgba(131, 127, 131, 0.145); - border-bottom: 1px solid rgba(131, 127, 131, 0.145); + border-top: 1px solid rgba(154, 154, 154, 0.19); + border-left: 1px solid rgba(154, 154, 154, 0.19); + border-right: 1px solid rgba(114, 114, 114, 0.145); + border-bottom: 1px solid rgba(114, 114, 114, 0.145); box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45); margin: 0.476rem; padding: 0.341rem; - background-color: #0f0d10; - color: #e7e1e6; } + background-color: #070707; + color: #e2e2e2; } .overview-tasks-workspace { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; margin: 0.341rem; - background-color: rgba(51, 48, 52, 0.1147); } + background-color: rgba(25, 25, 25, 0.1147); } .overview-tasks-workspace-number { font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; - color: rgba(217, 211, 216, 0.31); } + color: rgba(210, 210, 210, 0.31); } .overview-tasks-window { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; transition: 300ms cubic-bezier(0.1, 1, 0, 1); - background-color: rgba(75, 67, 88, 0.5); - color: #eadef7; - border: 0.068rem solid rgba(234, 222, 247, 0.07); } + background-color: rgba(49, 49, 49, 0.5); + color: #e2e2e2; + border: 0.068rem solid rgba(226, 226, 226, 0.07); } .overview-tasks-window:hover, .overview-tasks-window:focus { - background-color: rgba(94, 83, 111, 0.525); } + background-color: rgba(73, 73, 73, 0.525); } .overview-tasks-window:active { - background-color: rgba(110, 97, 130, 0.55); } + background-color: rgba(93, 93, 93, 0.55); } .overview-tasks-window-selected { - background-color: rgba(110, 97, 130, 0.55); } + background-color: rgba(93, 93, 93, 0.55); } .overview-tasks-window-dragging { opacity: 0.2; } @@ -1288,13 +1289,13 @@ tooltip { .osk-window { border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 1px solid rgba(166, 162, 166, 0.19); - border-left: 1px solid rgba(166, 162, 166, 0.19); - border-right: 1px solid rgba(131, 127, 131, 0.145); - border-bottom: 1px solid rgba(131, 127, 131, 0.145); + border-top: 1px solid rgba(154, 154, 154, 0.19); + border-left: 1px solid rgba(154, 154, 154, 0.19); + border-right: 1px solid rgba(114, 114, 114, 0.145); + border-bottom: 1px solid rgba(114, 114, 114, 0.145); box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45); margin: 0.476rem; - background-color: #0f0d10; } + background-color: #070707; } .osk-body { padding: 1.023rem; @@ -1311,7 +1312,7 @@ tooltip { .osk-dragline { border-radius: 9999px; -gtk-outline-radius: 9999px; - background-color: #28262b; + background-color: #121212; min-height: 0.273rem; min-width: 10.227rem; margin-top: 0.545rem; @@ -1319,22 +1320,22 @@ tooltip { .osk-key { border-radius: 0.682rem; - background-color: rgba(40, 38, 43, 0.31); - color: #cbc4cf; + background-color: rgba(18, 18, 18, 0.31); + color: #e2e2e2; padding: 0.188rem; font-weight: 500; font-size: 1.091rem; } .osk-key:hover, .osk-key:focus { - background-color: rgba(56, 54, 59, 0.31); } + background-color: rgba(39, 39, 39, 0.31); } .osk-key:active { - background-color: rgba(89, 85, 92, 0.31); + background-color: rgba(80, 80, 80, 0.31); font-size: 1.091rem; } .osk-key-active { - background-color: rgba(89, 85, 92, 0.31); } + background-color: rgba(80, 80, 80, 0.31); } .osk-key-normal { min-width: 2.5rem; @@ -1362,31 +1363,31 @@ tooltip { .osk-control-button { border-radius: 0.682rem; - background-color: rgba(40, 38, 43, 0.31); - color: #cbc4cf; + background-color: rgba(18, 18, 18, 0.31); + color: #e2e2e2; font-weight: 500; font-size: 1.091rem; padding: 0.682rem; } .osk-control-button:hover, .osk-control-button:focus { - background-color: rgba(56, 54, 59, 0.31); } + background-color: rgba(39, 39, 39, 0.31); } .osk-control-button:active { - background-color: rgba(89, 85, 92, 0.31); + background-color: rgba(80, 80, 80, 0.31); font-size: 1.091rem; } .sidebar-right { transition: 300ms cubic-bezier(0.1, 1, 0, 1); - border-top: 1px solid rgba(166, 162, 166, 0.19); - border-left: 1px solid rgba(166, 162, 166, 0.19); - border-right: 1px solid rgba(131, 127, 131, 0.145); - border-bottom: 1px solid rgba(131, 127, 131, 0.145); + border-top: 1px solid rgba(154, 154, 154, 0.19); + border-left: 1px solid rgba(154, 154, 154, 0.19); + border-right: 1px solid rgba(114, 114, 114, 0.145); + border-bottom: 1px solid rgba(114, 114, 114, 0.145); box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45); margin: 0.476rem; border-radius: 1.297rem; min-width: 27.818rem; - background-color: #0f0d10; + background-color: #070707; padding: 1.023rem; } .sideright-show { @@ -1398,15 +1399,15 @@ tooltip { .sidebar-left { transition: 300ms cubic-bezier(0.1, 1, 0, 1); - border-top: 1px solid rgba(166, 162, 166, 0.19); - border-left: 1px solid rgba(166, 162, 166, 0.19); - border-right: 1px solid rgba(131, 127, 131, 0.145); - border-bottom: 1px solid rgba(131, 127, 131, 0.145); + border-top: 1px solid rgba(154, 154, 154, 0.19); + border-left: 1px solid rgba(154, 154, 154, 0.19); + border-right: 1px solid rgba(114, 114, 114, 0.145); + border-bottom: 1px solid rgba(114, 114, 114, 0.145); box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.45); margin: 0.476rem; border-radius: 1.297rem; min-width: 27.818rem; - background-color: #0f0d10; + background-color: #070707; padding: 1.023rem; } .sideleft-show { @@ -1420,12 +1421,12 @@ tooltip { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; padding: 0.341rem; - background-color: rgba(30, 28, 32, 0.31); } + background-color: rgba(2, 2, 2, 0.31); } .sidebar-group-nopad { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; - background-color: rgba(30, 28, 32, 0.31); } + background-color: rgba(2, 2, 2, 0.31); } .sidebar-group-invisible { padding: 0.341rem; } @@ -1437,47 +1438,47 @@ tooltip { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 0.341rem; - background-color: rgba(30, 28, 32, 0.31); } + background-color: rgba(2, 2, 2, 0.31); } .sidebar-iconbutton { border-radius: 9999px; -gtk-outline-radius: 9999px; transition: 300ms cubic-bezier(0.1, 1, 0, 1); - color: #e7e1e6; + color: #e2e2e2; min-width: 2.727rem; min-height: 2.727rem; } .sidebar-iconbutton:hover, .sidebar-iconbutton:focus { - background-color: #6b6278; } + background-color: #545454; } .sidebar-iconbutton:active { - background-color: #8b8198; } + background-color: #787878; } .sidebar-button { transition: 300ms cubic-bezier(0.1, 1, 0, 1); padding: 0rem 0.818rem; - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .sidebar-button-nopad { transition: 300ms cubic-bezier(0.1, 1, 0, 1); - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .sidebar-button:hover, .sidebar-button:focus { - background-color: #6b6278; } + background-color: #545454; } .sidebar-button:active { - background-color: #8b8198; } + background-color: #787878; } .sidebar-button-nopad:hover, .sidebar-button-nopad:focus { - background-color: #6b6278; } + background-color: #545454; } .sidebar-button-nopad:active { - background-color: #8b8198; } + background-color: #787878; } .sidebar-button-left { border-top-left-radius: 0.818rem; @@ -1496,20 +1497,20 @@ tooltip { -gtk-outline-radius: 0.818rem; } .sidebar-button-active { - background-color: #d6baff; - color: #3d1c70; } + background-color: #e2e2e2; + color: #000000; } .sidebar-button-active:hover, .sidebar-button-active:focus { - background-color: rgba(212, 185, 253, 0.93); } + background-color: rgba(224, 224, 224, 0.93); } .sidebar-button-active:active { - background-color: rgba(208, 182, 246, 0.79); } + background-color: rgba(219, 219, 219, 0.79); } .sidebar-buttons-separator { min-width: 0.068rem; min-height: 0.068rem; - background-color: #cbc4cf; } + background-color: #e2e2e2; } .sidebar-navrail { padding: 0rem 1.159rem; } @@ -1521,19 +1522,19 @@ tooltip { .sidebar-navrail-btn:hover > box > label:first-child, .sidebar-navrail-btn:focus > box > label:first-child { - background-color: rgba(101, 98, 105, 0.379); } + background-color: rgba(96, 96, 96, 0.379); } .sidebar-navrail-btn:active > box > label:first-child { - background-color: #514e54; } + background-color: #464646; } .sidebar-navrail-btn-active > box > label:first-child { - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .sidebar-navrail-btn-active:hover > box > label:first-child, .sidebar-navrail-btn-active:focus > box > label:first-child { - background-color: rgba(76, 68, 89, 0.93); - color: rgba(232, 220, 245, 0.93); } + background-color: rgba(51, 51, 51, 0.93); + color: rgba(224, 224, 224, 0.93); } .sidebar-sysinfo-grouppad { padding: 1.159rem; } @@ -1543,8 +1544,8 @@ tooltip { min-width: 0.818rem; min-height: 4.091rem; padding: 0.409rem; - background-color: #4b4358; - color: #eadef7; + background-color: #313131; + color: #e2e2e2; font-size: 0px; } .sidebar-memory-swap-circprog { @@ -1553,16 +1554,16 @@ tooltip { min-height: 2.255rem; padding: 0.409rem; margin: 0.918rem; - background-color: #4b4358; - color: #eadef7; + background-color: #313131; + color: #e2e2e2; font-size: 0px; } .sidebar-cpu-circprog { min-width: 0.818rem; min-height: 3.409rem; padding: 0.409rem; - background-color: #4b4358; - color: #eadef7; + background-color: #313131; + color: #e2e2e2; transition: 1000ms cubic-bezier(0.1, 1, 0, 1); font-size: 0px; } @@ -1577,14 +1578,14 @@ tooltip { -gtk-outline-radius: 9999px; min-width: 0.273rem; min-height: 2.045rem; - background-color: rgba(203, 196, 207, 0.31); } + background-color: rgba(226, 226, 226, 0.31); } .sidebar-scrollbar slider:hover, .sidebar-scrollbar slider:focus { - background-color: rgba(203, 196, 207, 0.448); } + background-color: rgba(226, 226, 226, 0.448); } .sidebar-scrollbar slider:active { - background-color: #7a757d; } + background-color: #7a7a7a; } .sidebar-calendar-btn { border-radius: 9999px; @@ -1592,7 +1593,7 @@ tooltip { transition: 300ms cubic-bezier(0.1, 1, 0, 1); min-height: 2.523rem; min-width: 2.523rem; - color: #e7e1e6; } + color: #e2e2e2; } .sidebar-calendar-btn:hover, .sidebar-calendar-btn:focus { @@ -1606,18 +1607,18 @@ tooltip { margin-right: -10.341rem; } .sidebar-calendar-btn-today { - background-color: #d6baff; - color: #3d1c70; } + background-color: #e2e2e2; + color: #000000; } .sidebar-calendar-btn-today:hover, .sidebar-calendar-btn-today:focus { - background-color: rgba(212, 185, 253, 0.93); } + background-color: rgba(224, 224, 224, 0.93); } .sidebar-calendar-btn-today:active { - background-color: rgba(208, 182, 246, 0.79); } + background-color: rgba(219, 219, 219, 0.79); } .sidebar-calendar-btn-othermonth { - color: #837f83; } + color: #727272; } .sidebar-calendar-header { margin: 0.341rem; } @@ -1626,50 +1627,50 @@ tooltip { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 0rem 0.682rem; - background-color: rgba(40, 38, 43, 0.31); - color: #cbc4cf; } + background-color: rgba(18, 18, 18, 0.31); + color: #e2e2e2; } .sidebar-calendar-monthyear-btn:hover, .sidebar-calendar-monthyear-btn:focus { - background-color: rgba(76, 73, 80, 0.3445); - color: #c3bcc7; } + background-color: rgba(64, 64, 64, 0.3445); + color: #d8d8d8; } .sidebar-calendar-monthyear-btn:active { - background-color: #403e44; - color: #b3acb6; } + background-color: #313131; + color: #c3c3c3; } .sidebar-calendar-monthshift-btn { border-radius: 9999px; -gtk-outline-radius: 9999px; min-width: 2.045rem; min-height: 2.045rem; - background-color: rgba(40, 38, 43, 0.31); - color: #cbc4cf; } + background-color: rgba(18, 18, 18, 0.31); + color: #e2e2e2; } .sidebar-calendar-monthshift-btn:hover { - background-color: rgba(76, 73, 80, 0.3445); - color: #c3bcc7; } + background-color: rgba(64, 64, 64, 0.3445); + color: #d8d8d8; } .sidebar-calendar-monthshift-btn:active { - background-color: #403e44; - color: #b3acb6; } + background-color: #313131; + color: #c3c3c3; } .sidebar-selector-tab { border-radius: 0.818rem; -gtk-outline-radius: 0.818rem; transition: 300ms cubic-bezier(0.1, 1, 0, 1); min-height: 2.5rem; - color: #e7e1e6; } + color: #e2e2e2; } .sidebar-selector-tab:hover, .sidebar-selector-tab:focus { - background-color: rgba(101, 98, 105, 0.379); } + background-color: rgba(96, 96, 96, 0.379); } .sidebar-selector-tab:active { - background-color: #514e54; } + background-color: #464646; } .sidebar-selector-tab-active > box > label { - color: #d6baff; } + color: #e2e2e2; } .sidebar-selector-highlight-offset { margin-top: -0.205rem; @@ -1677,14 +1678,14 @@ tooltip { .sidebar-selector-highlight { transition: 180ms ease-in-out; - color: #d6baff; + color: #e2e2e2; min-height: 0.205rem; } .sidebar-todo-item { padding-right: 0.545rem; } .sidebar-todo-item-even { - background-color: rgba(40, 38, 43, 0.1); } + background-color: rgba(18, 18, 18, 0.1); } .sidebar-todo-item-action { border-radius: 9999px; @@ -1693,49 +1694,49 @@ tooltip { .sidebar-todo-item-action:hover, .sidebar-todo-item-action:focus { - background-color: rgba(70, 67, 72, 0.31); } + background-color: rgba(47, 47, 47, 0.31); } .sidebar-todo-item-action:active { - background-color: rgba(100, 97, 101, 0.31); } + background-color: rgba(80, 80, 80, 0.31); } .sidebar-todo-crosser { transition: margin 200ms cubic-bezier(0.1, 1, 0, 1), background-color 0ms; min-width: 0rem; } .sidebar-todo-crosser-crossed { - background-color: #e7e1e6; } + background-color: #e2e2e2; } .sidebar-todo-crosser-removed { - background-color: #ffb4a9; } + background-color: #e2e2e2; } .sidebar-clipboard-item { border-radius: 0.818rem; min-height: 2.045rem; padding: 0.341rem; - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .sidebar-clipboard-item:hover, .sidebar-clipboard-item:focus { - background-color: #5b5368; } + background-color: #434343; } .sidebar-clipboard-item:active { - background-color: #6b6278; } + background-color: #545454; } .sidebar-todo-new { border-radius: 9999px; -gtk-outline-radius: 9999px; - color: #eadef7; + color: #e2e2e2; margin: 0.341rem; padding: 0.205rem 0.545rem; - border: 0.068rem solid #e7e1e6; } + border: 0.068rem solid #e2e2e2; } .sidebar-todo-new:hover, .sidebar-todo-new:focus { - background-color: #50485d; } + background-color: #363636; } .sidebar-todo-new:active { - background-color: #6b6278; } + background-color: #545454; } .sidebar-todo-add { border-radius: 9999px; @@ -1743,15 +1744,15 @@ tooltip { transition: 300ms cubic-bezier(0.1, 1, 0, 1); min-width: 1.705rem; min-height: 1.705rem; - color: #eadef7; - border: 0.068rem solid #e7e1e6; } + color: #e2e2e2; + border: 0.068rem solid #e2e2e2; } .sidebar-todo-add:hover, .sidebar-todo-add:focus { - background-color: #50485d; } + background-color: #363636; } .sidebar-todo-add:active { - background-color: #6b6278; } + background-color: #545454; } .sidebar-todo-add-available { transition: 300ms cubic-bezier(0.1, 1, 0, 1); @@ -1759,44 +1760,44 @@ tooltip { -gtk-outline-radius: 9999px; min-width: 1.705rem; min-height: 1.705rem; - background-color: #d6baff; - color: #3d1c70; - border: 0.068rem solid #d6baff; } + background-color: #e2e2e2; + color: #000000; + border: 0.068rem solid #e2e2e2; } .sidebar-todo-add-available:hover, .sidebar-todo-add-available:focus { - background-color: #d1b5fb; } + background-color: #dbdbdb; } .sidebar-todo-add-available:active { - background-color: #b79ae2; } + background-color: #b5b5b5; } .sidebar-todo-entry { transition: 300ms cubic-bezier(0.1, 1, 0, 1); border-radius: 0.818rem; -gtk-outline-radius: 0.818rem; - background-color: #28262b; - color: #cbc4cf; - caret-color: #cbc4cf; + background-color: #121212; + color: #e2e2e2; + caret-color: #e2e2e2; margin: 0rem 0.341rem; min-height: 1.773rem; min-width: 0rem; padding: 0.205rem 0.682rem; - border: 0.068rem solid #7a757d; } + border: 0.068rem solid #7a7a7a; } .sidebar-todo-entry:focus { - border: 0.068rem solid #bbb4bf; } + border: 0.068rem solid #cdcdcd; } .sidebar-module { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; padding: 0.341rem; - background-color: rgba(30, 28, 32, 0.31); } + background-color: rgba(2, 2, 2, 0.31); } .sidebar-module-btn-arrow { border-radius: 9999px; -gtk-outline-radius: 9999px; font-family: 'Material Symbols Rounded', 'Material Symbols Outlined', 'Material Symbols Sharp'; - background-color: rgba(40, 38, 43, 0.31); + background-color: rgba(18, 18, 18, 0.31); min-width: 1.705rem; min-height: 1.705rem; } @@ -1804,17 +1805,17 @@ tooltip { border-radius: 9999px; -gtk-outline-radius: 9999px; padding: 0.341rem; - background-color: #1e1c20; } + background-color: #020202; } .sidebar-chat-apiswitcher-icon { border-radius: 9999px; -gtk-outline-radius: 9999px; min-width: 2.182rem; min-height: 2.182rem; - color: #e7e1e6; } + color: #e2e2e2; } .sidebar-chat-apiswitcher-icon-enabled { - color: #d6baff; } + color: #e2e2e2; } .sidebar-chat-viewport { transition: 300ms cubic-bezier(0.1, 1, 0, 1); @@ -1823,12 +1824,12 @@ tooltip { .sidebar-chat-textarea { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; - border: 0.068rem solid #69656d; + border: 0.068rem solid #656565; padding: 0.682rem; } .sidebar-chat-entry { - color: #cbc4cf; - caret-color: #cbc4cf; + color: #e2e2e2; + caret-color: #e2e2e2; min-height: 1.773rem; min-width: 0rem; } @@ -1837,25 +1838,25 @@ tooltip { min-width: 1.705rem; min-height: 1.705rem; border-radius: 0.478rem; - background-color: #69656d; } + background-color: #656565; } .sidebar-chat-send:hover, .sidebar-chat-send:focus { - background-color: #6d6971; } + background-color: dimgray; } .sidebar-chat-send:active { - background-color: #837d89; } + background-color: #7e7e7e; } .sidebar-chat-send-available { - background-color: #d6baff; - color: #3d1c70; } + background-color: #e2e2e2; + color: #000000; } .sidebar-chat-send-available:hover, .sidebar-chat-send-available:focus { - background-color: #d1b5fb; } + background-color: #dbdbdb; } .sidebar-chat-send-available:active { - background-color: #b79ae2; } + background-color: #b5b5b5; } .sidebar-chat-message { margin: 0.682rem; } @@ -1866,13 +1867,13 @@ tooltip { min-width: 0.136rem; } .sidebar-chat-indicator-user { - background-color: #e7e1e6; } + background-color: #e2e2e2; } .sidebar-chat-indicator-bot { - background-color: #d6baff; } + background-color: #e2e2e2; } .sidebar-chat-indicator-System { - background-color: #cec2db; } + background-color: #e2e2e2; } .sidebar-chat-name { font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif; @@ -1892,19 +1893,19 @@ tooltip { .sidebar-chat-codeblock { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; - background-color: rgba(73, 70, 76, 0.31); - color: #cbc4cf; + background-color: rgba(60, 60, 60, 0.31); + color: #e2e2e2; margin: 0rem 0.682rem; - border: 0.068rem solid rgba(234, 222, 247, 0.07); } + border: 0.068rem solid rgba(226, 226, 226, 0.07); } .sidebar-chat-codeblock-topbar { font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; margin: 0.273rem; margin-bottom: 0rem; - background-color: #4b4358; - color: #eadef7; + background-color: #313131; + color: #e2e2e2; border-radius: 0.886rem; - border: 0.068rem solid #5b5368; + border: 0.068rem solid #434343; border-top-left-radius: 0.886rem; border-top-right-radius: 0.886rem; padding: 0.341rem 0.477rem; } @@ -1921,10 +1922,10 @@ tooltip { .sidebar-chat-codeblock-topbar-btn:hover, .sidebar-chat-codeblock-topbar-btn:focus { - background-color: #6b6278; } + background-color: #545454; } .sidebar-chat-codeblock-topbar-btn:active { - background-color: #8b8198; } + background-color: #787878; } .sidebar-chat-codeblock-code { font-family: 'JetBrains Mono NF', 'JetBrains Mono Nerd Font', 'JetBrains Mono NL', 'SpaceMono NF', 'SpaceMono Nerd Font', monospace; @@ -1932,7 +1933,7 @@ tooltip { .sidebar-chat-divider { min-height: 1px; - background-color: #69656d; + background-color: #656565; margin: 0rem 0.545rem; } .sidebar-chat-welcome-txt { @@ -1963,19 +1964,19 @@ tooltip { padding: 0.341rem 0.477rem; } .sidebar-chat-chip-action { - border: 0.068rem solid #69656d; } + border: 0.068rem solid #656565; } .sidebar-chat-chip-action:hover, .sidebar-chat-chip-action:focus { - background-color: #69656d; } + background-color: #656565; } .sidebar-chat-chip-action:active { - background-color: #86828a; - color: #565259; } + background-color: #8b8b8b; + color: #4c4c4c; } .sidebar-chat-chip-action-active { - color: #69656d; - border: 0.068rem solid #69656d; } + color: #656565; + border: 0.068rem solid #656565; } .sidebar-pin { border-radius: 0.818rem; @@ -1983,47 +1984,47 @@ tooltip { transition: 300ms cubic-bezier(0.1, 1, 0, 1); min-height: 2.386rem; min-width: 2.386rem; - color: #e7e1e6; } + color: #e2e2e2; } .sidebar-pin:hover, .sidebar-pin:focus { - background-color: rgba(101, 98, 105, 0.379); } + background-color: rgba(96, 96, 96, 0.379); } .sidebar-pin:active { - background-color: #514e54; } + background-color: #464646; } .sidebar-pin-enabled { - background-color: #d6baff; } + background-color: #e2e2e2; } .sidebar-pin-enabled label { - color: #3d1c70; } + color: #000000; } .sidebar-pin-enabled:hover, .sidebar-pin-enabled:focus { - background-color: #c7aaf1; } + background-color: #cbcbcb; } .sidebar-pin-enabled:active { - background-color: #b79ae2; } + background-color: #b5b5b5; } .session-bg { margin-top: -2.727rem; - background-color: rgba(15, 13, 16, 0.64); } + background-color: rgba(7, 7, 7, 0.64); } .session-button { border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; min-width: 8.182rem; min-height: 8.182rem; - background-color: #28262b; - color: #cbc4cf; + background-color: #121212; + color: #e2e2e2; font-size: 3rem; } .session-button-focused { - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .session-button-desc { - background-color: #232126; - color: #d9d3db; + background-color: #0a0a0a; + color: #e2e2e2; border-bottom-left-radius: 1.705rem; border-bottom-right-radius: 1.705rem; padding: 0.205rem 0.341rem; @@ -2034,31 +2035,31 @@ tooltip { -gtk-outline-radius: 1.705rem; min-width: 8.182rem; min-height: 5.455rem; - background-color: #28262b; - color: #cbc4cf; + background-color: #121212; + color: #e2e2e2; font-size: 3rem; } .notif-low { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; - background-color: rgba(40, 38, 43, 0.45); - color: #cbc4cf; + background-color: rgba(18, 18, 18, 0.45); + color: #e2e2e2; padding: 0.818rem; padding-right: 1.363rem; } .notif-normal { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; - background-color: rgba(40, 38, 43, 0.45); - color: #cbc4cf; + background-color: rgba(18, 18, 18, 0.45); + color: #e2e2e2; padding: 0.818rem; padding-right: 1.363rem; } .notif-critical { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; - background-color: #4b4358; - color: #eadef7; + background-color: #313131; + color: #e2e2e2; padding: 0.818rem; padding-right: 1.363rem; } @@ -2066,8 +2067,8 @@ tooltip { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; min-width: 30.682rem; - background-color: #0f0d10; - color: #cbc4cf; + background-color: #070707; + color: #e2e2e2; padding: 0.818rem; padding-right: 1.363rem; } @@ -2075,8 +2076,8 @@ tooltip { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; min-width: 30.682rem; - background-color: #0f0d10; - color: #cbc4cf; + background-color: #070707; + color: #e2e2e2; padding: 0.818rem; padding-right: 1.363rem; } @@ -2084,19 +2085,19 @@ tooltip { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; min-width: 30.682rem; - background-color: #4b4358; - color: #eadef7; + background-color: #313131; + color: #e2e2e2; padding: 0.818rem; padding-right: 1.363rem; } .notif-body-low { - color: #959099; } + color: #9d9d9d; } .notif-body-normal { - color: #959099; } + color: #9d9d9d; } .notif-body-critical { - color: #b6abc3; } + color: #a8a8a8; } .notif-icon { border-radius: 9999px; @@ -2105,20 +2106,20 @@ tooltip { min-height: 3.409rem; } .notif-icon-material { - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .notif-icon-material-low { - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .notif-icon-material-normal { - background-color: #4b4358; - color: #eadef7; } + background-color: #313131; + color: #e2e2e2; } .notif-icon-material-critical { - background-color: #eadef7; - color: #4b4358; } + background-color: #e2e2e2; + color: #313131; } .notif-expand-btn { border-radius: 1.159rem; @@ -2148,7 +2149,7 @@ tooltip { .osd-notif { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; - background-color: rgba(15, 13, 16, 0.46); + background-color: rgba(7, 7, 7, 0.46); min-width: 30.682rem; } .notif-circprog-low { @@ -2156,21 +2157,21 @@ tooltip { min-width: 0.136rem; min-height: 3.409rem; padding: 0rem; - color: #eadef7; } + color: #e2e2e2; } .notif-circprog-normal { transition: 0ms linear; min-width: 0.136rem; min-height: 3.409rem; padding: 0rem; - color: #eadef7; } + color: #e2e2e2; } .notif-circprog-critical { transition: 0ms linear; min-width: 0.136rem; min-height: 3.409rem; padding: 0rem; - color: #4b4358; } + color: #313131; } .osd-music { transition: 300ms cubic-bezier(0.1, 1, 0, 1); @@ -2180,9 +2181,9 @@ tooltip { border-radius: 1.159rem; -gtk-outline-radius: 1.159rem; min-width: 29.659rem; - background-color: #0f0d10; + background-color: #070707; padding: 0rem 1.023rem; - background: linear-gradient(127deg, rgba(32, 30, 35, 0.7), rgba(32, 30, 35, 0.55) 70.71%), linear-gradient(217deg, rgba(73, 69, 78, 0.7), rgba(73, 69, 78, 0.55) 70.71%), radial-gradient(circle at 0% 100%, #4b4358 13%, rgba(0, 0, 0, 0) 100%), linear-gradient(336deg, rgba(75, 67, 88, 0.7), rgba(75, 67, 88, 0.55) 70.71%), linear-gradient(#0f0d10, #0f0d10); } + background: linear-gradient(127deg, rgba(15, 15, 15, 0.7), rgba(15, 15, 15, 0.55) 70.71%), linear-gradient(217deg, rgba(32, 32, 32, 0.7), rgba(32, 32, 32, 0.55) 70.71%), radial-gradient(circle at 0% 100%, #313131 13%, rgba(0, 0, 0, 0) 100%), linear-gradient(336deg, rgba(49, 49, 49, 0.7), rgba(49, 49, 49, 0.55) 70.71%), linear-gradient(#070707, #070707); } .osd-music-cover-fallback { transition: 300ms cubic-bezier(0.1, 1, 0, 1); @@ -2190,8 +2191,8 @@ tooltip { -gtk-outline-radius: 0.818rem; min-width: 7.5rem; min-height: 7.5rem; - background-color: rgba(30, 28, 32, 0.31); - color: #d7d1d7; } + background-color: rgba(2, 2, 2, 0.31); + color: #cfcfcf; } .osd-music-cover { border-radius: 0.818rem; @@ -2217,13 +2218,13 @@ tooltip { transition: 300ms cubic-bezier(0.1, 1, 0, 1); font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif; font-size: 1.364rem; - color: #d7d1d7; } + color: #cfcfcf; } .osd-music-artists { transition: 300ms cubic-bezier(0.1, 1, 0, 1); font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 0.955rem; - color: rgba(202, 196, 203, 0.9); } + color: rgba(193, 193, 193, 0.9); } .osd-music-pill { transition: 300ms cubic-bezier(0.1, 1, 0, 1); @@ -2232,8 +2233,8 @@ tooltip { font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif; min-width: 1.833rem; padding: 0.273rem 0.682rem; - background-color: rgba(50, 46, 55, 0.5); - color: #d7d1d7; } + background-color: rgba(26, 26, 26, 0.5); + color: #cfcfcf; } .osd-music-controls { transition: 300ms cubic-bezier(0.1, 1, 0, 1); @@ -2242,8 +2243,8 @@ tooltip { font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif; min-width: 1.833rem; padding: 0.205rem; - background-color: rgba(50, 46, 55, 0.5); - color: #d7d1d7; } + background-color: rgba(26, 26, 26, 0.5); + color: #cfcfcf; } .osd-music-controlbtn { transition: 300ms cubic-bezier(0.1, 1, 0, 1); @@ -2254,10 +2255,10 @@ tooltip { .osd-music-controlbtn:hover, .osd-music-controlbtn:focus { - background-color: rgba(91, 87, 95, 0.55); } + background-color: rgba(71, 71, 71, 0.55); } .osd-music-controlbtn:active { - background-color: rgba(107, 102, 110, 0.575); } + background-color: rgba(89, 89, 89, 0.575); } .osd-music-controlbtn-txt { transition: 300ms cubic-bezier(0.1, 1, 0, 1); @@ -2271,15 +2272,15 @@ tooltip { min-width: 0.409rem; min-height: 3.068rem; padding: 0.273rem; - color: #d7d1d7; } + color: #cfcfcf; } .osd-music-playstate { transition: 300ms cubic-bezier(0.1, 1, 0, 1); min-height: 3.068rem; min-width: 3.068rem; border-radius: 10rem; - background-color: rgba(50, 46, 55, 0.5); - color: #d7d1d7; } + background-color: rgba(26, 26, 26, 0.5); + color: #cfcfcf; } .osd-music-playstate-btn > label { transition: 50ms cubic-bezier(0.05, 0.7, 0.1, 1); diff --git a/.config/ags/widgets/bar/leftspace.js b/.config/ags/widgets/bar/leftspace.js index 42002be4a..16df27325 100644 --- a/.config/ags/widgets/bar/leftspace.js +++ b/.config/ags/widgets/bar/leftspace.js @@ -74,18 +74,16 @@ export const ModuleLeftSpace = () => Widget.EventBox({ Widget.Label({ xalign: 0, className: 'txt-smaller bar-topdesc txt', - connections: [[Hyprland.active.client, label => { // Hyprland.active.client + setup: (self) => self.hook(Hyprland.active.client, label => { // Hyprland.active.client label.label = Hyprland.active.client._class.length === 0 ? 'Desktop' : Hyprland.active.client._class; - }]], + }), }), Widget.Label({ xalign: 0, className: 'txt txt-smallie', - connections: [ - [Hyprland.active.client, label => { // Hyprland.active.client - label.label = Hyprland.active.client._title.length === 0 ? `Workspace ${Hyprland.active.workspace.id}` : truncateTitle(Hyprland.active.client._title); - }] - ], + setup: (self) => self.hook(Hyprland.active.client, label => { // Hyprland.active.client + label.label = Hyprland.active.client._title.length === 0 ? `Workspace ${Hyprland.active.workspace.id}` : truncateTitle(Hyprland.active.client._title); + }), }) ] }) diff --git a/.config/ags/widgets/bar/rightspace.js b/.config/ags/widgets/bar/rightspace.js index 713935880..9a7687ff4 100644 --- a/.config/ags/widgets/bar/rightspace.js +++ b/.config/ags/widgets/bar/rightspace.js @@ -11,11 +11,11 @@ export const ModuleRightSpace = () => { const barTray = Tray(); const barStatusIcons = StatusIcons({ className: 'bar-statusicons', - connections: [[App, (self, currentName, visible) => { + setup: (self) => self.hook(App, (self, currentName, visible) => { if (currentName === 'sideright') { self.toggleClassName('bar-statusicons-active', visible); } - }]], + }), }); return Widget.EventBox({ diff --git a/.config/ags/widgets/bar/system.js b/.config/ags/widgets/bar/system.js index 12e43b643..eae0a1851 100644 --- a/.config/ags/widgets/bar/system.js +++ b/.config/ags/widgets/bar/system.js @@ -14,9 +14,10 @@ const BarClock = () => Widget.Box({ children: [ Widget.Label({ className: 'bar-clock', - connections: [[5000, label => { + label: GLib.DateTime.new_now_local().format("%H:%M"), + setup: (self) => self.poll(5000, label => { label.label = GLib.DateTime.new_now_local().format("%H:%M"); - }]], + }), }), Widget.Label({ className: 'txt-norm txt', @@ -24,9 +25,10 @@ const BarClock = () => Widget.Box({ }), Widget.Label({ className: 'txt-smallie txt', - connections: [[5000, label => { + label: GLib.DateTime.new_now_local().format("%A, %d/%m"), + setup: (self) => self.poll(5000, label => { label.label = GLib.DateTime.new_now_local().format("%A, %d/%m"); - }]], + }), }), ], }); @@ -40,13 +42,13 @@ const BarBattery = () => { Widget.ProgressBar({ // Progress vpack: 'center', hexpand: true, className: 'bar-prog-batt', - connections: [[5000, (progress) => execAsync(['bash', '-c', command]) + setup: (self) => self.poll(5000, (progress) => execAsync(['bash', '-c', command]) .then((output) => { progress.value = Number(output) / 100; progress.tooltipText = `${name}: ${Number(output)}%` }) .catch(print) - ]], + ), }), ] }); @@ -54,28 +56,28 @@ const BarBattery = () => { vpack: 'center', hexpand: true, className: 'spacing-h-5 bar-batt', - connections: [[Battery, box => { + setup: (self) => self.hook(Battery, box => { box.toggleClassName('bar-batt-low', Battery.percent <= BATTERY_LOW); box.toggleClassName('bar-batt-full', Battery.charged); - }]], + }), children: [ MaterialIcon('settings_heart', 'small'), Widget.Label({ // Percentage className: 'bar-batt-percentage', - connections: [[Battery, label => { + setup: (self) => self.hook(Battery, label => { label.label = `${Battery.percent}`; - }]], + }), }), Widget.ProgressBar({ // Progress vpack: 'center', hexpand: true, className: 'bar-prog-batt', - connections: [[Battery, progress => { + setup: (self) => self.hook(Battery, progress => { progress.value = Math.abs(Battery.percent / 100); // battery could be initially negative wtf progress.toggleClassName('bar-prog-batt-low', Battery.percent <= BATTERY_LOW); progress.toggleClassName('bar-prog-batt-full', Battery.charged); batteryWidget.tooltipText = `Battery: ${Battery.percent}%` - }]], + }), }), Widget.Revealer({ // A dot for charging state transitionDuration: 150, @@ -87,24 +89,24 @@ const BarBattery = () => { Widget.Box({ vpack: 'center', className: 'bar-batt-chargestate-charging-smaller', - connections: [[Battery, box => { + setup: (self) => self.hook(Battery, box => { box.toggleClassName('bar-batt-chargestate-low', Battery.percent <= BATTERY_LOW); box.toggleClassName('bar-batt-chargestate-full', Battery.charged); - }]], + }), }), Widget.Box({ vpack: 'center', className: 'bar-batt-chargestate-charging', - connections: [[Battery, box => { + setup: (self) => self.hook(Battery, box => { box.toggleClassName('bar-batt-chargestate-low', Battery.percent <= BATTERY_LOW); box.toggleClassName('bar-batt-chargestate-full', Battery.charged); - }]], + }), }), ] }), - connections: [[Battery, revealer => { + setup: (self) => self.hook(Battery, revealer => { revealer.revealChild = Battery.charging; - }]], + }), }), ], }); diff --git a/.config/ags/widgets/bar/tray.js b/.config/ags/widgets/bar/tray.js index 885bec07f..98ca3681d 100644 --- a/.config/ags/widgets/bar/tray.js +++ b/.config/ags/widgets/bar/tray.js @@ -51,10 +51,10 @@ export const Tray = (props = {}) => { trayRevealer.revealChild = false; }], ], - connections: [ - [SystemTray, (box, id) => box._onAdded(box, id), 'added'], - [SystemTray, (box, id) => box._onRemoved(box, id), 'removed'], - ], + setup: (self) => self + .hook(SystemTray, (box, id) => box._onAdded(box, id), 'added') + .hook(SystemTray, (box, id) => box._onRemoved(box, id), 'removed') + , }); const trayRevealer = Widget.Revealer({ revealChild: false, diff --git a/.config/ags/widgets/bar/workspaces.js b/.config/ags/widgets/bar/workspaces.js index d1355e461..6719f5fc6 100644 --- a/.config/ags/widgets/bar/workspaces.js +++ b/.config/ags/widgets/bar/workspaces.js @@ -15,15 +15,13 @@ const activeWorkspaceIndicator = Widget.Box({ vpack: 'center', hpack: 'start', className: 'bar-ws-active-box', - connections: [ - [Hyprland.active.workspace, (box) => { - const ws = Hyprland.active.workspace.id; - box.setCss(` + setup: (self) => self.hook(Hyprland.active.workspace, (box) => { + const ws = Hyprland.active.workspace.id; + box.setCss(` margin-left: ${1.774 * (ws - 1) + 0.068}rem; `); - lastWorkspace = ws; - }], - ], + lastWorkspace = ws; + }), children: [ Widget.Label({ vpack: 'center', @@ -70,26 +68,24 @@ export const ModuleWorkspaces = () => Widget.EventBox({ className: 'bar-ws txt', }), })), - connections: [ - [Hyprland, (box) => { - // console.log('update'); - const kids = box.children; - for (let i = 0; i < kids.length; i++) { - const child = kids[i]; - child.child.toggleClassName('bar-ws-occupied', false); - child.child.toggleClassName('bar-ws-occupied-left', false); - child.child.toggleClassName('bar-ws-occupied-right', false); - child.child.toggleClassName('bar-ws-occupied-left-right', false); - } + setup: (self) => self.hook(Hyprland, (box) => { + // console.log('update'); + const kids = box.children; + for (let i = 0; i < kids.length; i++) { + const child = kids[i]; + child.child.toggleClassName('bar-ws-occupied', false); + child.child.toggleClassName('bar-ws-occupied-left', false); + child.child.toggleClassName('bar-ws-occupied-right', false); + child.child.toggleClassName('bar-ws-occupied-left-right', false); + } - const occupied = Array.from({ length: NUM_OF_WORKSPACES }, (_, i) => Hyprland.getWorkspace(i + 1)?.windows > 0); - for (let i = 0; i < occupied.length; i++) { - if (!occupied[i]) continue; - const child = kids[i]; - child.child.toggleClassName(`bar-ws-occupied${!occupied[i - 1] ? '-left' : ''}${!occupied[i + 1] ? '-right' : ''}`, true); - } - }, 'notify::workspaces'], - ], + const occupied = Array.from({ length: NUM_OF_WORKSPACES }, (_, i) => Hyprland.getWorkspace(i + 1)?.windows > 0); + for (let i = 0; i < occupied.length; i++) { + if (!occupied[i]) continue; + const child = kids[i]; + child.child.toggleClassName(`bar-ws-occupied${!occupied[i - 1] ? '-left' : ''}${!occupied[i + 1] ? '-right' : ''}`, true); + } + }, 'notify::workspaces'), }), overlays: [ activeWorkspaceIndicator, diff --git a/.config/ags/widgets/desktopbackground/timeandlaunches.js b/.config/ags/widgets/desktopbackground/timeandlaunches.js index ec3fe0b0e..e25e14a58 100644 --- a/.config/ags/widgets/desktopbackground/timeandlaunches.js +++ b/.config/ags/widgets/desktopbackground/timeandlaunches.js @@ -14,16 +14,18 @@ const TimeAndDate = () => Box({ Label({ className: 'bg-time-clock', xalign: 0, - connections: [[5000, label => { + label: GLib.DateTime.new_now_local().format("%H:%M"), + setup: (self) => self.poll(5000, label => { label.label = GLib.DateTime.new_now_local().format("%H:%M"); - }]], + }), }), Label({ className: 'bg-time-date', xalign: 0, - connections: [[5000, label => { + label: GLib.DateTime.new_now_local().format("%A, %d/%m/%Y"), + setup: (self) => self.poll(5000, label => { label.label = GLib.DateTime.new_now_local().format("%A, %d/%m/%Y"); - }]], + }), }), ] }) @@ -46,7 +48,7 @@ const QuickLaunches = () => Box({ }, className: 'bg-quicklaunch-btn', child: Label({ - label: `${ item["name"]}`, + label: `${item["name"]}`, }), setup: (self) => { setupCursorHover(self); diff --git a/.config/ags/widgets/dock/dock.js b/.config/ags/widgets/dock/dock.js index f675bd246..4714d268b 100644 --- a/.config/ags/widgets/dock/dock.js +++ b/.config/ags/widgets/dock/dock.js @@ -138,14 +138,11 @@ const Taskbar = () => Widget.Box({ }) }], ], - connections: [ - // [Hyprland, (box) => box._update(box)], - [Hyprland, (box, address) => box._add(box, address), 'client-added'], - [Hyprland, (box, address) => box._remove(box, address), 'client-removed'], - ], setup: (self) => { + self.hook(Hyprland, (box, address) => box._add(box, address), 'client-added') + .hook(Hyprland, (box, address) => box._remove(box, address), 'client-removed') Utils.timeout(100, () => self._update(self)); - } + }, }); const PinnedApps = () => Widget.Box({ @@ -166,18 +163,18 @@ const PinnedApps = () => Widget.Box({ app.launch(); }, onMiddleClick: () => app.launch(), + tooltipText: app.name, setup: (self) => { self.revealChild = true; - }, - tooltipText: app.name, - connections: [[Hyprland, button => { - const running = Hyprland.clients - .find(client => client.class.toLowerCase().includes(term)) || false; + self.hook(Hyprland, button => { + const running = Hyprland.clients + .find(client => client.class.toLowerCase().includes(term)) || false; - button.toggleClassName('notrunning', !running); - button.toggleClassName('focused', Hyprland.active.client.address == running.address); - button.set_tooltip_text(running ? running.title : app.name); - }, 'notify::clients']], + button.toggleClassName('notrunning', !running); + button.toggleClassName('focused', Hyprland.active.client.address == running.address); + button.set_tooltip_text(running ? running.title : app.name); + }, 'notify::clients') + }, }) newButton.revealChild = true; return newButton; @@ -238,13 +235,13 @@ export default () => { transition: 'slide_up', transitionDuration: 200, child: dockContent, - connections: [ - // [Hyprland, (self) => self._updateShow(self)], - // [Hyprland.active.workspace, (self) => self._updateShow(self)], - // [Hyprland.active.client, (self) => self._updateShow(self)], - // [Hyprland, (self) => self._updateShow(self), 'client-added'], - // [Hyprland, (self) => self._updateShow(self), 'client-removed'], - ], + // setup: (self) => self + // .hook(Hyprland, (self) => self._updateShow(self)) + // .hook(Hyprland.active.workspace, (self) => self._updateShow(self)) + // .hook(Hyprland.active.client, (self) => self._updateShow(self)) + // .hook(Hyprland, (self) => self._updateShow(self), 'client-added') + // .hook(Hyprland, (self) => self._updateShow(self), 'client-removed') + // , }) return EventBox({ onHover: () => { diff --git a/.config/ags/widgets/indicators/colorscheme.js b/.config/ags/widgets/indicators/colorscheme.js index 18bd51f8c..02cde92a0 100644 --- a/.config/ags/widgets/indicators/colorscheme.js +++ b/.config/ags/widgets/indicators/colorscheme.js @@ -50,9 +50,7 @@ export default () => Widget.Revealer({ transition: 'slide_down', transitionDuration: 200, child: colorschemeContent, - connections: [ - [showColorScheme, (revealer) => { - revealer.revealChild = showColorScheme.value; - }], - ], + setup: (self) => self.hook(showColorScheme, (revealer) => { + revealer.revealChild = showColorScheme.value; + }), }) diff --git a/.config/ags/widgets/indicators/notificationpopups.js b/.config/ags/widgets/indicators/notificationpopups.js index fea31bafd..84ac48e97 100644 --- a/.config/ags/widgets/indicators/notificationpopups.js +++ b/.config/ags/widgets/indicators/notificationpopups.js @@ -30,12 +30,10 @@ const PopupNotification = (notifObject) => Widget.Box({ const naiveNotifPopupList = Widget.Box({ vertical: true, className: 'spacing-v-5', - connections: [ - [Notifications, (box) => { - box.children = Notifications.popups.reverse() - .map(notifItem => PopupNotification(notifItem)); - }], - ], + setup: (self) => self.hook(Notifications, (box) => { + box.children = Notifications.popups.reverse() + .map(notifItem => PopupNotification(notifItem)); + }), }) const notifPopupList = Box({ @@ -72,11 +70,11 @@ const notifPopupList = Box({ // box.children = Array.from(box._map.values()).reverse(); }], ], - connections: [ - [Notifications, (box, id) => box._notify(box, id), 'notified'], - [Notifications, (box, id) => box._dismiss(box, id), 'dismissed'], - [Notifications, (box, id) => box._dismiss(box, id, true), 'closed'], - ], + setup: (self) => self + .hook(Notifications, (box, id) => box._notify(box, id), 'notified') + .hook(Notifications, (box, id) => box._dismiss(box, id), 'dismissed') + .hook(Notifications, (box, id) => box._dismiss(box, id, true), 'closed') + , }); export default () => notifPopupList; \ No newline at end of file diff --git a/.config/ags/widgets/onscreenkeyboard/onscreenkeyboard.js b/.config/ags/widgets/onscreenkeyboard/onscreenkeyboard.js index db793eb10..a347408f9 100644 --- a/.config/ags/widgets/onscreenkeyboard/onscreenkeyboard.js +++ b/.config/ags/widgets/onscreenkeyboard/onscreenkeyboard.js @@ -133,11 +133,11 @@ const keyboardWindow = Box({ ], }) ], - connections: [[App, (box, name, visible) => { // Update on open + setup: (self) => self.hook(App, (box, name, visible) => { // Update on open if (name == 'osk' && visible) { keyboardWindow.setCss(`margin-bottom: -0px;`); } - }],], + }), }); const gestureEvBox = EventBox({ child: keyboardWindow }) diff --git a/.config/ags/widgets/sideleft/sideleft.js b/.config/ags/widgets/sideleft/sideleft.js index 12ea47330..a335eb276 100644 --- a/.config/ags/widgets/sideleft/sideleft.js +++ b/.config/ags/widgets/sideleft/sideleft.js @@ -181,8 +181,14 @@ export default () => Box({ } if (contentStack.shown == 'apis') { // If api tab is focused // Automatically focus entry when typing - if (event.get_keyval()[1] >= 32 && event.get_keyval()[1] <= 126 && - widget != chatEntry && event.get_keyval()[1] != Gdk.KEY_space) { + if (( + !(event.get_state()[1] & Gdk.ModifierType.CONTROL_MASK) && + event.get_keyval()[1] >= 32 && event.get_keyval()[1] <= 126 && + widget != chatEntry && event.get_keyval()[1] != Gdk.KEY_space) + || + ((event.get_state()[1] & Gdk.ModifierType.CONTROL_MASK) && + event.get_keyval()[1] === Gdk.KEY_v) + ) { chatEntry.grab_focus(); chatEntry.set_text(chatEntry.text + String.fromCharCode(event.get_keyval()[1])); chatEntry.set_position(-1);