Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: dont hardcode file manager and make use of $TERM #361

Merged
merged 8 commits into from
Oct 26, 2024
Merged

fix: dont hardcode file manager and make use of $TERM #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e8a24d1
feat: make executables dynamic
rubiin Oct 24, 2024
ab5eba1
feat: make executables dynamic
rubiin Oct 24, 2024
4df0064
Update modules/menus/dashboard/stats/index.ts
rubiin Oct 25, 2024
82f0e7a
Update widget/settings/pages/config/general/index.ts
rubiin Oct 25, 2024
2e8dd89
Update options.ts
rubiin Oct 25, 2024
d5f6c6d
Update modules/menus/dashboard/stats/index.ts
rubiin Oct 25, 2024
35de474
Merge branch 'master' into file
rubiin Oct 25, 2024
86b716f
fix: var to term
rubiin Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 29 additions & 64 deletions modules/menus/dashboard/stats/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ 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;

Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
15 changes: 7 additions & 8 deletions options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/"'),
},
},
},
Expand All @@ -1160,8 +1160,7 @@ const options = mkOptions(OPTIONS, {

scalingPriority: opt<ScalingPriority>('gdk'),

terminal: opt('kitty'),

terminal: opt('$TERM'),
tear: opt(false),
rubiin marked this conversation as resolved.
Show resolved Hide resolved

wallpaper: {
Expand Down
Loading