should add multimonitor support

.config/ags/widgets/indicators/indicatorvalues.js

@@ -1,7 +1,7 @@
 // This file is for brightness/volume indicators
 import Widget from 'resource:///com/github/Aylur/ags/widget.js';
 import Audio from 'resource:///com/github/Aylur/ags/service/audio.js';
-const { Box, Label, ProgressBar, Revealer } = Widget;
+const { Box, Label, ProgressBar } = Widget;
 import { MarginRevealer } from '../../lib/advancedwidgets.js';
 import Brightness from '../../services/brightness.js';
 import Indicator from '../../services/indicator.js';
@@ -12,7 +12,7 @@ const OsdValue = (name, labelSetup, progressSetup, props = {}) => {
         className: 'osd-label',
         label: `${name}`,
     });
-    const valueNumber =Label({
+    const valueNumber = Label({
         hexpand: false, className: 'osd-value-txt',
         setup: labelSetup,
     });
@@ -44,51 +44,44 @@ const OsdValue = (name, labelSetup, progressSetup, props = {}) => {
     });
 }
 
-const brightnessIndicator = OsdValue('Brightness',
-    (self) => self
-        .hook(Brightness, self => {
+export default () => {
+    const brightnessIndicator = OsdValue('Brightness',
+        (self) => self.hook(Brightness, self => {
             self.label = `${Math.round(Brightness.screen_value * 100)}`;
-        }, 'notify::screen-value')
-    ,
-    (self) => self
-        .hook(Brightness, (progress) => {
+        }, 'notify::screen-value'),
+        (self) => self.hook(Brightness, (progress) => {
             const updateValue = Brightness.screen_value;
             progress.value = updateValue;
-        }, 'notify::screen-value')
-    ,
-)
+        }, 'notify::screen-value'),
+    )
 
-const volumeIndicator = OsdValue('Volume',
-    (self) => self
-        .hook(Audio, (label) => {
+    const volumeIndicator = OsdValue('Volume',
+        (self) => self.hook(Audio, (label) => {
             label.label = `${Math.round(Audio.speaker?.volume * 100)}`;
-        })
-    ,
-    (self) => self
-        .hook(Audio, (progress) => {
+        }),
+        (self) => self.hook(Audio, (progress) => {
             const updateValue = Audio.speaker?.volume;
             if (!isNaN(updateValue)) progress.value = updateValue;
+        }),
+    );
+    return MarginRevealer({
+        transition: 'slide_down',
+        showClass: 'osd-show',
+        hideClass: 'osd-hide',
+        extraSetup: (self) => self
+            .hook(Indicator, (revealer, value) => {
+                if (value > -1) revealer.attribute.show();
+                else revealer.attribute.hide();
+            }, 'popup')
+        ,
+        child: Box({
+            hpack: 'center',
+            vertical: false,
+            className: 'spacing-h--10',
+            children: [
+                brightnessIndicator,
+                volumeIndicator,
+            ]
         })
-    ,
-);
-
-export default () => MarginRevealer({
-    transition: 'slide_down',
-    showClass: 'osd-show',
-    hideClass: 'osd-hide',
-    extraSetup: (self) => self
-        .hook(Indicator, (revealer, value) => {
-            if (value > -1) revealer.attribute.show();
-            else revealer.attribute.hide();
-        }, 'popup')
-    ,
-    child: Box({
-        hpack: 'center',
-        vertical: false,
-        className: 'spacing-h--10',
-        children: [
-            brightnessIndicator,
-            volumeIndicator,
-        ]
-    })
-});
+    });
+}

.config/ags/widgets/indicators/main.js

@@ -5,7 +5,7 @@ import MusicControls from './musiccontrols.js';
 import ColorScheme from './colorscheme.js';
 import NotificationPopups from './notificationpopups.js';
 
-export default (monitor) => Widget.Window({
+export default (monitor = 0) => Widget.Window({
     name: `indicator${monitor}`,
     monitor,
     className: 'indicator',

.config/ags/widgets/indicators/musiccontrols.js

@@ -32,17 +32,13 @@ function isRealPlayer(player) {
     );
 }
 
-export const getPlayer = (name = PREFERRED_PLAYER) => {
-    return Mpris.getPlayer(name) || Mpris.players[0] || null;
-}
-
+export const getPlayer = (name = PREFERRED_PLAYER) => Mpris.getPlayer(name) || Mpris.players[0] || null;
 function lengthStr(length) {
     const min = Math.floor(length / 60);
     const sec = Math.floor(length % 60);
     const sec0 = sec < 10 ? '0' : '';
     return `${min}:${sec0}${sec}`;
 }
-
 function fileExists(filePath) {
     let file = Gio.File.new_for_path(filePath);
     return file.query_exists(null);
@@ -54,17 +50,11 @@ function detectMediaSource(link) {
             return '󰈹 Firefox'
         return "󰈣 File";
     }
-    // Remove protocol if present
     let url = link.replace(/(^\w+:|^)\/\//, '');
-    // Extract the domain name
     let domain = url.match(/(?:[a-z]+\.)?([a-z]+\.[a-z]+)/i)[1];
-
-    if (domain == 'ytimg.com')
-        return '󰗃 Youtube';
-    if (domain == 'discordapp.net')
-        return '󰙯 Discord';
-    if (domain == 'sndcdn.com')
-        return '󰓀 SoundCloud';
+    if (domain == 'ytimg.com') return '󰗃 Youtube';
+    if (domain == 'discordapp.net') return '󰙯 Discord';
+    if (domain == 'sndcdn.com') return '󰓀 SoundCloud';
     return domain;
 }
 
@@ -72,15 +62,19 @@ const DEFAULT_MUSIC_FONT = 'Gabarito, sans-serif';
 function getTrackfont(player) {
     const title = player.trackTitle;
     const artists = player.trackArtists.join(' ');
-    if (artists.includes('TANO*C') || artists.includes('USAO') || artists.includes('Kobaryo')) return 'Chakra Petch'; // Rigid square replacement
-    if (title.includes('東方')) return 'Crimson Text, serif'; // Serif for Touhou stuff
+    if (artists.includes('TANO*C') || artists.includes('USAO') || artists.includes('Kobaryo'))
+        return 'Chakra Petch'; // Rigid square replacement
+    if (title.includes('東方'))
+        return 'Crimson Text, serif'; // Serif for Touhou stuff
     return DEFAULT_MUSIC_FONT;
 }
 function trimTrackTitle(title) {
-    var cleanedTitle = title;
-    cleanedTitle = cleanedTitle.replace(/【[^】]*】/, '');          // Remove stuff like【C93】 at beginning
-    cleanedTitle = cleanedTitle.replace(/\[FREE DOWNLOAD\]/g, ''); // Remove F-777's [FREE DOWNLOAD]
-    return cleanedTitle.trim();
+    cleanRegexes = [
+        /【[^】]*】/,         // Touhou n weeb stuff
+        /\[FREE DOWNLOAD\]/, // F-777
+    ];
+    cleanRegexes.forEach((expr) => cleanedTitle.replace(expr, ''));
+    return title;
 }
 
 const TrackProgress = ({ player, ...rest }) => {