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

fix(ags): move get_default calls inside functions
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-11-20 23:38:41 -05:00
parent d223d18842
commit 4604dcb6fd
24 changed files with 438 additions and 382 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixosModules/ags/config/configurations/binto.ts
View file

@ -33,7 +33,7 @@ export default () => {
respond('closed all windows');
}
else if (request.startsWith('fetchCapsState')) {
Brightness.fetchCapsState();
Brightness.get_default().fetchCapsState();
respond('fetched caps_lock state');
}
else if (request.startsWith('popup')) {
@ -41,7 +41,7 @@ export default () => {
respond('osd popped up');
}
else if (request.startsWith('save-replay')) {
GSR.saveReplay();
GSR.get_default().saveReplay();
respond('saving replay');
}
},
@ -61,9 +61,9 @@ export default () => {
PowerMenu();
Screenshot();
Brightness.initService({ caps: 'input2::capslock' });
GSR.initService();
new MonitorClicks();
Brightness.get_default({ caps: 'input2::capslock' });
GSR.get_default();
MonitorClicks.get_default();
},
});
};

8
nixosModules/ags/config/configurations/wim.ts
View file

@ -34,11 +34,11 @@ export default () => {
respond('closed all windows');
}
else if (request.startsWith('fetchCapsState')) {
Brightness.fetchCapsState();
Brightness.get_default().fetchCapsState();
respond('fetched caps_lock state');
}
else if (request.startsWith('Brightness.screen')) {
Brightness.screen += parseFloat(request.replace('Brightness.screen ', ''));
Brightness.get_default().screen += parseFloat(request.replace('Brightness.screen ', ''));
respond('screen brightness changed');
}
else if (request.startsWith('popup')) {
@ -68,11 +68,11 @@ export default () => {
PowerMenu();
Screenshot();
Brightness.initService({
Brightness.get_default({
kbd: 'tpacpi::kbd_backlight',
caps: 'input1::capslock',
});
new MonitorClicks();
MonitorClicks.get_default();
},
});
};

19
nixosModules/ags/config/lib.ts
View file

