From 8f93f3034343f5cb2e814c62439e0024ff698c88 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Sat, 30 Mar 2024 21:53:20 +0700 Subject: [PATCH] more config option for apps --- .../modules/.configuration/user_options.js | 4 +++ .config/ags/modules/bar/normal/music.js | 31 ++++++++++--------- .config/ags/modules/sideleft/apis/booru.js | 1 - .config/ags/modules/sideright/quicktoggles.js | 6 ++-- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/.config/ags/modules/.configuration/user_options.js b/.config/ags/modules/.configuration/user_options.js index ca472cd19..f907cbbc3 100644 --- a/.config/ags/modules/.configuration/user_options.js +++ b/.config/ags/modules/.configuration/user_options.js @@ -20,7 +20,11 @@ let configOptions = { 'keyboardUseFlag': false, // Use flag emoji instead of abbreviation letters }, 'apps': { + 'bluetooth': "blueberry", 'imageViewer': "loupe", + 'network': "XDG_CURRENT_DESKTOP=\"gnome\" gnome-control-center wifi", + 'settings': "XDG_CURRENT_DESKTOP=\"gnome\" gnome-control-center wifi", + 'taskManager': "gnome-system-monitor", 'terminal': "foot", // This is only for shell actions }, 'battery': { diff --git a/.config/ags/modules/bar/normal/music.js b/.config/ags/modules/bar/normal/music.js index 3879fafd4..f261e9ea3 100644 --- a/.config/ags/modules/bar/normal/music.js +++ b/.config/ags/modules/bar/normal/music.js @@ -59,20 +59,23 @@ const BarResource = (name, icon, command, circprogClassName = 'bar-batt-circprog const resourceLabel = Label({ className: `txt-smallie ${textClassName}`, }); - const widget = Box({ - className: `spacing-h-4 ${textClassName}`, - children: [ - resourceProgress, - resourceLabel, - ], - setup: (self) => self - .poll(5000, () => execAsync(['bash', '-c', command]) - .then((output) => { - resourceCircProg.css = `font-size: ${Number(output)}px;`; - resourceLabel.label = `${Math.round(Number(output))}%`; - widget.tooltipText = `${name}: ${Math.round(Number(output))}%`; - }).catch(print)) - , + const widget = Button({ + onClicked: () => Utils.execAsync(['bash', '-c', `${userOptions.apps.taskManager}`]).catch(print), + child: Box({ + className: `spacing-h-4 ${textClassName}`, + children: [ + resourceProgress, + resourceLabel, + ], + setup: (self) => self + .poll(5000, () => execAsync(['bash', '-c', command]) + .then((output) => { + resourceCircProg.css = `font-size: ${Number(output)}px;`; + resourceLabel.label = `${Math.round(Number(output))}%`; + widget.tooltipText = `${name}: ${Math.round(Number(output))}%`; + }).catch(print)) + , + }) }); return widget; } diff --git a/.config/ags/modules/sideleft/apis/booru.js b/.config/ags/modules/sideleft/apis/booru.js index 0c5248cd0..f53b38494 100644 --- a/.config/ags/modules/sideleft/apis/booru.js +++ b/.config/ags/modules/sideleft/apis/booru.js @@ -24,7 +24,6 @@ async function getImageViewerApp(preferredApp) { } const IMAGE_REVEAL_DELAY = 13; // Some wait for inits n other weird stuff -const IMAGE_VIEWER_APP = getImageViewerApp(userOptions.apps.imageViewer); // Gnome's image viewer cuz very comfortable zooming const USER_CACHE_DIR = GLib.get_user_cache_dir(); // Create cache folder and clear pics from previous session diff --git a/.config/ags/modules/sideright/quicktoggles.js b/.config/ags/modules/sideright/quicktoggles.js index 69b01c8ed..7f2ff3165 100644 --- a/.config/ags/modules/sideright/quicktoggles.js +++ b/.config/ags/modules/sideright/quicktoggles.js @@ -15,7 +15,7 @@ export const ToggleIconWifi = (props = {}) => Widget.Button({ tooltipText: 'Wifi | Right-click to configure', onClicked: () => Network.toggleWifi(), onSecondaryClickRelease: () => { - execAsync(['bash', '-c', 'XDG_CURRENT_DESKTOP="gnome" gnome-control-center wifi', '&']); + execAsync(['bash', '-c', `${userOptions.apps.network}`, '&']); App.closeWindow('sideright'); }, child: NetworkIndicator(), @@ -40,7 +40,7 @@ export const ToggleIconBluetooth = (props = {}) => Widget.Button({ exec('rfkill unblock bluetooth'); }, onSecondaryClickRelease: () => { - execAsync(['bash', '-c', 'blueberry &']); + execAsync(['bash', '-c', `${userOptions.apps.bluetooth}`]).catch(print); App.closeWindow('sideright'); }, child: BluetoothIndicator(), @@ -213,7 +213,7 @@ export const ModuleSettingsIcon = (props = {}) => Widget.Button({ className: 'txt-small sidebar-iconbutton', tooltipText: 'Open Settings', onClicked: () => { - execAsync(['bash', '-c', 'XDG_CURRENT_DESKTOP="gnome" gnome-control-center', '&']); + execAsync(['bash', '-c', `${userOptions.apps.settings}`, '&']); App.toggleWindow('sideright'); }, child: MaterialIcon('settings', 'norm'),