Initial commit

fix: build output (#1032 )
* Fix build output * Fix command
2025-11-10 10:56:42 +01:00 · 2025-06-27 22:17:47 -07:00 · 2025-06-27 19:48:53 -07:00 · 2025-06-27 19:18:44 -07:00 · 2025-06-22 11:46:56 -07:00 · 2025-06-20 23:13:09 -07:00
19 changed files with 4483 additions and 4310 deletions
--- a/README.md
+++ b/README.md
@@ -194,7 +194,7 @@ Once you've set up the overlay, you can reference HyprPanel with `pkgs.hyprpanel
 # install it as a system package
 environment.systemPackages = with pkgs; [
  # ...
-  inputs.hyprpanel.packages.${pkgs.system}.wrapper # this one if you want to avoid overlays/didn't enable them
+  inputs.hyprpanel.packages.${pkgs.system}.default # this one if you want to avoid overlays/didn't enable them
  hyprpanel
  # ...
 ];
@@ -202,7 +202,7 @@ environment.systemPackages = with pkgs; [
 # or install it as a user package
 users.users.<username>.packages = with pkgs; [
  # ...
-  inputs.hyprpanel.packages.${pkgs.system}.wrapper # this one if you want to avoid overlays/didn't enable them
+  inputs.hyprpanel.packages.${pkgs.system}.default # this one if you want to avoid overlays/didn't enable them
  hyprpanel
  # ...
 ];
@@ -213,7 +213,7 @@ users.users.<username>.packages = with pkgs; [
 # install it as a user package with home-manager
 home.packages = with pkgs; [
  # ...
-  inputs.hyprpanel.packages.${pkgs.system}.wrapper # this one if you want to avoid overlays/didn't enable them
+  inputs.hyprpanel.packages.${pkgs.system}.default # this one if you want to avoid overlays/didn't enable them
  hyprpanel
  # ...
 ];
--- a/app.ts
+++ b/app.ts
@@ -6,7 +6,7 @@ import { runCLI } from 'src/services/cli/commander';
 import { InitializationService } from 'src/core/initialization';

 App.start({
-    instanceName: 'hyprpanel',
+  instanceName: 'hyprpanel-levl',
  requestHandler: (request: string, res: (response: unknown) => void) => runCLI(request, res),
  main: () => InitializationService.initialize(),
 });
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,6 @@
 {
  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    
    astal = {
      url = "github:aylur/astal";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -120,37 +119,38 @@
          pkgs = nixpkgs.legacyPackages.${system};
        in
        {
-          default = ags.lib.bundle {
+          unwrapped = ags.lib.bundle {
            inherit pkgs;
            src = ./.;
            name = "hyprpanel"; # name of executable
            entry = "app.ts";

            extraPackages = packages system pkgs;
-              
          };
+
+          default = self.packages.${pkgs.stdenv.system}.wrapper;
+
          # Make a wrapper package to avoid overlay
          wrapper = pkgs.writeShellScriptBin "hyprpanel" ''
            # Exporting glib-networking modules
            export GIO_EXTRA_MODULES="${pkgs.glib-networking}/lib/gio/modules"
            if [ "$#" -eq 0 ]; then
-                exec ${self.packages.${pkgs.stdenv.system}.default}/bin/hyprpanel
+                exec ${self.packages.${pkgs.stdenv.system}.unwrapped}/bin/hyprpanel
            else
-                exec ${ags.packages.${pkgs.stdenv.system}.io}/bin/astal -i hyprpanel "$@"
+                exec ${ags.packages.${pkgs.stdenv.system}.io}/bin/astal -i hyprpanel "$*"
            fi
          '';
        }
      );

      # Define .overlay to expose the package as pkgs.hyprpanel based on the system
-      overlay = final: prev: {
-        hyprpanel = prev.writeShellScriptBin "hyprpanel" ''
-          if [ "$#" -eq 0 ]; then
-              exec ${self.packages.${final.stdenv.system}.default}/bin/hyprpanel
-          else
-              exec ${ags.packages.${final.stdenv.system}.io}/bin/astal -i hyprpanel "$@"
-          fi
-        '';
+      overlay =
+        final: prev:
+        let
+          pkgs = final;
+        in
+        {
+          hyprpanel = self.packages.${pkgs.stdenv.system}.wrapper;
        };

      homeManagerModules.hyprpanel = import ./nix/module.nix self;
--- a/meson.build
+++ b/meson.build
@@ -18,12 +18,13 @@ custom_target(
  command: [
    ags,
    'bundle',
+    '--gtk', '3',
    '--define', 'DATADIR="' + datadir + '"',
    '--root', meson.project_source_root(),
    meson.project_source_root() / 'app.ts',
    '@OUTPUT@',
  ],
-  output: meson.project_name() + '.js',
+  output: 'hyprpanel-app',
  install: true,
  install_dir: datadir,
  build_always_stale: true,
--- a/nix/module.nix
+++ b/nix/module.nix
@@ -605,7 +605,7 @@ in
      theme.font.size = mkStrOption "1.2rem";
      theme.font.weight = mkIntOption 600;
      theme.matugen = mkBoolOption false;
-      theme.matugen_settings.contrast = mkIntOption 0;
+      theme.matugen_settings.contrast = mkFloatOption 0.0;
      theme.matugen_settings.mode = mkStrOption "dark";
      theme.matugen_settings.scheme_type = mkStrOption "tonal-spot";
      theme.matugen_settings.variation = mkStrOption "standard_1";
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
        "typescript": "5.7.3"
      }
    },
-        "../../../../usr/share/astal/gjs": {
+    "../../../usr/share/astal/gjs": {
      "name": "astal",
      "license": "LGPL-2.1"
    },
@@ -117,9 +117,9 @@
      }
    },
    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -177,9 +177,9 @@
      }
    },
    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -223,9 +223,9 @@
      "license": "BSD-3-Clause"
    },
    "node_modules/@napi-rs/wasm-runtime": {
-            "version": "0.2.10",
-            "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.10.tgz",
-            "integrity": "sha512-bCsCyeZEwVErsGmyPNSzwfwFn4OdxBj0mmv6hOFucB/k81Ojdu68RbZdxYsRQUPc9l6SU5F/cG+bXgWs3oUgsQ==",
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.11.tgz",
+      "integrity": "sha512-9DPkXtvHydrcOsopiYpUgPHpmj0HWZKMUnL2dZqpvC42lsratuBG06V5ipyno0fUek5VlFsNQ+AcFATSrJXgMA==",
      "dev": true,
      "license": "MIT",
      "optional": true,
@@ -274,9 +274,9 @@
      }
    },
    "node_modules/@oxc-resolver/binding-darwin-arm64": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-9.0.2.tgz",
