ags: sync

.config/ags/widgets/sideright/calendar.js

@@ -65,12 +65,14 @@ const CalendarWidget = () => {
         }
     });
     const addCalendarChildren = (box, calendarJson) => {
+        const children = box.get_children();
+        for (let i = 0; i < children.length; i++) {
+            const child = children[i];
+            child.destroy();
+        }
         box.children = calendarJson.map((row, i) => Widget.Box({
-            // homogeneous: true,
             className: 'spacing-h-5',
-            children: row.map((day, i) =>
-                CalendarDay(day.day, day.today)
-            )
+            children: row.map((day, i) => CalendarDay(day.day, day.today)),
         }))
     }
     function shiftCalendarXMonths(x) {

.config/ags/widgets/sideright/quicktoggles.js

@@ -29,17 +29,15 @@ export const ToggleIconWifi = (props = {}) => Widget.Button({
 export const ToggleIconBluetooth = (props = {}) => Widget.Button({
     className: 'txt-small sidebar-iconbutton',
     tooltipText: 'Bluetooth | Right-click to configure',
-    onClicked: () => { // Provided service doesn't work hmmm
+    onClicked: () => {
         const status = Bluetooth?.enabled;
-        if (status) {
+        if (status) 
             exec('rfkill block bluetooth');
-        }
-        else {
+        else 
             exec('rfkill unblock bluetooth');
-        }
     },
     onSecondaryClickRelease: () => {
-        execAsync(['bash', '-c', 'XDG_CURRENT_DESKTOP="gnome" gnome-control-center bluetooth', '&']);
+        execAsync(['bash', '-c', 'blueberry &']);
     },
     child: BluetoothIndicator(),
     connections: [
@@ -70,24 +68,28 @@ export const HyprToggleIcon = (icon, name, hyprlandConfigValue, props = {}) => W
     ...props,
 })
 
-export const ModuleNightLight = (props = {}) => Widget.Button({
+export const ModuleNightLight = (props = {}) => Widget.Button({ // TODO: Make this work
+    properties: [
+        ['enabled', false],
+        ['yellowlight', undefined],
+    ],
     className: 'txt-small sidebar-iconbutton',
     tooltipText: 'Night Light',
-    onClicked: (button) => {
-        const shaderPath = JSON.parse(exec('hyprctl -j getoption decoration:screen_shader')).str;
-        if (shaderPath != "[[EMPTY]]" && shaderPath != "") {
-            execAsync(['bash', '-c', `hyprctl keyword decoration:screen_shader ''`]).catch(print);
-            button.toggleClassName('sidebar-button-active', false);
-        }
-        else {
-            execAsync(['bash', '-c', `hyprctl keyword decoration:screen_shader ~/.config/hypr/shaders/extradark.frag`]).catch(print);
-            button.toggleClassName('sidebar-button-active', true);
-        }
+    onClicked: (self) => {
+        self._enabled = !self._enabled;
+        self.toggleClassName('sidebar-button-active', self._enabled);
+        // if (self._enabled) Utils.execAsync(['bash', '-c', 'wlsunset & disown'])
+        if (self._enabled) Utils.execAsync('wlsunset')
+        else Utils.execAsync('pkill wlsunset');
     },
     child: MaterialIcon('nightlight', 'norm'),
-    setup: setupCursorHover,
+    setup: (self) => {
+        setupCursorHover(self);
+        self._enabled = !!exec('pidof wlsunset');
+        self.toggleClassName('sidebar-button-active', self._enabled);
+    },
     ...props,
-})
+});
 
 export const ModuleInvertColors = (props = {}) => Widget.Button({
     className: 'txt-small sidebar-iconbutton',

.config/ags/widgets/sideright/sideright.js

@@ -41,18 +41,18 @@ import { ModuleCalendar } from "./calendar.js";
 const timeRow = Box({
     className: 'spacing-h-5 sidebar-group-invisible-morehorizpad',
     children: [
-        Widget.Label({
-            className: 'txt-title txt',
-            connections: [[5000, label => {
-                label.label = GLib.DateTime.new_now_local().format("%H:%M");
-            }]],
-        }),
+        // Widget.Label({
+        //     className: 'txt-title txt',
+        //     connections: [[5000, label => {
+        //         label.label = GLib.DateTime.new_now_local().format("%H:%M");
+        //     }]],
+        // }),
         Widget.Label({
             hpack: 'center',
             className: 'txt-small txt',
             connections: [[5000, label => {
                 execAsync(['bash', '-c', `uptime -p | sed -e 's/up //;s/ hours,/h/;s/ minutes/m/'`]).then(upTimeString => {
-                    label.label = `• up: ${upTimeString}`;
+                    label.label = `System uptime: ${upTimeString}`;
                 }).catch(print);
             }]],
         }),
@@ -81,6 +81,7 @@ const togglesBox = Widget.Box({
 export default () => Box({
     vexpand: true,
     hexpand: true,
+    css: 'min-width: 2px;',
     children: [
         EventBox({
             onPrimaryClick: () => App.closeWindow('sideright'),