diff --git a/modules/menus/dashboard/stats/index.ts b/modules/menus/dashboard/stats/index.ts index f10e0ccc..f73ed568 100644 --- a/modules/menus/dashboard/stats/index.ts +++ b/modules/menus/dashboard/stats/index.ts @@ -7,7 +7,6 @@ import Cpu from 'services/Cpu'; import Storage from 'services/Storage'; import { renderResourceLabel } from 'customModules/utils'; -const { terminal } = options; const { enable_gpu, interval } = options.menus.dashboard.stats; const ramService = new Ram(); @@ -23,6 +22,12 @@ interval.connect('changed', () => { storageService.updateTimer(interval.value); }); + +const handleClick = (): void => { + App.closeWindow('dashboardmenu'); + Utils.execAsync(`bash -c "$TERMINAL -e btop"`).catch((err) => `Failed to open btop: ${err}`); +}; + const Stats = (): BoxWidget => { const divide = ([total, free]: number[]): number => free / total; @@ -82,28 +87,18 @@ const Stats = (): BoxWidget => { return (self.children = [ Widget.Button({ - on_primary_click: terminal.bind('value').as((term) => { - return (): void => { - App.closeWindow('dashboardmenu'); - Utils.execAsync(`bash -c "${term} -e btop"`).catch( - (err) => `Failed to open btop: ${err}`, - ); - }; - }), + on_primary_click: () => { + handleClick(); + }, child: Widget.Label({ class_name: 'txt-icon', label: '󰢮', }), }), Widget.Button({ - on_primary_click: terminal.bind('value').as((term) => { - return (): void => { - App.closeWindow('dashboardmenu'); - Utils.execAsync(`bash -c "${term} -e btop"`).catch( - (err) => `Failed to open btop: ${err}`, - ); - }; - }), + on_primary_click: () => { + handleClick(); + }, child: Widget.LevelBar({ class_name: 'stats-bar', hexpand: true, @@ -150,28 +145,18 @@ const Stats = (): BoxWidget => { vpack: 'center', children: [ Widget.Button({ - on_primary_click: terminal.bind('value').as((term) => { - return () => { - App.closeWindow('dashboardmenu'); - Utils.execAsync(`bash -c "${term} -e btop"`).catch( - (err) => `Failed to open btop: ${err}`, - ); - }; - }), + on_primary_click: () => { + handleClick(); + }, child: Widget.Label({ class_name: 'txt-icon', label: '', }), }), Widget.Button({ - on_primary_click: terminal.bind('value').as((term) => { - return () => { - App.closeWindow('dashboardmenu'); - Utils.execAsync(`bash -c "${term} -e btop"`).catch( - (err) => `Failed to open btop: ${err}`, - ); - }; - }), + on_primary_click: () => { + handleClick(); + }, child: Widget.LevelBar({ class_name: 'stats-bar', hexpand: true, @@ -199,28 +184,18 @@ const Stats = (): BoxWidget => { hexpand: true, children: [ Widget.Button({ - on_primary_click: terminal.bind('value').as((term) => { - return () => { - App.closeWindow('dashboardmenu'); - Utils.execAsync(`bash -c "${term} -e btop"`).catch( - (err) => `Failed to open btop: ${err}`, - ); - }; - }), + on_primary_click: () => { + handleClick(); + }, child: Widget.Label({ class_name: 'txt-icon', label: '', }), }), Widget.Button({ - on_primary_click: terminal.bind('value').as((term) => { - return () => { - App.closeWindow('dashboardmenu'); - Utils.execAsync(`bash -c "${term} -e btop"`).catch( - (err) => `Failed to open btop: ${err}`, - ); - }; - }), + on_primary_click: () => { + handleClick(); + }, child: Widget.LevelBar({ class_name: 'stats-bar', hexpand: true, @@ -251,28 +226,18 @@ const Stats = (): BoxWidget => { vpack: 'center', children: [ Widget.Button({ - on_primary_click: terminal.bind('value').as((term) => { - return () => { - App.closeWindow('dashboardmenu'); - Utils.execAsync(`bash -c "${term} -e btop"`).catch( - (err) => `Failed to open btop: ${err}`, - ); - }; - }), + on_primary_click: () => { + handleClick(); + }, child: Widget.Label({ class_name: 'txt-icon', label: '󰋊', }), }), Widget.Button({ - on_primary_click: terminal.bind('value').as((term) => { - return () => { - App.closeWindow('dashboardmenu'); - Utils.execAsync(`bash -c "${term} -e btop"`).catch( - (err) => `Failed to open btop: ${err}`, - ); - }; - }), + on_primary_click: () => { + handleClick(); + }, child: Widget.LevelBar({ class_name: 'stats-bar', hexpand: true, diff --git a/options.ts b/options.ts index 1e8dce8b..e270ee09 100644 --- a/options.ts +++ b/options.ts @@ -1114,29 +1114,29 @@ const options = mkOptions(OPTIONS, { left: { directory1: { label: opt('󰉍 Downloads'), - command: opt('bash -c "dolphin $HOME/Downloads/"'), + command: opt('bash -c "xdg-open $HOME/Downloads/"'), }, directory2: { label: opt('󰉏 Videos'), - command: opt('bash -c "dolphin $HOME/Videos/"'), + command: opt('bash -c "xdg-open $HOME/Videos/"'), }, directory3: { label: opt('󰚝 Projects'), - command: opt('bash -c "dolphin $HOME/Projects/"'), + command: opt('bash -c "xdg-open $HOME/Projects/"'), }, }, right: { directory1: { label: opt('󱧶 Documents'), - command: opt('bash -c "dolphin $HOME/Documents/"'), + command: opt('bash -c "xdg-open $HOME/Documents/"'), }, directory2: { label: opt('󰉏 Pictures'), - command: opt('bash -c "dolphin $HOME/Pictures/"'), + command: opt('bash -c "xdg-open $HOME/Pictures/"'), }, directory3: { label: opt('󱂵 Home'), - command: opt('bash -c "dolphin $HOME/"'), + command: opt('bash -c "xdg-open $HOME/"'), }, }, }, @@ -1160,8 +1160,6 @@ const options = mkOptions(OPTIONS, { scalingPriority: opt('gdk'), - terminal: opt('kitty'), - tear: opt(false), wallpaper: {