-            "integrity": "sha512-MVyRgP2gzJJtAowjG/cHN3VQXwNLWnY+FpOEsyvDepJki1SdAX/8XDijM1yN6ESD1kr9uhBKjGelC6h3qtT+rA==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.3.0.tgz",
+      "integrity": "sha512-iEvscsg+grOxFpEzJE9nBhfMRwtfy2gd7tAPASusFhISteqSOzTcNdQwo4L/jWE1wt9SQF1BXs/6QHJbldWRVQ==",
      "cpu": [
        "arm64"
      ],
@@ -288,9 +288,9 @@
      ]
    },
    "node_modules/@oxc-resolver/binding-darwin-x64": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-9.0.2.tgz",
-            "integrity": "sha512-7kV0EOFEZ3sk5Hjy4+bfA6XOQpCwbDiDkkHN4BHHyrBHsXxUR05EcEJPPL1WjItefg+9+8hrBmoK0xRoDs41+A==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.3.0.tgz",
+      "integrity": "sha512-dalUsxrsnZ69esao4qiIL0clK5d9qaRJVr+v+Bn4yGMk5o0B8eQP5lVzv6MiW5czQJpIO648CtsIXi0RLC7r7Q==",
      "cpu": [
        "x64"
      ],
@@ -302,9 +302,9 @@
      ]
    },
    "node_modules/@oxc-resolver/binding-freebsd-x64": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-9.0.2.tgz",
-            "integrity": "sha512-6OvkEtRXrt8sJ4aVfxHRikjain9nV1clIsWtJ1J3J8NG1ZhjyJFgT00SCvqxbK+pzeWJq6XzHyTCN78ML+lY2w==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.3.0.tgz",
+      "integrity": "sha512-g3jirS9hGMeKvSgTWujiRpSXtBcIYj0545sY0XIkG37mCP4oIh94/ykrR60JuN8YjUSfYc+7UV6We5dP8+fzJQ==",
      "cpu": [
        "x64"
      ],
@@ -316,9 +316,9 @@
      ]
    },
    "node_modules/@oxc-resolver/binding-linux-arm-gnueabihf": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-9.0.2.tgz",
-            "integrity": "sha512-aYpNL6o5IRAUIdoweW21TyLt54Hy/ZS9tvzNzF6ya1ckOQ8DLaGVPjGpmzxdNja9j/bbV6aIzBH7lNcBtiOTkQ==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.3.0.tgz",
+      "integrity": "sha512-KO2key+SCiCJTyq8IFzl0WjonqtFPR0HLWTY8GnMENjBhY9o8P8LrNQ1rJVamRMMqFpCkOlKo4VAj2jMf6wqDQ==",
      "cpu": [
        "arm"
      ],
@@ -330,9 +330,9 @@
      ]
    },
    "node_modules/@oxc-resolver/binding-linux-arm64-gnu": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-9.0.2.tgz",
-            "integrity": "sha512-RGFW4vCfKMFEIzb9VCY0oWyyY9tR1/o+wDdNePhiUXZU4SVniRPQaZ1SJ0sUFI1k25pXZmzQmIP6cBmazi/Dew==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.3.0.tgz",
+      "integrity": "sha512-nyAukSnWeA9K7Dot/52G1zvZiJAj3guW2AbiqDGv5awtEitOpBrppGsIbMli3sNU/tXOKnX5HJn43s/3ciYEgA==",
      "cpu": [
        "arm64"
      ],
@@ -344,9 +344,9 @@
      ]
    },
    "node_modules/@oxc-resolver/binding-linux-arm64-musl": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-9.0.2.tgz",
-            "integrity": "sha512-lxx/PibBfzqYvut2Y8N2D0Ritg9H8pKO+7NUSJb9YjR/bfk2KRmP8iaUz3zB0JhPtf/W3REs65oKpWxgflGToA==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.3.0.tgz",
+      "integrity": "sha512-Aj2GAqX6vuUmTNZjvz10d2DMdzmEdrT3Oh1ac/+WE16rsnhD8liieLVM9ss/9jfiybHq/et3TsdBusdfG2BImA==",
      "cpu": [
        "arm64"
      ],
@@ -358,9 +358,9 @@
      ]
    },
    "node_modules/@oxc-resolver/binding-linux-riscv64-gnu": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-9.0.2.tgz",
-            "integrity": "sha512-yD28ptS/OuNhwkpXRPNf+/FvrO7lwURLsEbRVcL1kIE0GxNJNMtKgIE4xQvtKDzkhk6ZRpLho5VSrkkF+3ARTQ==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.3.0.tgz",
+      "integrity": "sha512-rkdVhNkMzwpGV94o5Q+AdUNPlhEm38r/mAQpbvIQrWO59XQAM6OpVqi7W0Y45wwSbeFAoPdOwWCEZC6USREkZw==",
      "cpu": [
        "riscv64"
      ],
@@ -372,9 +372,9 @@
      ]
    },
    "node_modules/@oxc-resolver/binding-linux-s390x-gnu": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-9.0.2.tgz",
-            "integrity": "sha512-WBwEJdspoga2w+aly6JVZeHnxuPVuztw3fPfWrei2P6rNM5hcKxBGWKKT6zO1fPMCB4sdDkFohGKkMHVV1eryQ==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.3.0.tgz",
+      "integrity": "sha512-NAOvR5pgPV1o7C9KwEUSmPQ+bxQOBKRXlQPRfcaCb0pZe/rhKqps/T3UCOKqVTp0dUwdCIcM11Ybs/wp6tzWbQ==",
      "cpu": [
        "s390x"
      ],
@@ -386,9 +386,9 @@
      ]
    },
    "node_modules/@oxc-resolver/binding-linux-x64-gnu": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-9.0.2.tgz",
-            "integrity": "sha512-a2z3/cbOOTUq0UTBG8f3EO/usFcdwwXnCejfXv42HmV/G8GjrT4fp5+5mVDoMByH3Ce3iVPxj1LmS6OvItKMYQ==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.3.0.tgz",
+      "integrity": "sha512-rqfo/XwsVj/OW1LPaQiaTyOEPD+pp7CX9rIrnUDfa4DWA4GUpRSlH+9VXX/zYt3lbNaWayWvy0dTwZ59cQTUgQ==",
      "cpu": [
        "x64"
      ],
@@ -400,9 +400,9 @@
      ]
    },
    "node_modules/@oxc-resolver/binding-linux-x64-musl": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-9.0.2.tgz",
