Initial commit

* Fix build output

* Fix command

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
   # ...
 ];

app.ts

@@ -6,7 +6,7 @@ import { runCLI } from 'src/services/cli/commander';
 import { InitializationService } from 'src/core/initialization';
 
 App.start({
-    instanceName: 'hyprpanel',
-    requestHandler: (request: string, res: (response: unknown) => void) => runCLI(request, res),
-    main: () => InitializationService.initialize(),
+  instanceName: 'hyprpanel-levl',
+  requestHandler: (request: string, res: (response: unknown) => void) => runCLI(request, res),
+  main: () => InitializationService.initialize(),
 });

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,38 +119,39 @@
           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;
     };

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,

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";

package.json

@@ -1,31 +1,31 @@
 {
-    "name": "hyprpanel",
-    "version": "1.0.0",
-    "description": "A customizable panel built for Hyprland.",
-    "main": "app.ts",
-    "scripts": {
-        "lint": "eslint --config .eslintrc.json .",
-        "lint:fix": "eslint --config .eslintrc.json . --fix",
-        "format": "prettier --write 'modules/**/*.ts'",
-        "knip": "knip"
-    },
-    "keywords": [],
-    "author": "",
-    "license": "MIT",
-    "dependencies": {
-        "astal": "/usr/share/astal/gjs"
-    },
-    "devDependencies": {
-        "@types/node": "^22.15.17",
-        "@typescript-eslint/eslint-plugin": "^8.5.0",
-        "@typescript-eslint/parser": "^8.5.0",
-        "eslint": "^8.57.0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-import": "^2.30.0",
-        "eslint-plugin-prettier": "^5.2.1",
-        "knip": "^5.55.1",
-        "prettier": "^3.3.3",
-        "tsconfig-paths": "^4.2.0",
-        "typescript": "5.7.3"
-    }
+  "name": "hyprpanel",
+  "version": "1.0.0",
+  "description": "A customizable panel built for Hyprland.",
+  "main": "app.ts",
+  "scripts": {
+    "lint": "eslint --config .eslintrc.json .",
+    "lint:fix": "eslint --config .eslintrc.json . --fix",
+    "format": "prettier --write 'modules/**/*.ts'",
+    "knip": "knip"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "astal": "/usr/share/astal/gjs"
+  },
+  "devDependencies": {
+    "@types/node": "^22.15.17",
+    "@typescript-eslint/eslint-plugin": "^8.5.0",
+    "@typescript-eslint/parser": "^8.5.0",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "knip": "^5.55.1",
+    "prettier": "^3.3.3",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "5.7.3"
+  }
 }

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

scripts/runUpdates.sh

@@ -13,8 +13,10 @@ install_arch_updates() {
     else
         echo "Missing AUR Helper. Try installing yay or paru"
     fi
-    echo "Updating Flatpak packages..."
-    flatpak update -y
+    if command -v flatpak &> /dev/null; then
+        echo "Updating Flatpak packages..."
+	      flatpak update -y
+    fi
     echo "Done with Arch & AUR updates."
 }
 

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) {
@@ -160,6 +167,7 @@ export const getAppIcon = (
 
         return iconAccumulator;
     }, []);
+    
 
     if (icons.length) {
         if (removeDuplicateIcons) {
@@ -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.
  *

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();
 
@@ -100,15 +102,11 @@ export const WorkspaceModule = ({ monitor }: WorkspaceModuleProps): JSX.Element
                 isMonitorSpecific,
                 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,9 +117,8 @@ export const WorkspaceModule = ({ monitor }: WorkspaceModuleProps): JSX.Element
                             }
                         }}
                     >
-                        <label
-                            valign={Gtk.Align.CENTER}
-                            css={
+                        <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>
                 );
             });

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,24 +19,80 @@ 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;
 
-    if (wildcard) {
-        return layouts[wildcard];
+    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;
+        }
+
+        layout = layouts[layout.extends];
+
+        if (left === undefined) {
+            left = layout.left;
+        }
+        if (middle === undefined) {
+            middle = layout.middle;
+        }
+        if (right === undefined) {
+            right = layout.right;
+        }
     }
 
     return {
-        left: ['dashboard', 'workspaces', 'windowtitle'],
-        middle: ['media'],
-        right: ['volume', 'network', 'bluetooth', 'battery', 'systray', 'clock', 'notifications'],
+        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'],
+        },
+    ];
+};
+
 /**
  * Checks if a bar layout configuration is empty
  *

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];
 

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);

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;

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);

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;
     }
 
     /**

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);

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 {