@ -2,7 +2,6 @@ import { idle } from 'astal';
import { App, Gdk, Gtk } from 'astal/gtk3';
import AstalHyprland from 'gi://AstalHyprland';
const Hyprland = AstalHyprland.get_default();
/* Types */
import PopupWindow from './widgets/misc/popup-window';
@ -32,19 +31,23 @@ export interface CursorPos {
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 start = `${manufacturer} ${model}`;
return Hyprland.get_monitors().find((m) => m.description?.startsWith(start));
return hyprland.get_monitors().find((m) => m.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 start = `${manufacturer} ${model}`;
return `desc:${Hyprland.get_monitors().find((m) => m.description?.startsWith(start))?.description}`;
return `desc:${hyprland.get_monitors().find((m) => m.description?.startsWith(start))?.description}`;
};
export const get_gdkmonitor_from_desc = (desc: string): Gdk.Monitor => {
@ -69,9 +72,11 @@ export const hyprMessage = (message: string) => new Promise<string>((
resolution = () => { /**/ },
rejection = () => { /**/ },
) => {
const hyprland = AstalHyprland.get_default();
try {
Hyprland.message_async(message, (_, asyncResult) => {
const result = Hyprland.message_finish(asyncResult);
hyprland.message_async(message, (_, asyncResult) => {
const result = hyprland.message_finish(asyncResult);
resolution(result);
});
@ -82,9 +87,11 @@ export const hyprMessage = (message: string) => new Promise<string>((
});
export const centerCursor = (): void => {
const hyprland = AstalHyprland.get_default();
let x: number;
let y: number;
const monitor = Hyprland.get_focused_monitor();
const monitor = hyprland.get_focused_monitor();
switch (monitor.transform) {
case 1:

30
nixosModules/ags/config/services/brightness.ts
View file

@ -12,7 +12,7 @@ const SCREEN_ICONS: Record<number, string> = {
const INTERVAL = 500;
@register()
class Brightness extends GObject.Object {
export default class Brightness extends GObject.Object {
declare private _kbd: string | undefined;
declare private _caps: string | undefined;
@ -98,16 +98,11 @@ class Brightness extends GObject.Object {
return this._capsIcon;
}
/**
* This is to basically have the constructor run when I want and
* still export this to wherever I need to.
*
* @param o params
* @param o.kbd name of kbd in brightnessctl
* @param o.caps name of caps_lock in brightnessctl
*/
public async initService({ kbd, caps }: { kbd?: string, caps?: string }) {
public constructor({ kbd, caps }: { kbd?: string, caps?: string } = {}) {
super();
try {
(async() => {
if (kbd) {
this.hasKbd = true;
this._kbd = kbd;
@ -119,12 +114,23 @@ class Brightness extends GObject.Object {
this._screen = Number(await execAsync('brightnessctl g')) /
Number(await execAsync('brightnessctl m'));
this.notify('screen');
})();
}
catch (_e) {
console.error('missing dependency: brightnessctl');
}
}
private static _default: InstanceType<typeof Brightness> | undefined;
public static get_default({ kbd, caps }: { kbd?: string, caps?: string } = {}) {
if (!Brightness._default) {
Brightness._default = new Brightness({ kbd, caps });
}
return Brightness._default;
}
private _getScreenIcon() {
const brightness = this._screen * 100;
@ -168,7 +174,3 @@ class Brightness extends GObject.Object {
.catch(logError);
}
}
const brightnessService = new Brightness();
export default brightnessService;

20
nixosModules/ags/config/services/gpu-screen-recorder.ts
View file

@ -72,10 +72,12 @@ const notifySend = ({
});
@register()
class GSR extends GObject.Object {
export default class GSR extends GObject.Object {
private _lastNotifID: number | undefined;
public initService() {
public constructor() {
super();
try {
subprocess(
['gsr-start'],
@ -99,6 +101,16 @@ class GSR extends GObject.Object {
}
}
private static _default: InstanceType<typeof GSR> | undefined;
public static get_default() {
if (!GSR._default) {
GSR._default = new GSR();
}
return GSR._default;
}
public saveReplay() {
execAsync(['gpu-save-replay'])
.then(async() => {
@ -155,7 +167,3 @@ class GSR extends GObject.Object {
});
}
}
const gsrService = new GSR();
export default gsrService;

25
nixosModules/ags/config/services/monitor-clicks.ts
View file

@ -39,10 +39,10 @@ export default class MonitorClicks extends GObject.Object {
constructor() {
super();
this.#initAppConnection();
this._initAppConnection();
}
startProc() {
private _startProc() {
if (this.process) {
return;
}
@ -68,7 +68,7 @@ export default class MonitorClicks extends GObject.Object {
this.emit('proc-started', true);
}
killProc() {
private _killProc() {
if (this.process) {
this.process.kill();
this.process = null;
@ -76,7 +76,7 @@ export default class MonitorClicks extends GObject.Object {
}
}
#initAppConnection() {
private _initAppConnection() {
App.connect('window-toggled', () => {
const anyVisibleAndClosable =
(App.get_windows() as PopupWindow[]).some((w) => {
@ -90,16 +90,26 @@ export default class MonitorClicks extends GObject.Object {
});
if (anyVisibleAndClosable) {
this.startProc();
this._startProc();
}
else {
this.killProc();
this._killProc();
}
});
}
static async detectClickedOutside(clickStage: string) {
private static _default: InstanceType<typeof MonitorClicks> | undefined;
public static get_default() {
if (!MonitorClicks._default) {
MonitorClicks._default = new MonitorClicks();
}
return MonitorClicks._default;
}
public static async detectClickedOutside(clickStage: string) {
const toClose = ((App.get_windows() as PopupWindow[])).some((w) => {
const closable = (
w.close_on_unfocus &&
@ -124,6 +134,7 @@ export default class MonitorClicks extends GObject.Object {
const noCloseWidgetsNames = [
'bar-',
'osk',
'noanim-',
];
const getNoCloseWidgets = (names: string[]) => {

4
nixosModules/ags/config/widgets/applauncher/app-item.tsx
View file

@ -33,9 +33,7 @@ export class AppItem extends Widget.Box {
);
const textBox = (
<box
vertical
>
<box vertical>
<label
className="title"
label={app.name}

46
nixosModules/ags/config/widgets/bar/fullscreen.tsx
View file

@ -2,7 +2,6 @@ import { App, Astal, Gdk, Gtk, Widget } from 'astal/gtk3';
import { bind, idle, Variable } from 'astal';
import AstalHyprland from 'gi://AstalHyprland';
const Hyprland = AstalHyprland.get_default();
import { get_hyprland_monitor_desc, get_monitor_desc, hyprMessage } from '../../lib';
@ -12,7 +11,21 @@ const FullscreenState = Variable({
clientAddrs: new Map() as Map<string, string>,
});
Hyprland.connect('event', async() => {
export default ({
anchor,
gdkmonitor = Gdk.Display.get_default()?.get_monitor(0) as Gdk.Monitor,
child,
...rest
}: {
anchor: Astal.WindowAnchor
gdkmonitor?: Gdk.Monitor
} & Widget.WindowProps) => {
const hyprland = AstalHyprland.get_default();
const monitor = get_hyprland_monitor_desc(gdkmonitor);
const BarVisible = Variable(false);
hyprland.connect('event', async() => {
const arrayEquals = (a1: unknown[], a2: unknown[]) =>
a1.sort().toString() === a2.sort().toString();
@ -24,8 +37,8 @@ Hyprland.connect('event', async() => {
const newMonitors = JSON.parse(await hyprMessage('j/monitors')) as AstalHyprland.Monitor[];
const fs = FullscreenState.get();
const fsClients = Hyprland.get_clients().filter((c) => {
const mon = newMonitors.find((monitor) => monitor.id === c.get_monitor()?.id);
const fsClients = hyprland.get_clients().filter((c) => {
const mon = newMonitors.find((m) => m.id === c.get_monitor()?.id);
return c.fullscreenClient !== 0 &&
c.workspace.id === mon?.activeWorkspace.id;
@ -55,25 +68,14 @@ Hyprland.connect('event', async() => {
}
});
export default ({
anchor,
gdkmonitor = Gdk.Display.get_default()?.get_monitor(0) as Gdk.Monitor,
child,
...rest
}: {
anchor: Astal.WindowAnchor
gdkmonitor?: Gdk.Monitor
} & Widget.WindowProps) => {
const monitor = get_hyprland_monitor_desc(gdkmonitor);
const BarVisible = Variable(false);
FullscreenState.subscribe((v) => {
BarVisible.set(!v.monitors.includes(monitor));
});
const barCloser = (
<window
name={`bar-${monitor}-closer`}
name={`noanim-bar-${monitor}-closer`}
namespace={`noanim-bar-${monitor}-closer`}
css="all: unset;"
visible={false}
gdkmonitor={gdkmonitor}
@ -97,13 +99,13 @@ export default ({
);
// Hide bar instantly when out of focus
Hyprland.connect('notify::focused-workspace', () => {
hyprland.connect('notify::focused-workspace', () => {
const addr = FullscreenState.get().clientAddrs.get(monitor);
if (addr) {
const client = Hyprland.get_client(addr);
const client = hyprland.get_client(addr);
if (client?.workspace.id !== Hyprland.get_focused_workspace().get_id()) {
if (client?.workspace.id !== hyprland.get_focused_workspace().get_id()) {
BarVisible.set(true);
barCloser.visible = false;
}
@ -152,8 +154,8 @@ export default ({
const win = (
<window
name={`bar-${monitor}`}
namespace={`bar-${monitor}`}
name={`noanim-bar-${monitor}`}
namespace={`noanim-bar-${monitor}`}
layer={Astal.Layer.OVERLAY}
gdkmonitor={gdkmonitor}
anchor={anchor}

19
nixosModules/ags/config/widgets/bar/items/battery.tsx
View file

@ -1,21 +1,23 @@
import { bind } from 'astal';
import AstalBattery from 'gi://AstalBattery';
const Battery = AstalBattery.get_default();
import Separator from '../../misc/separator';
const LOW_BATT = 20;
export default () => (
export default () => {
const battery = AstalBattery.get_default();
return (
<box className="bar-item battery">
<icon
setup={(self) => {
const update = () => {
const percent = Math.round(Battery.get_percentage() * 100);
const percent = Math.round(battery.get_percentage() * 100);
const level = Math.floor(percent / 10) * 10;
const isCharging = Battery.get_charging();
const isCharging = battery.get_charging();
const charged = percent === 100 && isCharging;
const iconName = charged ?
'battery-level-100-charged-symbolic' :
@ -32,14 +34,15 @@ export default () => (
update();
Battery.connect('notify::percentage', () => update());
Battery.connect('notify::icon-name', () => update());
Battery.connect('notify::battery-icon-name', () => update());
battery.connect('notify::percentage', () => update());
battery.connect('notify::icon-name', () => update());
battery.connect('notify::battery-icon-name', () => update());
}}
/>
<Separator size={8} />
<label label={bind(Battery, 'percentage').as((v) => `${Math.round(v * 100)}%`)} />
<label label={bind(battery, 'percentage').as((v) => `${Math.round(v * 100)}%`)} />
</box>
);
};

6
nixosModules/ags/config/widgets/bar/items/brightness.tsx
View file

@ -3,17 +3,19 @@ import { bind } from 'astal';
import Brightness from '../../../services/brightness';
export default () => {
const brightness = Brightness.get_default();
return (
<box className="bar-item brightness">
<overlay>
<circularprogress
startAt={0.75}
endAt={0.75}
value={bind(Brightness, 'screen')}
value={bind(brightness, 'screen')}
rounded
/>
<icon icon={bind(Brightness, 'screenIcon')} />
<icon icon={bind(brightness, 'screenIcon')} />
</overlay>
</box>
);

18
nixosModules/ags/config/widgets/bar/items/current-client.tsx
View file

@ -1,16 +1,16 @@
import { bind, Variable } from 'astal';
import AstalApps from 'gi://AstalApps';
const Applications = AstalApps.Apps.new();
import AstalHyprland from 'gi://AstalHyprland';
const Hyprland = AstalHyprland.get_default();
import Separator from '../../misc/separator';
import { hyprMessage } from '../../../lib';
export default () => {
const applications = AstalApps.Apps.new();
const hyprland = AstalHyprland.get_default();
const visibleIcon = Variable<boolean>(false);
const focusedIcon = Variable<string>('');
const focusedTitle = Variable<string>('');
@ -18,10 +18,10 @@ export default () => {
let lastFocused: string | undefined;
const updateVars = (
client: AstalHyprland.Client | null = Hyprland.get_focused_client(),
client: AstalHyprland.Client | null = hyprland.get_focused_client(),
) => {
lastFocused = client?.get_address();
const app = Applications.fuzzy_query(
const app = applications.fuzzy_query(
client?.get_class() ?? '',
)[0];
@ -45,11 +45,11 @@ export default () => {
};
updateVars();
Hyprland.connect('notify::focused-client', () => updateVars());
Hyprland.connect('client-removed', () => updateVars());
Hyprland.connect('client-added', async() => {
hyprland.connect('notify::focused-client', () => updateVars());
hyprland.connect('client-removed', () => updateVars());
hyprland.connect('client-added', async() => {
try {
updateVars(Hyprland.get_client(JSON.parse(await hyprMessage('j/activewindow')).address));
updateVars(hyprland.get_client(JSON.parse(await hyprMessage('j/activewindow')).address));
}
catch (e) {
console.log(e);

18
nixosModules/ags/config/widgets/bar/items/current-icon.tsx
View file

@ -1,25 +1,25 @@
import { bind, Variable } from 'astal';
import AstalApps from 'gi://AstalApps';
const Applications = AstalApps.Apps.new();
import AstalHyprland from 'gi://AstalHyprland';
const Hyprland = AstalHyprland.get_default();
import { hyprMessage } from '../../../lib';
export default () => {
const applications = AstalApps.Apps.new();
const hyprland = AstalHyprland.get_default();
const visibleIcon = Variable<boolean>(false);
const focusedIcon = Variable<string>('');
let lastFocused: string | undefined;
const updateVars = (
client: AstalHyprland.Client | null = Hyprland.get_focused_client(),
client: AstalHyprland.Client | null = hyprland.get_focused_client(),
) => {
lastFocused = client?.get_address();
const app = Applications.fuzzy_query(
const app = applications.fuzzy_query(
client?.get_class() ?? '',
)[0];
@ -41,11 +41,11 @@ export default () => {
};
updateVars();
Hyprland.connect('notify::focused-client', () => updateVars());
Hyprland.connect('client-removed', () => updateVars());
Hyprland.connect('client-added', async() => {
hyprland.connect('notify::focused-client', () => updateVars());
hyprland.connect('client-removed', () => updateVars());
hyprland.connect('client-added', async() => {
try {
updateVars(Hyprland.get_client(JSON.parse(await hyprMessage('j/activewindow')).address));
updateVars(hyprland.get_client(JSON.parse(await hyprMessage('j/activewindow')).address));
}
catch (e) {
console.log(e);

4
nixosModules/ags/config/widgets/bar/items/network.tsx
View file

@ -5,10 +5,10 @@ import AstalNetwork from 'gi://AstalNetwork';
export default () => {
const Hovered = Variable(false);
// TODO: do this everywhere else
const network = AstalNetwork.get_default();
const Hovered = Variable(false);
return (
<button
className="bar-item network"

13
nixosModules/ags/config/widgets/bar/items/notif-button.tsx
View file

@ -2,7 +2,6 @@ import { bind } from 'astal';
import { App } from 'astal/gtk3';
import AstalNotifd from 'gi://AstalNotifd';
const Notifications = AstalNotifd.get_default();
import Separator from '../../misc/separator';
@ -12,7 +11,10 @@ const SPACING = 4;
import PopupWindow from '../../misc/popup-window';
export default () => (
export default () => {
const notifications = AstalNotifd.get_default();
return (
<button
className="bar-item"
cursor="pointer"
@ -38,8 +40,8 @@ export default () => (
>
<box>
<icon
icon={bind(Notifications, 'notifications').as((notifs) => {
if (Notifications.dontDisturb) {
icon={bind(notifications, 'notifications').as((notifs) => {
if (notifications.dontDisturb) {
return 'notification-disabled-symbolic';
}
else if (notifs.length > 0) {
@ -53,7 +55,8 @@ export default () => (
<Separator size={SPACING} />
<label label={bind(Notifications, 'notifications').as((n) => String(n.length))} />
<label label={bind(notifications, 'notifications').as((n) => String(n.length))} />
</box>
</button>
);
};

13
nixosModules/ags/config/widgets/bar/items/tray.tsx
View file

@ -2,7 +2,6 @@ import { App, Gdk, Gtk, Widget } from 'astal/gtk3';
import { bind, idle } from 'astal';
import AstalTray from 'gi://AstalTray';
const Tray = AstalTray.get_default();
const SKIP_ITEMS = ['.spotify-wrapped'];
@ -35,20 +34,22 @@ const TrayItem = (item: AstalTray.TrayItem) => {
};
export default () => {
const tray = AstalTray.get_default();
const itemMap = new Map<string, Widget.Revealer>();
return (
<box
className="bar-item system-tray"
visible={bind(Tray, 'items').as((items) => items.length !== 0)}
visible={bind(tray, 'items').as((items) => items.length !== 0)}
setup={(self) => {
self
.hook(Tray, 'item-added', (_, item: string) => {
if (itemMap.has(item) || SKIP_ITEMS.includes(Tray.get_item(item).title)) {
.hook(tray, 'item-added', (_, item: string) => {
if (itemMap.has(item) || SKIP_ITEMS.includes(tray.get_item(item).title)) {
return;
}
const widget = TrayItem(Tray.get_item(item)) as Widget.Revealer;
const widget = TrayItem(tray.get_item(item)) as Widget.Revealer;
itemMap.set(item, widget);
@ -59,7 +60,7 @@ export default () => {
});
})
.hook(Tray, 'item-removed', (_, item: string) => {
.hook(tray, 'item-removed', (_, item: string) => {
if (!itemMap.has(item)) {
return;
}

21
nixosModules/ags/config/widgets/bar/items/workspaces.tsx
View file

@ -2,14 +2,16 @@ import { Gtk, Widget } from 'astal/gtk3';
import { timeout } from 'astal';
import AstalHyprland from 'gi://AstalHyprland';
const Hyprland = AstalHyprland.get_default();
import { hyprMessage } from '../../../lib';
const URGENT_DURATION = 1000;
const Workspace = ({ id = 0 }) => (
const Workspace = ({ id = 0 }) => {
const hyprland = AstalHyprland.get_default();
return (
<revealer
name={id.toString()}
transitionType={Gtk.RevealerTransitionType.SLIDE_RIGHT}
@ -31,7 +33,7 @@ const Workspace = ({ id = 0 }) => (
_: Widget.Box,
client?: AstalHyprland.Client,
) => {
const workspace = Hyprland.get_workspace(id);
const workspace = hyprland.get_workspace(id);
const occupied = workspace && workspace.get_clients().length > 0;
self.toggleClassName('occupied', occupied);
@ -47,7 +49,7 @@ const Workspace = ({ id = 0 }) => (
self.toggleClassName('urgent', true);
// Only show for a sec when urgent is current workspace
if (Hyprland.get_focused_workspace().get_id() === id) {
if (hyprland.get_focused_workspace().get_id() === id) {
timeout(URGENT_DURATION, () => {
self.toggleClassName('urgent', false);
});
@ -57,13 +59,13 @@ const Workspace = ({ id = 0 }) => (
update(self);
self
.hook(Hyprland, 'event', () => update(self))
.hook(hyprland, 'event', () => update(self))
// Deal with urgent windows
.hook(Hyprland, 'urgent', update)
.hook(hyprland, 'urgent', update)
.hook(Hyprland, 'notify::focused-workspace', () => {
if (Hyprland.get_focused_workspace().get_id() === id) {
.hook(hyprland, 'notify::focused-workspace', () => {
if (hyprland.get_focused_workspace().get_id() === id) {
self.toggleClassName('urgent', false);
}
});
@ -72,8 +74,11 @@ const Workspace = ({ id = 0 }) => (
</eventbox>
</revealer>
);
};
export default () => {
const Hyprland = AstalHyprland.get_default();
const L_PADDING = 2;
const WS_WIDTH = 30;

2
nixosModules/ags/config/widgets/clipboard/clip-item.tsx
View file

@ -94,5 +94,3 @@ export class ClipItem extends Widget.Box {
}
}
}
export default ClipItem;

2
nixosModules/ags/config/widgets/notifs/binto.tsx
View file

@ -10,8 +10,8 @@ import Center from './center';
export const NotifPopups = () => (
<window
name="notifications"
namespace="noanim-notifications"
gdkmonitor={get_gdkmonitor_from_desc('desc:Acer Technologies Acer K212HQL T3EAA0014201')}
namespace="notifications"
layer={Astal.Layer.OVERLAY}
anchor={Astal.WindowAnchor.BOTTOM | Astal.WindowAnchor.LEFT}
>

25
nixosModules/ags/config/widgets/notifs/center.tsx
View file

@ -2,7 +2,6 @@ import { bind, timeout } from 'astal';
import { App, Gtk, Widget } from 'astal/gtk3';
import AstalNotifd from 'gi://AstalNotifd';
const Notifications = AstalNotifd.get_default();
import { Notification, HasNotifs } from './notification';
import NotifGestureWrapper from './gesture';
@ -22,7 +21,10 @@ const addNotif = (box: Widget.Box, notifObj: AstalNotifd.Notification) => {
}
};
const NotificationList = () => (
const NotificationList = () => {
const notifications = AstalNotifd.get_default();
return (
<box
vertical
vexpand
@ -32,21 +34,21 @@ const NotificationList = () => (
css="min-width: 550px;"
setup={(self) => {
Notifications.get_notifications().forEach((n) => {
notifications.get_notifications().forEach((n) => {
addNotif(self, n);
});
self
.hook(Notifications, 'notified', (_, id) => {
.hook(notifications, 'notified', (_, id) => {
if (id) {
const notifObj = Notifications.get_notification(id);
const notifObj = notifications.get_notification(id);
if (notifObj) {
addNotif(self, notifObj);
}
}
})
.hook(Notifications, 'resolved', (_, id) => {
.hook(notifications, 'resolved', (_, id) => {
const notif = (self.get_children() as NotifGestureWrapper[])
.find((ch) => ch.id === id);
@ -57,8 +59,12 @@ const NotificationList = () => (
}}
/>
);
};
const ClearButton = () => (
const ClearButton = () => {
const notifications = AstalNotifd.get_default();
return (
<eventbox
cursor={bind(HasNotifs).as((hasNotifs) => hasNotifs ? 'pointer' : 'not-allowed')}
>
@ -67,7 +73,7 @@ const ClearButton = () => (
sensitive={bind(HasNotifs)}
onButtonReleaseEvent={() => {
Notifications.get_notifications().forEach((notif) => {
notifications.get_notifications().forEach((notif) => {
notif.dismiss();
});
timeout(1000, () => {
@ -78,7 +84,7 @@ const ClearButton = () => (
<box>
<label label="Clear " />
<icon icon={bind(Notifications, 'notifications')
<icon icon={bind(notifications, 'notifications')
.as((notifs) => notifs.length > 0 ?
'user-trash-full-symbolic' :
'user-trash-symbolic')}
@ -87,6 +93,7 @@ const ClearButton = () => (
</button>
</eventbox>
);
};
const Header = () => (
<box className="header">

15
nixosModules/ags/config/widgets/notifs/gesture.tsx
View file

@ -5,7 +5,6 @@ import { idle, interval, timeout } from 'astal';
import AstalIO from 'gi://AstalIO';
import AstalNotifd from 'gi://AstalNotifd';
const Notifications = AstalNotifd.get_default();
import { hyprMessage } from '../../lib';
@ -159,10 +158,12 @@ export class NotifGestureWrapper extends Widget.EventBox {
if (!duplicate) {
// Kill notif if specified
if (!this.is_popup) {
Notifications.get_notification(this.id)?.dismiss();
const notifications = AstalNotifd.get_default();
notifications.get_notification(this.id)?.dismiss();
// Update HasNotifs
HasNotifs.set(Notifications.get_notifications().length > 0);
HasNotifs.set(notifications.get_notifications().length > 0);
}
else {
// Make sure we cleanup any references to this instance
@ -183,6 +184,8 @@ export class NotifGestureWrapper extends Widget.EventBox {
setup_notif = () => { /**/ },
...rest
}: NotifGestureWrapperProps) {
const notifications = AstalNotifd.get_default();
super({
on_button_press_event: () => {
this.setCursor('grabbing');
@ -234,7 +237,7 @@ export class NotifGestureWrapper extends Widget.EventBox {
});
}
this.hook(Notifications, 'notified', (_, notifId) => {
this.hook(notifications, 'notified', (_, notifId) => {
if (notifId === this.id) {
this.slideAway(this.is_popup ? 'Left' : 'Right', true);
}
@ -315,7 +318,7 @@ export class NotifGestureWrapper extends Widget.EventBox {
slideRight;
idle(() => {
if (!Notifications.get_notification(id)) {
if (!notifications.get_notification(id)) {
return;
}
@ -328,7 +331,7 @@ export class NotifGestureWrapper extends Widget.EventBox {
rev.revealChild = true;
timeout(ANIM_DURATION, () => {
if (!Notifications.get_notification(id)) {
if (!notifications.get_notification(id)) {
return;
}

7
nixosModules/ags/config/widgets/notifs/notification.tsx
View file

@ -7,7 +7,6 @@ import AstalApps from 'gi://AstalApps';
const Applications = AstalApps.Apps.new();
import AstalNotifd from 'gi://AstalNotifd';
const Notifications = AstalNotifd.get_default();
import NotifGestureWrapper from './gesture';
// import SmoothProgress from '../misc/smooth-progress';
@ -94,7 +93,9 @@ export const Notification = ({
popup_timer = 0,
slide_in_from = 'Left' as 'Left' | 'Right',
}): NotifGestureWrapper | undefined => {
const notifObj = Notifications.get_notification(id);
const notifications = AstalNotifd.get_default();
const notifObj = notifications.get_notification(id);
if (!notifObj) {
return;
@ -106,7 +107,7 @@ export const Notification = ({
return;
}
HasNotifs.set(Notifications.get_notifications().length > 0);
HasNotifs.set(notifications.get_notifications().length > 0);
// const progress = SmoothProgress({ className: 'smooth-progress' });

13
nixosModules/ags/config/widgets/notifs/popups.tsx
View file

@ -1,11 +1,13 @@
import AstalNotifd from 'gi://AstalNotifd';
const Notifications = AstalNotifd.get_default();
import NotifGestureWrapper from './gesture';
import { Notification } from './notification';
export default () => (
export default () => {
const notifications = AstalNotifd.get_default();
return (
<box
// Needed so it occupies space at the start
// It needs to be bigger than the notifs to not jiggle
@ -16,7 +18,7 @@ export default () => (
const notifQueue: number[] = [];
const addPopup = (id: number) => {
if (!id || !Notifications.get_notification(id)) {
if (!id || !notifications.get_notification(id)) {
return;
}
@ -58,8 +60,9 @@ export default () => (
};
self
.hook(Notifications, 'notified', (_, id) => addPopup(id))
.hook(Notifications, 'resolved', (_, id) => handleResolved(id));
.hook(notifications, 'notified', (_, id) => addPopup(id))
.hook(notifications, 'resolved', (_, id) => handleResolved(id));
}}
/>
);
};

19
nixosModules/ags/config/widgets/osd/main.tsx
View file

@ -51,6 +51,7 @@ export default () => {
globalThis.popup_osd = popup;
const brightness = Brightness.get_default();
const speaker = AstalWp.get_default()?.audio.default_speaker;
const microphone = AstalWp.get_default()?.audio.default_microphone;
@ -123,29 +124,29 @@ export default () => {
css="margin-bottom: 80px;"
setup={(self) => {
self.hook(Brightness, 'notify::screen-icon', () => {
self.hook(brightness, 'notify::screen-icon', () => {
popup('brightness');
});
}}
>
<box className="osd-item widget">
<icon icon={bind(Brightness, 'screenIcon')} />
<icon icon={bind(brightness, 'screenIcon')} />
<ProgressBar
fraction={bind(Brightness, 'screen')}
fraction={bind(brightness, 'screen')}
valign={Gtk.Align.CENTER}
/>
</box>
</box>
{
Brightness.hasKbd && (
brightness.hasKbd && (
<box
name="keyboard"
css="margin-bottom: 80px;"
setup={(self) => {
self.hook(Brightness, 'notify::kbd-level', () => {
self.hook(brightness, 'notify::kbd-level', () => {
popup('keyboard');
});
}}
@ -154,8 +155,8 @@ export default () => {
<icon icon="keyboard-brightness-symbolic" />
<ProgressBar
fraction={bind(Brightness, 'kbdLevel').as((v) => (v ?? 0) / 2)}
sensitive={bind(Brightness, 'kbdLevel').as((v) => v !== 0)}
fraction={bind(brightness, 'kbdLevel').as((v) => (v ?? 0) / 2)}
sensitive={bind(brightness, 'kbdLevel').as((v) => v !== 0)}
valign={Gtk.Align.CENTER}
/>
</box>
@ -168,13 +169,13 @@ export default () => {
css="margin-bottom: 80px;"
setup={(self) => {
self.hook(Brightness, 'notify::caps-icon', () => {
self.hook(brightness, 'notify::caps-icon', () => {
popup('caps');
});
}}
>
<box className="osd-item widget">
<icon icon={bind(Brightness, 'capsIcon')} />
<icon icon={bind(brightness, 'capsIcon')} />
<label label="Caps Lock" />
</box>

17
nixosModules/ags/config/widgets/screenshot/main.tsx
View file

@ -2,10 +2,7 @@ import { bind, execAsync, Variable } from 'astal';
import { App, Gtk, Widget } from 'astal/gtk3';
import AstalApps from 'gi://AstalApps';
const Applications = AstalApps.Apps.new();
import AstalHyprland from 'gi://AstalHyprland';
const Hyprland = AstalHyprland.get_default();
import PopupWindow from '../misc/popup-window';
import Separator from '../misc/separator';
@ -25,6 +22,8 @@ const takeScreenshot = (selector: string[], delay = 1000): void => {
};
export default () => {
const hyprland = AstalHyprland.get_default();
const windowList = <box vertical /> as Widget.Box;
const updateWindows = async() => {
@ -32,8 +31,10 @@ export default () => {
return;
}
const applications = AstalApps.Apps.new();
windowList.children = (JSON.parse(await hyprMessage('j/clients')) as AstalHyprland.Client[])
.filter((client) => client.workspace.id === Hyprland.get_focused_workspace().get_id())
.filter((client) => client.workspace.id === hyprland.get_focused_workspace().get_id())
.map((client) => (
<button
className="item-btn"
@ -44,7 +45,7 @@ export default () => {
}}
>
<box halign={Gtk.Align.CENTER}>
<icon icon={Applications.fuzzy_query(client.class)[0].iconName} />
<icon icon={applications.fuzzy_query(client.class)[0].iconName} />
<Separator size={ICON_SEP} />
@ -58,8 +59,8 @@ export default () => {
));
};
Hyprland.connect('notify::clients', updateWindows);
Hyprland.connect('notify::focused-workspace', updateWindows);
hyprland.connect('notify::clients', updateWindows);
hyprland.connect('notify::focused-workspace', updateWindows);
const Shown = Variable<string>('monitors');
@ -70,7 +71,7 @@ export default () => {
>
<scrollable name="monitors">
<box vertical>
{bind(Hyprland, 'monitors').as((monitors) => monitors.map((monitor) => (
{bind(hyprland, 'monitors').as((monitors) => monitors.map((monitor) => (
<button
className="item-btn"
cursor="pointer"