-            "integrity": "sha512-bHZF+WShYQWpuswB9fyxcgMIWVk4sZQT0wnwpnZgQuvGTZLkYJ1JTCXJMtaX5mIFHf69ngvawnwPIUA4Feil0g==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.3.0.tgz",
+      "integrity": "sha512-td0T/dunQrv4Yq3OcwYeOorJDt/kmG1/69D0tvPeZ6HhErG/fRPWKOSpKKlg5scMKEbII7qBJO0Msdc5MzWTBw==",
      "cpu": [
        "x64"
      ],
@@ -414,9 +414,9 @@
      ]
    },
    "node_modules/@oxc-resolver/binding-wasm32-wasi": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-9.0.2.tgz",
-            "integrity": "sha512-I5cSgCCh5nFozGSHz+PjIOfrqW99eUszlxKLgoNNzQ1xQ2ou9ZJGzcZ94BHsM9SpyYHLtgHljmOZxCT9bgxYNA==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.3.0.tgz",
+      "integrity": "sha512-bpzvfpPmjMJ6D9I2htHU8M087D/rruubcCJOG/3cjLeHtGxsucEP8i8nazigWydLsZqU3cEkPSJwUJENI2/Pyg==",
      "cpu": [
        "wasm32"
      ],
@@ -424,16 +424,16 @@
      "license": "MIT",
      "optional": true,
      "dependencies": {
-                "@napi-rs/wasm-runtime": "^0.2.9"
+        "@napi-rs/wasm-runtime": "^0.2.11"
      },
      "engines": {
        "node": ">=14.0.0"
      }
    },
    "node_modules/@oxc-resolver/binding-win32-arm64-msvc": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-9.0.2.tgz",
-            "integrity": "sha512-5IhoOpPr38YWDWRCA5kP30xlUxbIJyLAEsAK7EMyUgqygBHEYLkElaKGgS0X5jRXUQ6l5yNxuW73caogb2FYaw==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.3.0.tgz",
+      "integrity": "sha512-pmwT5jVufkLWEAxEKDWKlB2hHDRNS3TAYGjzyezAMGPx9qvI3rYIikZsUozyCYhp1TlTgxBB70R9Ma2vXQ6vVw==",
      "cpu": [
        "arm64"
      ],
@@ -445,9 +445,9 @@
      ]
    },
    "node_modules/@oxc-resolver/binding-win32-x64-msvc": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-9.0.2.tgz",
-            "integrity": "sha512-Qc40GDkaad9rZksSQr2l/V9UubigIHsW69g94Gswc2sKYB3XfJXfIfyV8WTJ67u6ZMXsZ7BH1msSC6Aen75mCg==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.3.0.tgz",
+      "integrity": "sha512-QvgzwCpoSpDTjFC/7pGPFGZDWRr52pOfTbuWfPwTQH+Jo/iCrQmh1Q8Yg81eED7dnPjdivDlXoM0iMgBz1gDBg==",
      "cpu": [
        "x64"
      ],
@@ -459,9 +459,9 @@
      ]
    },
    "node_modules/@pkgr/core": {
-            "version": "0.2.4",
-            "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.4.tgz",
-            "integrity": "sha512-ROFF39F6ZrnzSUEmQQZUar0Jt4xVoP9WnDRdWwF4NNcXs3xBTLgBUDoOwW141y1jP+S8nahIbdxbFC7IShw9Iw==",
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.7.tgz",
+      "integrity": "sha512-YLT9Zo3oNPJoBjBc4q8G2mjU4tqIbf5CEOORbUUr48dCD9q3umJ3IPlVqOqDakPfd2HuwccBaqlGhN4Gmr5OWg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -497,9 +497,9 @@
      "license": "MIT"
    },
    "node_modules/@types/node": {
-            "version": "22.15.21",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz",
-            "integrity": "sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==",
+      "version": "22.15.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.34.tgz",
+      "integrity": "sha512-8Y6E5WUupYy1Dd0II32BsWAx5MWdcnRd8L84Oys3veg1YrYtNtzgO4CFhiBg6MDSjk7Ay36HYOnU7/tuOzIzcw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -507,17 +507,17 @@
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.32.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
-            "integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
+      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.32.1",
-                "@typescript-eslint/type-utils": "8.32.1",
-                "@typescript-eslint/utils": "8.32.1",
-                "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/type-utils": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
        "graphemer": "^1.4.0",
        "ignore": "^7.0.0",
        "natural-compare": "^1.4.0",
@@ -531,22 +531,22 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-                "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "@typescript-eslint/parser": "^8.35.1",
        "eslint": "^8.57.0 || ^9.0.0",
        "typescript": ">=4.8.4 <5.9.0"
      }
    },
    "node_modules/@typescript-eslint/parser": {
-            "version": "8.32.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
-            "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
+      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-                "@typescript-eslint/scope-manager": "8.32.1",
-                "@typescript-eslint/types": "8.32.1",
-                "@typescript-eslint/typescript-estree": "8.32.1",
-                "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
        "debug": "^4.3.4"
      },
      "engines": {
@@ -561,15 +561,37 @@
        "typescript": ">=4.8.4 <5.9.0"
      }
    },
-        "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.32.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
-            "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
+      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-                "@typescript-eslint/types": "8.32.1",
-                "@typescript-eslint/visitor-keys": "8.32.1"
+        "@typescript-eslint/tsconfig-utils": "^8.35.1",
+        "@typescript-eslint/types": "^8.35.1",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
+      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -579,15 +601,32 @@
        "url": "https://opencollective.com/typescript-eslint"
      }
    },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
+      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
    "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.32.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz",
-            "integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
+      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.32.1",
-                "@typescript-eslint/utils": "8.32.1",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
        "debug": "^4.3.4",
        "ts-api-utils": "^2.1.0"
      },
