matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(ags): prioritise getters when using astal libs

Browse source
This commit is contained in:
matt1432 2024-12-29 17:22:55 -05:00
parent 10b70583e0
commit 179e402504
30 changed files with 176 additions and 164 deletions
modules/ags/config/lib
hypr.tsnotify.ts

34
modules/ags/config/lib/hypr.ts
View file

@ -6,21 +6,23 @@ import AstalHyprland from 'gi://AstalHyprland';
export const get_hyprland_monitor = (monitor: Gdk.Monitor): AstalHyprland.Monitor | undefined => {
const hyprland = AstalHyprland.get_default();
const manufacturer = monitor.manufacturer?.replace(',', '');
const model = monitor.model?.replace(',', '');
const manufacturer = monitor.get_manufacturer()?.replace(',', '');
const model = monitor.get_model()?.replace(',', '');
const start = `${manufacturer} ${model}`;
return hyprland.get_monitors().find((m) => m.description?.startsWith(start));
return hyprland.get_monitors().find((m) => m.get_description()?.startsWith(start));
};
export const get_hyprland_monitor_desc = (monitor: Gdk.Monitor): string => {
const hyprland = AstalHyprland.get_default();
const manufacturer = monitor.manufacturer?.replace(',', '');
const model = monitor.model?.replace(',', '');
const manufacturer = monitor.get_manufacturer()?.replace(',', '');
const model = monitor.get_model()?.replace(',', '');
const start = `${manufacturer} ${model}`;
return `desc:${hyprland.get_monitors().find((m) => m.description?.startsWith(start))?.description}`;
return `desc:${hyprland
.get_monitors()
.find((m) => m.get_description()?.startsWith(start))?.get_description()}`;
};
export const get_gdkmonitor_from_desc = (desc: string): Gdk.Monitor => {
@ -38,7 +40,7 @@ export const get_gdkmonitor_from_desc = (desc: string): Gdk.Monitor => {
};
export const get_monitor_desc = (mon: AstalHyprland.Monitor): string => {
return `desc:${mon.description}`;
return `desc:${mon.get_description()}`;
};
export const hyprMessage = (message: string) => new Promise<string>((
@ -66,25 +68,25 @@ export const centerCursor = (): void => {
let y: number;
const monitor = hyprland.get_focused_monitor();
switch (monitor.transform) {
switch (monitor.get_transform()) {
case 1:
x = monitor.x - (monitor.height / 2);
y = monitor.y - (monitor.width / 2);
x = monitor.get_x() - (monitor.get_height() / 2);
y = monitor.get_y() - (monitor.get_width() / 2);
break;
case 2:
x = monitor.x - (monitor.width / 2);
y = monitor.y - (monitor.height / 2);
x = monitor.get_x() - (monitor.get_width() / 2);
y = monitor.get_y() - (monitor.get_height() / 2);
break;
case 3:
x = monitor.x + (monitor.height / 2);
y = monitor.y + (monitor.width / 2);
x = monitor.get_x() + (monitor.get_height() / 2);
y = monitor.get_y() + (monitor.get_width() / 2);
break;
default:
x = monitor.x + (monitor.width / 2);
y = monitor.y + (monitor.height / 2);
x = monitor.get_x() + (monitor.get_width() / 2);
y = monitor.get_y() + (monitor.get_height() / 2);
break;
}

2
modules/ags/config/lib/notify.ts
View file

@ -18,7 +18,7 @@ interface NotifySendProps {
urgency?: 'low' | 'normal' | 'critical'
}
const escapeShellArg = (arg: string): string => `'${arg?.replace(/'/g, '\'\\\'\'')}'`;
const escapeShellArg = (arg: string | undefined): string => `'${arg?.replace(/'/g, '\'\\\'\'') ?? ''}'`;
export const notifySend = ({
actions = [],