chore: update ags and flakes

config/ags/imports.js

@@ -1,10 +1,8 @@
 const resource = file => `resource:///com/github/Aylur/ags/${file}.js`;
 const require = async file => (await import(resource(file))).default;
-const service = async file => (await require(`service/${file}`)).instance;
+const service = async file => (await require(`service/${file}`));
 
 export const App = await require('app');
-App.connect = (...args) => App.instance.connect(...args);
-
 export const Widget = await require('widget');
 export const Service = await require('service');
 export const Variable = await require('variable');

config/ags/js/bar/clock.js

@@ -1,6 +1,5 @@
 import { App, Widget } from '../../imports.js';
 const { Box, Label } = Widget;
-const { toggleWindow } = App;
 
 import GLib from 'gi://GLib';
 const { DateTime } = GLib;
@@ -24,7 +23,7 @@ const ClockModule = ({
 
 export const Clock = EventBox({
   className: 'toggle-off',
-  onPrimaryClickRelease: () => toggleWindow('calendar'),
+  onPrimaryClickRelease: () => App.toggleWindow('calendar'),
   connections: [
     [App, (box, windowName, visible) => {
       if (windowName == 'calendar') {

config/ags/js/bar/gesture.js

@@ -1,6 +1,5 @@
 import { Widget, App } from '../../imports.js';
 const { CenterBox, EventBox } = Widget;
-const { openWindow } = App;
 
 import Gtk from 'gi://Gtk';
 
@@ -24,7 +23,7 @@ export const Gesture = ({
       [gesture, _ => {
         const velocity = gesture.get_velocity()[1];
         if (velocity < -100)
-          openWindow('quick-settings');
+          App.openWindow('quick-settings');
       }, 'update'],
 
     ],

config/ags/js/bar/notif-button.js

@@ -1,6 +1,5 @@
 import { App, Notifications, Widget } from '../../imports.js';
 const { Box, Label, Icon } = Widget;
-const { toggleWindow } = App;
 
 import { Separator } from '../misc/separator.js';
 import { EventBox } from '../misc/cursorbox.js';
@@ -8,7 +7,7 @@ import { EventBox } from '../misc/cursorbox.js';
 
 export const NotifButton = EventBox({
   className: 'toggle-off',
-  onPrimaryClickRelease: () => toggleWindow('notification-center'),
+  onPrimaryClickRelease: () => App.toggleWindow('notification-center'),
   connections: [
     [App, (box, windowName, visible) => {
       if (windowName == 'notification-center') {

config/ags/js/bar/quick-settings.js

@@ -1,13 +1,12 @@
 import { Widget, App } from '../../imports.js';
 const { Box, Label } = Widget;
-const { toggleWindow } = App;
 
 import { EventBox } from '../misc/cursorbox.js';
 
 
 export const QsToggle = EventBox({
   className: 'toggle-off',
-  onPrimaryClickRelease: () => toggleWindow('quick-settings'),
+  onPrimaryClickRelease: () => App.toggleWindow('quick-settings'),
   connections: [
     [App, (box, windowName, visible) => {
       if (windowName == 'quick-settings') {

config/ags/js/misc/closer.js

@@ -1,6 +1,5 @@
 import { App, Widget } from '../../imports.js';
 const { Window, EventBox } = Widget;
-const { closeWindow } = App;
 
 const ALWAYS_OPEN = [
   'closer',
@@ -13,9 +12,9 @@ const ALWAYS_OPEN = [
 export const closeAll = () => {
   App.windows.forEach(w => {
     if (!ALWAYS_OPEN.some(window => window === w.name))
-      closeWindow(w.name)
+      App.closeWindow(w.name)
   });
-  closeWindow('closer');
+  App.closeWindow('closer');
 };
 
 export const Closer = Window({
@@ -29,7 +28,7 @@ export const Closer = Window({
     connections: [[App, (_b, _w, _v) => {
       if (!Array.from(App.windows).some(w => w[1].visible &&
         !ALWAYS_OPEN.some(window => window === w[0]))) {
-        closeWindow('closer');
+        App.closeWindow('closer');
       }
     }]],
   }),

config/ags/js/misc/popup.js

@@ -1,6 +1,5 @@
 import { App, Widget } from '../../imports.js';
 const { Revealer, Box, Window } = Widget;
-const { openWindow } = App;
 
 
 export const PopupWindow = ({
@@ -25,7 +24,7 @@ export const PopupWindow = ({
           revealer.reveal_child = visible;
 
           if (visible && name !== 'overview')
-            openWindow('closer');
+            App.openWindow('closer');
         }
       }]],
       child: child,

config/ags/js/notifications/center.js

@@ -1,7 +1,6 @@
 import { Notifications, App, Utils, Widget } from '../../imports.js';
 const { Button, Label, Box, Icon, Scrollable, Revealer } = Widget;
 const { timeout } = Utils;
-const { getWindow } = App;
 
 import Notification from './base.js';
 import { EventBox } from '../misc/cursorbox.js';
@@ -26,7 +25,7 @@ const ClearButton = () => EventBox({
         button._notifList = NotificationList;
 
       if (!button._popups)
-        button._popups = getWindow('notifications').child.children[0].child;
+        button._popups = App.getWindow('notifications').child.children[0].child;
 
       button.sensitive = Notifications.notifications.length > 0;
     }]],

config/ags/js/overview/clients.js

@@ -1,6 +1,5 @@
 import { App, Hyprland, Utils, Widget } from '../../imports.js';
 const { Icon, Revealer } = Widget;
-const { closeWindow } = App;
 const { execAsync } = Utils;
 
 import { WindowButton } from './dragndrop.js';
@@ -22,6 +21,7 @@ const Client = (client, active, clients) => {
   let wsId = client.workspace.id;
   let addr = `address:${client.address}`;
 
+  // FIXME: special workspaces not closing when in one and clicking on normal client
   return Revealer({
     transition: 'crossfade',
     setup: rev => rev.revealChild = true,
@@ -37,13 +37,13 @@ const Client = (client, active, clients) => {
           if (client.workspace.name === 'special') {
             execAsync(`hyprctl dispatch movetoworkspacesilent special:${wsId},${addr}`).then(
               execAsync(`hyprctl dispatch togglespecialworkspace ${wsId}`).then(
-                () => closeWindow('overview')
+                () => App.closeWindow('overview')
               ).catch(print)
             ).catch(print);
           }
           else {
             execAsync(`hyprctl dispatch togglespecialworkspace ${wsName}`).then(
-              () => closeWindow('overview')
+              () => App.closeWindow('overview')
             ).catch(print);
           }
         }
@@ -56,7 +56,7 @@ const Client = (client, active, clients) => {
             execAsync(`hyprctl dispatch togglespecialworkspace ${wsName}`).catch(print);
           }
           execAsync(`hyprctl dispatch focuswindow ${addr}`).then(
-            () => closeWindow('overview')
+            () => App.closeWindow('overview')
           ).catch(print);
         }
       },

config/ags/js/overview/dragndrop.js

@@ -1,7 +1,6 @@
 import { App, Utils, Widget } from '../../imports.js';
 const { EventBox } = Widget;
 const { execAsync } = Utils;
-const { getWindow } = App;
 
 import Gtk from 'gi://Gtk';
 import Gdk from 'gi://Gdk';
@@ -66,7 +65,7 @@ export const WindowButton = ({address, ...params} = {}) => Button({
     button.connect('drag-end', () => {
       button.get_parent().destroy();
 
-      let mainBox = getWindow('overview').child.children[0].child;
+      let mainBox = App.getWindow('overview').child.children[0].child;
       updateClients(mainBox);
     });
   },

config/ags/js/quick-settings/button-grid.js

@@ -1,7 +1,6 @@
 import { Network, Bluetooth, Audio, App, Utils, Widget } from '../../imports.js';
 const { Box, CenterBox, Label, Icon } = Widget;
 const { execAsync } = Utils;
-const { openWindow } = App;
 
 import { EventBox } from '../misc/cursorbox.js';
 
@@ -190,7 +189,7 @@ const SecondRow = Box({
 
     GridButton({
       command: () => execAsync(['bash', '-c', '$LOCK_PATH/lock.sh']).catch(print),
-      secondaryCommand: () => openWindow('powermenu'),
+      secondaryCommand: () => App.openWindow('powermenu'),
       icon: Label({
         className: 'grid-label',
         label: " 󰌾 ",