@@ -604,9 +643,9 @@
      }
    },
    "node_modules/@typescript-eslint/types": {
-            "version": "8.32.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
-            "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
+      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -618,14 +657,16 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.32.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
-            "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
+      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-                "@typescript-eslint/types": "8.32.1",
-                "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/project-service": "8.35.1",
+        "@typescript-eslint/tsconfig-utils": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
        "debug": "^4.3.4",
        "fast-glob": "^3.3.2",
        "is-glob": "^4.0.3",
@@ -645,16 +686,16 @@
      }
    },
    "node_modules/@typescript-eslint/utils": {
-            "version": "8.32.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
-            "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
+      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.7.0",
-                "@typescript-eslint/scope-manager": "8.32.1",
-                "@typescript-eslint/types": "8.32.1",
-                "@typescript-eslint/typescript-estree": "8.32.1"
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -669,14 +710,14 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.32.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
-            "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
+      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-                "@typescript-eslint/types": "8.32.1",
-                "eslint-visitor-keys": "^4.2.0"
+        "@typescript-eslint/types": "8.35.1",
+        "eslint-visitor-keys": "^4.2.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -687,9 +728,9 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
      "dev": true,
      "license": "Apache-2.0",
      "engines": {
@@ -707,9 +748,9 @@
      "license": "ISC"
    },
    "node_modules/acorn": {
-            "version": "8.14.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-            "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -797,18 +838,20 @@
      }
    },
    "node_modules/array-includes": {
-            "version": "3.1.8",
-            "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
-            "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
+      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-                "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
        "define-properties": "^1.2.1",
-                "es-abstract": "^1.23.2",
-                "es-object-atoms": "^1.0.0",
-                "get-intrinsic": "^1.2.4",
-                "is-string": "^1.0.7"
+        "es-abstract": "^1.24.0",
+        "es-object-atoms": "^1.1.1",
+        "get-intrinsic": "^1.3.0",
+        "is-string": "^1.1.1",
+        "math-intrinsics": "^1.1.0"
      },
      "engines": {
        "node": ">= 0.4"
@@ -900,7 +943,7 @@
      }
    },
    "node_modules/astal": {
-            "resolved": "../../../../usr/share/astal/gjs",
+      "resolved": "../../../usr/share/astal/gjs",
      "link": true
    },
    "node_modules/async-function": {
@@ -937,9 +980,9 @@
      "license": "MIT"
    },
    "node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1222,9 +1265,9 @@
      }
    },
    "node_modules/es-abstract": {
-            "version": "1.23.10",
-            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.10.tgz",
-            "integrity": "sha512-MtUbM072wlJNyeYAe0mhzrD+M6DIJa96CZAOBBrhDbgKnB4MApIKefcyAB1eOdYn8cUNZgvwBvEzdoAYsxgEIw==",
+      "version": "1.24.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1255,7 +1298,9 @@
        "is-array-buffer": "^3.0.5",
        "is-callable": "^1.2.7",
        "is-data-view": "^1.0.2",
+        "is-negative-zero": "^2.0.3",
        "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
        "is-shared-array-buffer": "^1.0.4",
        "is-string": "^1.1.1",
        "is-typed-array": "^1.1.15",
@@ -1270,6 +1315,7 @@
        "safe-push-apply": "^1.0.0",
        "safe-regex-test": "^1.1.0",
        "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
        "string.prototype.trim": "^1.2.10",
        "string.prototype.trimend": "^1.0.9",
        "string.prototype.trimstart": "^1.0.8",
@@ -1473,9 +1519,9 @@
      }
    },
    "node_modules/eslint-module-utils": {
-            "version": "2.12.0",
-            "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
-            "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz",
+      "integrity": "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1501,30 +1547,30 @@
      }
    },
    "node_modules/eslint-plugin-import": {
-            "version": "2.31.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
-            "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
+      "version": "2.32.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
+      "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@rtsao/scc": "^1.1.0",
-                "array-includes": "^3.1.8",
-                "array.prototype.findlastindex": "^1.2.5",
-                "array.prototype.flat": "^1.3.2",
-                "array.prototype.flatmap": "^1.3.2",
+        "array-includes": "^3.1.9",
+        "array.prototype.findlastindex": "^1.2.6",
+        "array.prototype.flat": "^1.3.3",
+        "array.prototype.flatmap": "^1.3.3",
        "debug": "^3.2.7",
        "doctrine": "^2.1.0",
        "eslint-import-resolver-node": "^0.3.9",
-                "eslint-module-utils": "^2.12.0",
+        "eslint-module-utils": "^2.12.1",
        "hasown": "^2.0.2",
-                "is-core-module": "^2.15.1",
+        "is-core-module": "^2.16.1",
        "is-glob": "^4.0.3",
        "minimatch": "^3.1.2",
        "object.fromentries": "^2.0.8",
        "object.groupby": "^1.0.3",
-                "object.values": "^1.2.0",
+        "object.values": "^1.2.1",
        "semver": "^6.3.1",
-                "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimend": "^1.0.9",
        "tsconfig-paths": "^3.15.0"
      },
      "engines": {
@@ -1535,9 +1581,9 @@
      }
    },
    "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1618,14 +1664,14 @@
      }
    },
    "node_modules/eslint-plugin-prettier": {
-            "version": "5.4.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.0.tgz",
-            "integrity": "sha512-BvQOvUhkVQM1i63iMETK9Hjud9QhqBnbtT1Zc642p9ynzBuCe5pybkOnvqZIBypXmMlsGcnU4HZ8sCTPfpAexA==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.1.tgz",
+      "integrity": "sha512-dobTkHT6XaEVOo8IO90Q4DOSxnm3Y151QxPJlM/vKC0bVy+d6cVWQZLlFiuZPP0wS6vZwSKeJgKkcS+KfMBlRw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "prettier-linter-helpers": "^1.0.0",
-                "synckit": "^0.11.0"
+        "synckit": "^0.11.7"
      },
      "engines": {
        "node": "^14.18.0 || >=16.0.0"
@@ -1679,9 +1725,9 @@
      }
    },
    "node_modules/eslint/node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1845,13 +1891,13 @@
      }
    },
    "node_modules/fd-package-json": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/fd-package-json/-/fd-package-json-1.2.0.tgz",
-            "integrity": "sha512-45LSPmWf+gC5tdCQMNH4s9Sr00bIkiD9aN7dc5hqkrEw1geRYyDQS1v1oMHAW3ysfxfndqGsrDREHHjNNbKUfA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fd-package-json/-/fd-package-json-2.0.0.tgz",
+      "integrity": "sha512-jKmm9YtsNXN789RS/0mSzOC1NUq9mkVd65vbSSVsKdjGvYXBuE4oWe2QOEoFeRmJg+lPuZxpmrfFclNhoRMneQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-                "walk-up-path": "^3.0.1"
+        "walk-up-path": "^4.0.0"
      }
    },
    "node_modules/file-entry-cache": {
@@ -1936,13 +1982,13 @@
      }
    },
    "node_modules/formatly": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/formatly/-/formatly-0.2.3.tgz",
-            "integrity": "sha512-WH01vbXEjh9L3bqn5V620xUAWs32CmK4IzWRRY6ep5zpa/mrisL4d9+pRVuETORVDTQw8OycSO1WC68PL51RaA==",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/formatly/-/formatly-0.2.4.tgz",
+      "integrity": "sha512-lIN7GpcvX/l/i24r/L9bnJ0I8Qn01qijWpQpDDvTLL29nKqSaJJu4h20+7VJ6m2CAhQ2/En/GbxDiHCzq/0MyA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-                "fd-package-json": "^1.2.0"
+        "fd-package-json": "^2.0.0"
      },
      "bin": {
        "formatly": "bin/index.mjs"
@@ -2092,9 +2138,9 @@
      }
    },
    "node_modules/glob/node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -2263,9 +2309,9 @@
      }
    },
    "node_modules/ignore": {
-            "version": "7.0.4",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz",
-            "integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -2539,6 +2585,19 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
    "node_modules/is-number": {
      "version": "7.0.0",
      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -2803,9 +2862,9 @@
      }
    },
    "node_modules/knip": {
-            "version": "5.58.1",
-            "resolved": "https://registry.npmjs.org/knip/-/knip-5.58.1.tgz",
-            "integrity": "sha512-9FKnuGhGFZ8wDgcjEYQ6btMmtGHa7dkvNU2ZHuMcv2NaxL7xDeFXZKjETbaiJBjWnLytrDXrh7a58lGXcE0Zfw==",
+      "version": "5.61.3",
+      "resolved": "https://registry.npmjs.org/knip/-/knip-5.61.3.tgz",
+      "integrity": "sha512-8iSz8i8ufIjuUwUKzEwye7ROAW0RzCze7T770bUiz0PKL+SSwbs4RS32fjMztLwcOzSsNPlXdUAeqmkdzXxJ1Q==",
      "dev": true,
      "funding": [
        {
@@ -2825,15 +2884,15 @@
      "dependencies": {
        "@nodelib/fs.walk": "^1.2.3",
        "fast-glob": "^3.3.3",
-                "formatly": "^0.2.3",
+        "formatly": "^0.2.4",
        "jiti": "^2.4.2",
        "js-yaml": "^4.1.0",
        "minimist": "^1.2.8",
-                "oxc-resolver": "^9.0.2",
-                "picocolors": "^1.1.0",
+        "oxc-resolver": "^11.1.0",
+        "picocolors": "^1.1.1",
        "picomatch": "^4.0.1",
-                "smol-toml": "^1.3.1",
-                "strip-json-comments": "5.0.1",
+        "smol-toml": "^1.3.4",
+        "strip-json-comments": "5.0.2",
        "zod": "^3.22.4",
        "zod-validation-error": "^3.0.3"
      },
@@ -2850,9 +2909,9 @@
      }
    },
    "node_modules/knip/node_modules/strip-json-comments": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
-            "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.2.tgz",
+      "integrity": "sha512-4X2FR3UwhNUE9G49aIsJW5hRRR3GXGTBTZRMfv568O60ojM8HcWjV/VxAxCDW3SUND33O6ZY66ZuRcdkj73q2g==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3130,28 +3189,28 @@
      }
    },
    "node_modules/oxc-resolver": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-9.0.2.tgz",
-            "integrity": "sha512-w838ygc1p7rF+7+h5vR9A+Y9Fc4imy6C3xPthCMkdFUgFvUWkmABeNB8RBDQ6+afk44Q60/UMMQ+gfDUW99fBA==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-11.3.0.tgz",
+      "integrity": "sha512-Hd7oMoyyJrZyjNxXAhawmn+JQxUY0W3yK3kmoVZGJpY09g82ijRKKkqjKIbgly6Hc4WCfeb+2dQIKe7jO8j7/Q==",
      "dev": true,
      "license": "MIT",
      "funding": {
        "url": "https://github.com/sponsors/Boshen"
      },
      "optionalDependencies": {
-                "@oxc-resolver/binding-darwin-arm64": "9.0.2",
-                "@oxc-resolver/binding-darwin-x64": "9.0.2",
-                "@oxc-resolver/binding-freebsd-x64": "9.0.2",
-                "@oxc-resolver/binding-linux-arm-gnueabihf": "9.0.2",
-                "@oxc-resolver/binding-linux-arm64-gnu": "9.0.2",
-                "@oxc-resolver/binding-linux-arm64-musl": "9.0.2",
-                "@oxc-resolver/binding-linux-riscv64-gnu": "9.0.2",
-                "@oxc-resolver/binding-linux-s390x-gnu": "9.0.2",
-                "@oxc-resolver/binding-linux-x64-gnu": "9.0.2",
-                "@oxc-resolver/binding-linux-x64-musl": "9.0.2",
-                "@oxc-resolver/binding-wasm32-wasi": "9.0.2",
-                "@oxc-resolver/binding-win32-arm64-msvc": "9.0.2",
-                "@oxc-resolver/binding-win32-x64-msvc": "9.0.2"
+        "@oxc-resolver/binding-darwin-arm64": "11.3.0",
+        "@oxc-resolver/binding-darwin-x64": "11.3.0",
+        "@oxc-resolver/binding-freebsd-x64": "11.3.0",
+        "@oxc-resolver/binding-linux-arm-gnueabihf": "11.3.0",
+        "@oxc-resolver/binding-linux-arm64-gnu": "11.3.0",
+        "@oxc-resolver/binding-linux-arm64-musl": "11.3.0",
+        "@oxc-resolver/binding-linux-riscv64-gnu": "11.3.0",
+        "@oxc-resolver/binding-linux-s390x-gnu": "11.3.0",
+        "@oxc-resolver/binding-linux-x64-gnu": "11.3.0",
+        "@oxc-resolver/binding-linux-x64-musl": "11.3.0",
+        "@oxc-resolver/binding-wasm32-wasi": "11.3.0",
+        "@oxc-resolver/binding-win32-arm64-msvc": "11.3.0",
+        "@oxc-resolver/binding-win32-x64-msvc": "11.3.0"
      }
    },
    "node_modules/p-limit": {
@@ -3277,9 +3336,9 @@
      }
    },
    "node_modules/prettier": {
-            "version": "3.5.3",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-            "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -3680,9 +3739,9 @@
      }
    },
    "node_modules/smol-toml": {
-            "version": "1.3.4",
-            "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.3.4.tgz",
-            "integrity": "sha512-UOPtVuYkzYGee0Bd2Szz8d2G3RfMfJ2t3qVdZUAozZyAk+a0Sxa+QKix0YCwjL/A1RR0ar44nCxaoN9FxdJGwA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.4.1.tgz",
+      "integrity": "sha512-CxdwHXyYTONGHThDbq5XdwbFsuY4wlClRGejfE2NtwUtiHYsP1QtNsHb/hnj31jKYSchztJsaA8pSQoVzkfCFg==",
      "dev": true,
      "license": "BSD-3-Clause",
      "engines": {
@@ -3692,6 +3751,20 @@
        "url": "https://github.com/sponsors/cyyynthia"
      }
    },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
    "node_modules/string.prototype.trim": {
      "version": "1.2.10",
      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
@@ -3814,9 +3887,9 @@
      }
    },
    "node_modules/synckit": {
-            "version": "0.11.6",
-            "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.6.tgz",
-            "integrity": "sha512-2pR2ubZSV64f/vqm9eLPz/KOvR9Dm+Co/5ChLgeHl0yEDRc6h5hXHoxEQH8Y5Ljycozd3p1k5TTSVdzYGkPvLw==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.8.tgz",
+      "integrity": "sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -4040,11 +4113,14 @@
      }
    },
    "node_modules/walk-up-path": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-3.0.1.tgz",
-            "integrity": "sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-4.0.0.tgz",
+      "integrity": "sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==",
      "dev": true,
-            "license": "ISC"
+      "license": "ISC",
+      "engines": {
+        "node": "20 || >=22"
+      }
    },
    "node_modules/which": {
      "version": "2.0.2",
@@ -4182,9 +4258,9 @@
      }
    },
    "node_modules/zod": {
-            "version": "3.25.30",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.30.tgz",
-            "integrity": "sha512-VolhdEtu6TJr/fzGuHA/SZ5ixvXqA6ADOG9VRcQ3rdOKmF5hkmcJbyaQjUH5BgmpA9gej++zYRX7zjSmdReIwA==",
+      "version": "3.25.67",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
+      "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
      "dev": true,
      "license": "MIT",
      "funding": {
@@ -4192,16 +4268,16 @@
      }
    },
    "node_modules/zod-validation-error": {
-            "version": "3.4.1",
-            "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.4.1.tgz",
-            "integrity": "sha512-1KP64yqDPQ3rupxNv7oXhf7KdhHHgaqbKuspVoiN93TT0xrBjql+Svjkdjq/Qh/7GSMmgQs3AfvBT0heE35thw==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.5.2.tgz",
+      "integrity": "sha512-mdi7YOLtram5dzJ5aDtm1AG9+mxRma1iaMrZdYIpFO7epdKBUwLHIxTF8CPDeCQ828zAXYtizrKlEJAtzgfgrw==",
      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=18.0.0"
      },
      "peerDependencies": {
-                "zod": "^3.24.4"
+        "zod": "^3.25.0"
      }
    }
  }
--- a/scripts/hyprpanel_launcher.sh.in
+++ b/scripts/hyprpanel_launcher.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh

 if [ "$#" -eq 0 ]; then
-    exec gjs -m "@DATADIR@/hyprpanel.js"
+    exec "@DATADIR@/hyprpanel-app"
 else
    exec astal -i hyprpanel "$*"
 fi
--- a/scripts/runUpdates.sh
+++ b/scripts/runUpdates.sh
@@ -13,8 +13,10 @@ install_arch_updates() {
    else
        echo "Missing AUR Helper. Try installing yay or paru"
    fi
+    if command -v flatpak &> /dev/null; then
        echo "Updating Flatpak packages..."
 	      flatpak update -y
+    fi
    echo "Done with Arch & AUR updates."
 }

--- a/src/components/bar/modules/workspaces/helpers/index.ts
+++ b/src/components/bar/modules/workspaces/helpers/index.ts
@@ -5,6 +5,7 @@ import { isValidGjsColor } from 'src/lib/validation/colors';
 import { AppIconOptions } from './types';
 import { WorkspaceIconMap } from '../types';
 import { unique } from 'src/lib/array/helpers';
+import {Apps ,AstalAppsApplication} from "gi://AstalApps"

 const hyprlandService = AstalHyprland.get_default();
 const { monochrome, background } = options.theme.bar.buttons;
@@ -151,7 +152,13 @@ export const getAppIcon = (
        return iconEntry?.[1] ?? defaultIcon;
    };

-    let icons = workspaceClients.reduce((iconAccumulator, [clientClass, clientTitle]) => {
+
+    
+        let icons = getAppIconNew(hyprlandService
+        .get_clients()
+        .filter((client) => client?.workspace?.id === workspaceIndex))
+
+        icons = workspaceClients.reduce((iconAccumulator, [clientClass, clientTitle]) => {
        const icon = findIconForClient(clientClass, clientTitle);

        if (icon !== undefined) {
@@ -161,6 +168,7 @@ export const getAppIcon = (
        return iconAccumulator;
    }, []);
    
+
    if (icons.length) {
        if (removeDuplicateIcons) {
            icons = unique(icons);
@@ -172,6 +180,35 @@ export const getAppIcon = (
    return defaultIcon;
 };

+
+// todo implement caching to make it so much faster hopefully
+export function getAppIconNew(
+    workspaceIndex: number,
+    apps: AstalAppsApplication
+) : string[] {
+    const clients = hyprlandService
+            .get_clients()
+            .filter((client) => client?.workspace?.id === workspaceIndex);
+
+    
+    
+    let icons = clients?.map((client) => 
+        apps
+    .filter((app: AstalHyprland.app) => 
+        app.wm_class == client.get_class() ||  
+    app.wm_class == client?.initial_title  ||
+    app.wm_class == getWMClass(client) ||
+    app.name == client?.initial_title)
+    .map((app: AstalHyprland.app) => app.icon_name).at(0) ?? "missing-symbolic"
+    )
+    return icons.length > 0 ? icons : ["application-x-executable"]
+}
+
+function getWMClass(client: AstalHyprland.Client | undefined) {
+    return client.initial_class.split(".").reverse().at(0)
+}
+
+
 /**
 * Renders the class names for a workspace.
 *
--- a/src/components/bar/modules/workspaces/workspaces.tsx
+++ b/src/components/bar/modules/workspaces/workspaces.tsx
@@ -1,5 +1,5 @@
 import { initWorkspaceEvents } from './helpers/utils';
-import { getAppIcon, getWsColor, renderClassnames, renderLabel } from './helpers';
+import { getAppIcon, getWsColor, renderClassnames, renderLabel, getAppIconNew } from './helpers';
 import { bind, Variable } from 'astal';
 import AstalHyprland from 'gi://AstalHyprland?version=0.1';
 import { Gtk } from 'astal/gtk3';
@@ -7,6 +7,8 @@ import { WorkspaceService } from 'src/services/workspace';
 import options from 'src/configuration';
 import { isPrimaryClick } from 'src/lib/events/mouse';
 import { WorkspaceIconMap, ApplicationIcons } from './types';
+import Apps from "gi://AstalApps"
+

 const workspaceService = WorkspaceService.getInstance();

@@ -101,14 +103,10 @@ export const WorkspaceModule = ({ monitor }: WorkspaceModuleProps): JSX.Element
                monitorList,
            );
            
+            const apps = new Apps.Apps({}).get_list()
+
            return workspacesToRender.map((wsId, index) => {
-                const appIcons = displayApplicationIcons
-                    ? getAppIcon(wsId, appIconOncePerWorkspace, {
-                          iconMap: applicationIconMapping,
-                          defaultIcon: applicationIconFallback,
-                          emptyIcon: applicationIconEmptyWorkspace,
-                      })
-                    : '';
+                const appIcons = getAppIconNew(wsId, apps);

                return (
                    <button
@@ -119,8 +117,7 @@ export const WorkspaceModule = ({ monitor }: WorkspaceModuleProps): JSX.Element
                            }
                        }}
                    >
-                        <label
-                            valign={Gtk.Align.CENTER}
+                        <box
                        css={
                                `margin: 0rem ${0.375 * spacingValue}rem;` +
                                `${displayWorkspaceIcons && !matugenEnabled ? getWsColor(workspaceIconMapping, wsId, smartHighlightEnabled, monitor) : ''}`
@@ -134,27 +131,21 @@ export const WorkspaceModule = ({ monitor }: WorkspaceModuleProps): JSX.Element
                                monitor,
                                wsId,
                            )}
-                            label={renderLabel(
-                                displayIcons,
-                                availableStatus,
-                                activeStatus,
-                                occupiedStatus,
-                                displayApplicationIcons,
-                                appIcons,
-                                workspaceMaskFlag,
-                                displayWorkspaceIcons,
-                                workspaceIconMapping,
-                                wsId,
-                                index,
-                                monitor,
-                            )}
                            setup={(self) => {
                                const currentWsClients = clients.filter(
                                    (client) => client?.workspace?.id === wsId,
                                );
                                self.toggleClassName('occupied', currentWsClients.length > 0);
-                            }}
+                            }}>
+                            
+                            {
+                            appIcons?.map(icon => 
+                                <icon 
+                                icon={icon || "image-missing"}
                                />
+                            )}
+                        </box>
+                        
                    </button>
                );
            });
--- a/src/components/bar/utils/monitors/index.ts
+++ b/src/components/bar/utils/monitors/index.ts
@@ -3,6 +3,13 @@ import { BarLayout, BarLayouts } from 'src/lib/options/types';
 import { GdkMonitorService } from 'src/services/display/monitor';
 import { MonitorMapping } from './types';
 import { JSXElement } from 'src/core/types';
+import AstalHyprland from 'gi://AstalHyprland?version=0.1';
+
+const emptyBar = {
+    left: [],
+    middle: [],
+    right: [],
+};

 /**
 * Returns the bar layout configuration for a specific monitor
@@ -12,22 +19,78 @@ import { JSXElement } from 'src/core/types';
 * @returns BarLayout configuration for the specified monitor, falling back to default if not found
 */
 export const getLayoutForMonitor = (monitor: number, layouts: BarLayouts): BarLayout => {
-    const matchingKey = Object.keys(layouts).find((key) => key === monitor.toString());
-    const wildcard = Object.keys(layouts).find((key) => key === '*');
+    const [rootKey, rootLayout] = _getResolveLayoutForMonitor(monitor, layouts);

-    if (matchingKey !== undefined) {
-        return layouts[matchingKey];
+    let left = rootLayout.left;
+    let middle = rootLayout.middle;
+    let right = rootLayout.right;
+
+    let layout = rootLayout;
+    const visited = [rootKey];
+    while (
+        layout.extends !== undefined &&
+        (left === undefined || middle === undefined || right === undefined)
+    ) {
+        if (visited.includes(layout.extends)) {
+            console.error(`found circular reference in layout extensions: ${visited.join(' -> ')}`);
+            return emptyBar;
+        }
+        visited.push(layout.extends);
+
+        if (!(layout.extends in layouts)) {
+            console.error(
+                `failed to find layout with name '${layout.extends}' (resolved path: ${visited.join(' -> ')})`,
+            );
+            return emptyBar;
        }

-    if (wildcard) {
-        return layouts[wildcard];
+        layout = layouts[layout.extends];
+
+        if (left === undefined) {
+            left = layout.left;
+        }
+        if (middle === undefined) {
+            middle = layout.middle;
+        }
+        if (right === undefined) {
+            right = layout.right;
+        }
    }

    return {
+        left: left ?? [],
+        middle: middle ?? [],
+        right: right ?? [],
+    };
+};
+
+const _getResolveLayoutForMonitor = (monitor: number, layouts: BarLayouts): [string, BarLayout] => {
+    const hyprlandService = AstalHyprland.get_default();
+    const monitorConn = hyprlandService.get_monitor(monitor).get_name();
+
+    const matchingConn = Object.keys(layouts).find((key) => key === monitorConn);
+    if (matchingConn !== undefined) {
+        return [matchingConn, layouts[matchingConn]];
+    }
+
+    const matchingNum = Object.keys(layouts).find((key) => key === monitor.toString());
+    if (matchingNum !== undefined) {
+        return [matchingNum, layouts[matchingNum]];
+    }
+
+    const wildcard = Object.keys(layouts).find((key) => key === '*');
+    if (wildcard) {
+        return [wildcard, layouts[wildcard]];
+    }
+
+    return [
+        'default',
+        {
            left: ['dashboard', 'workspaces', 'windowtitle'],
            middle: ['media'],
            right: ['volume', 'network', 'bluetooth', 'battery', 'systray', 'clock', 'notifications'],
-    };
+        },
+    ];
 };

 /**
--- a/src/components/menus/shared/dropdown/index.tsx
+++ b/src/components/menus/shared/dropdown/index.tsx
@@ -32,9 +32,6 @@ export default ({
                    self.visible = false;
                }
            }}
-            onFocusOutEvent={(self) => {
-                self.visible = false;
-            }}
            onButtonPressEvent={(self, event) => {
                const buttonClicked = event.get_button()[1];

--- a/src/lib/bar/helpers.ts
+++ b/src/lib/bar/helpers.ts
@@ -16,9 +16,9 @@ export function getLayoutItems(): BarModule[] {
    const itemsInLayout: BarModule[] = [];

    Object.keys(layouts.get()).forEach((monitor) => {
-        const leftItems = layouts.get()[monitor].left;
-        const rightItems = layouts.get()[monitor].right;
-        const middleItems = layouts.get()[monitor].middle;
+        const leftItems = layouts.get()[monitor].left ?? [];
+        const rightItems = layouts.get()[monitor].right ?? [];
+        const middleItems = layouts.get()[monitor].middle ?? [];

        itemsInLayout.push(...leftItems);
        itemsInLayout.push(...middleItems);
--- a/src/lib/options/types.ts
+++ b/src/lib/options/types.ts
@@ -46,6 +46,7 @@ export type BarLayout = {
    left: BarModule[];
    middle: BarModule[];
    right: BarModule[];
+    extends?: string;
 };
 export type BarLayouts = {
    [key: string]: BarLayout;
--- a/src/lib/poller/BashPoller.ts
+++ b/src/lib/poller/BashPoller.ts
@@ -57,7 +57,7 @@ export class BashPoller<Value, Parameters extends unknown[]> {
     */
    public execute = async (): Promise<void> => {
        try {
-            const res = await execAsync(`bash -c "${this._updateCommand}"`);
+            const res = await execAsync(['bash', '-c', this._updateCommand]);
            this._targetVariable.set(await this._pollingFunction(res, ...this._params));
        } catch (error) {
            console.error(`Error executing bash command "${this._updateCommand}":`, error);
--- a/src/services/display/monitor/index.ts
+++ b/src/services/display/monitor/index.ts
@@ -60,7 +60,7 @@ export class GdkMonitorService {
        const tempUsedIds = new Set<number>();
        const monitorsToUse = validMonitors.length > 0 ? validMonitors : hyprlandMonitors;

-        const result = this._matchMonitor(
+        return this._matchMonitor(
            monitorsToUse,
            gdkMonitor,
            monitor,
@@ -68,8 +68,6 @@ export class GdkMonitorService {
            (mon, gdkMon) => this._matchMonitorKey(mon, gdkMon),
            tempUsedIds,
        );
-
-        return result;
    }

    /**
--- a/src/services/workspace/index.ts
+++ b/src/services/workspace/index.ts
@@ -57,7 +57,9 @@ export class WorkspaceService {
        let allPotentialWorkspaces = range(totalWorkspaces || 8);
        const allWorkspaceInstances = workspaceInstances ?? [];

-        const activeWorkspaceIds = allWorkspaceInstances.map((workspaceInstance) => workspaceInstance.id);
+        const activeWorkspaceIds = allWorkspaceInstances.filter(
+                (workspaceInstance) => !workspaceInstance.name.startsWith("special:")
+            ).map((workspaceInstance) => workspaceInstance.id);

        const monitorReferencesForActiveWorkspaces = allWorkspaceInstances.map((workspaceInstance) => {
            return {
@@ -171,6 +173,9 @@ export class WorkspaceService {

        const workspaceMonitorReferences = allWorkspaceInstances
            .filter((workspaceInstance) => workspaceInstance !== null)
+            .filter(
+                (workspaceInstance) => !workspaceInstance.name.startsWith("special:")
+            )
            .map((workspaceInstance) => {
                return {
                    id: workspaceInstance.monitor?.id,
@@ -224,6 +229,9 @@ export class WorkspaceService {
            .filter(
                (workspaceInstance) => hyprlandService.focusedMonitor.id === workspaceInstance.monitor?.id,
            )
+            .filter(
+                (workspaceInstance) => !workspaceInstance.name.startsWith("special:")
+            )
            .map((workspaceInstance) => workspaceInstance.id);

        const assignedOrOccupiedWorkspaces = activeWorkspaceIds.sort((a, b) => a - b);
--- a/src/style/scss/bar/workspace.scss
+++ b/src/style/scss/bar/workspace.scss
@@ -1,11 +1,10 @@
 .workspaces {
-    label {
+    label, box {
        font-size: 0.2em;
        min-width: $bar-buttons-workspaces-pill-width;
        min-height: $bar-buttons-workspaces-pill-height;
        border-radius: $bar-buttons-workspaces-pill-radius;
        transition: 300ms * 0.5;
-        background-color: $bar-buttons-workspaces-available;
        color: $bar-buttons-workspaces-available;

        &.occupied {
@@ -58,7 +57,7 @@
 }

 .workspace-button {
-    &:hover label {
+    &:hover label, box {
        color: $bar-buttons-workspaces-hover;

        &.default {
Author	SHA1	Message	Date
Larra Emily Sarah	434d15169a	Initial commit	2025-11-10 10:56:42 +01:00
Jas Singh	d4895922de	fix: build output (#1032 ) * Fix build output * Fix command	2025-06-27 22:17:47 -07:00
Jas Singh	a46929e4c5	Build fix (#1030 ) * Fix build flag * Fix the build process for new ags update.	2025-06-27 19:48:53 -07:00
Jas Singh	ec93ae2e35	Fix build flag (#1029 )	2025-06-27 19:18:44 -07:00
DADA30000	2c0c66a8dd	change accepted type to float (#1021 ) Co-authored-by: Jas Singh <jaskiratpal.singh@outlook.com>	2025-06-22 11:46:56 -07:00
Jas Singh	0c2bcb773c	fix: Revert auto-hide dropdown to fix popover regression and improve bash poller to handle strings better. (#1017 )	2025-06-20 23:13:09 -07:00
DADA30000	d563cdb1f6	chore: Make wrapper as the default option (#1013 ) * Make wrapper as the default option, clean up code a little * Update docs	2025-06-19 19:33:51 -07:00
davfsa	e03666ab5d	feat: add ability to specify connector as layout name and extend other layouts (#985 ) * feat: add ability to specify connector as layout name and extend other layouts Signed-off-by: davfsa <davfsa@gmail.com> * chore: rename function Signed-off-by: davfsa <davfsa@gmail.com> * Update src/lib/options/types.ts Co-authored-by: Jas Singh <jaskiratpal.singh@outlook.com> * Update src/components/bar/utils/monitors/index.ts Co-authored-by: Jas Singh <jaskiratpal.singh@outlook.com> * Update src/components/bar/utils/monitors/index.ts --------- Signed-off-by: davfsa <davfsa@gmail.com> Co-authored-by: Jas Singh <jaskiratpal.singh@outlook.com>	2025-06-15 16:00:51 -07:00
Luiz Felipe Machado	daf45665c4	fix(scripts): update flatpak only if command exists (#1000 ) * fix(scripts): update flatpak only if command exists Add a check to run flatpak update only when the flatpak command is available, since Flatpak is not installed by default on Arch Linux, preventing errors if flatpak is missing. * Update scripts/runUpdates.sh --------- Co-authored-by: Jas Singh <jaskiratpal.singh@outlook.com>	2025-06-14 14:19:33 -07:00
geri1701	f0ca0fbf64	Chore: Add GIO_EXTRA_MODULES to overlay (#992 ) Co-authored-by: Jas Singh <jaskiratpal.singh@outlook.com>	2025-06-14 14:16:13 -07:00