From af86cc7beb39bc593f8cd16a9b2ff374adc4fdc2 Mon Sep 17 00:00:00 2001
From: Anthony Rodriguez <anthony@nezia.dev>
Date: Tue, 11 Feb 2025 17:51:09 +0100
Subject: [PATCH] feat: add basic bar

---
 app.ts                |   6 +--
 flake.nix             |  18 ++++---
 style.scss            |  64 ++++++++++++++++++------
 tsconfig.json         |   2 +-
 widget/Bar.tsx        | 110 +++++++++++++++++++++++++++++++-----------
 widget/Workspaces.tsx |  24 +++++++++
 6 files changed, 170 insertions(+), 54 deletions(-)
 create mode 100644 widget/Workspaces.tsx

diff --git a/app.ts b/app.ts
index 9974e59..ad2f598 100644
--- a/app.ts
+++ b/app.ts
@@ -1,10 +1,8 @@
-import { App } from "astal/gtk3";
+import { App } from "astal/gtk4";
 import style from "./style.scss";
 import Bar from "./widget/Bar";
 
 App.start({
     css: style,
-    main() {
-        App.get_monitors().map(Bar);
-    },
+    main: () => App.get_monitors().map(Bar),
 });
diff --git a/flake.nix b/flake.nix
index 209d1f2..10ebb77 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,14 @@
   }: let
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
+    astalPkgs = with ags.packages.${system}; [
+      battery
+      hyprland
+      mpris
+      network
+      tray
+      wireplumber
+    ];
   in {
     packages.${system} = {
       default = ags.lib.bundle {
@@ -24,12 +32,10 @@
         src = ./.;
         name = "coquille";
         entry = "app.ts";
+        gtk4 = true;
 
         # additional libraries and executables to add to gjs' runtime
-        extraPackages = [
-          # ags.packages.${system}.battery
-          # pkgs.fzf
-        ];
+        extraPackages = astalPkgs;
       };
     };
 
@@ -38,9 +44,7 @@
         buildInputs = [
           # includes astal3 astal4 astal-io by default
           (ags.packages.${system}.default.override {
-            extraPackages = [
-              # cherry pick packages
-            ];
+            extraPackages = astalPkgs;
           })
         ];
       };
diff --git a/style.scss b/style.scss
index 1d0d3a9..29c8937 100644
--- a/style.scss
+++ b/style.scss
@@ -1,20 +1,56 @@
-// https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gtk/theme/Adwaita/_colors-public.scss
-$fg-color: #{"@theme_fg_color"};
-$bg-color: #{"@theme_bg_color"};
+@use "sass:color";
+@use "sass:string";
+
+@function gtkalpha($c, $a) {
+  @return string.unquote("alpha(#{$c},#{$a})");
+}
+
+// https://gitlab.gnome.org/GNOME/libadwaita/-/blob/main/src/stylesheet/_colors.scss
+$bg: #{"@window_bg_color"};
+$fg: #{"@window_fg_color"};
+$accent: #{"@accent_color"};
+$radius: 7px;
 
 window.Bar {
-    background: transparent;
-    color: $fg-color;
-    font-weight: bold;
-
-    >centerbox {
-        background: $bg-color;
-        border-radius: 10px;
-        margin: 8px;
-    }
+  border: none;
+  box-shadow: none;
+  background-color: $bg;
+  color: $fg;
+  font-size: 1.2em;
+  padding: 0.5em 0;
 
+  centerbox {
+    min-height: 2.5em;
+  }
+  .Workspaces {
     button {
-        border-radius: 8px;
-        margin: 2px;
+      all: unset;
+      min-width: 1.1rem;
+      min-height: 1.1rem;
+      background-color: transparent;
+      border-radius: 50%;
+
+      border: 2px solid $fg;
+      margin: 0.25rem 0.3rem;
+
+      &:hover {
+        border-color: gtkalpha($accent, 0.6);
+      }
     }
+    .focused {
+      border-color: $accent;
+      background-color: $accent;
+    }
+  }
+
+  .Battery label {
+    padding-left: 0;
+    margin-left: 0;
+  }
+
+  .NotificationCenter {
+    &:hover {
+      background-color: gtkalpha($fg, 0.2);
+    }
+  }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 7519786..14f7701 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,7 @@
     "compilerOptions": {
         "experimentalDecorators": true,
         "jsx": "react-jsx",
-        "jsxImportSource": "astal/gtk3",
+        "jsxImportSource": "astal/gtk4",
         "module": "ES2022",
         "moduleResolution": "Bundler",
         "strict": true,
diff --git a/widget/Bar.tsx b/widget/Bar.tsx
index 0384535..2610068 100644
--- a/widget/Bar.tsx
+++ b/widget/Bar.tsx
@@ -1,31 +1,85 @@
-import { App, Astal, Gtk, Gdk } from "astal/gtk3"
-import { Variable } from "astal"
+import { App, Astal, Gtk, Gdk } from "astal/gtk4";
+import { Variable, GLib, bind } from "astal";
+import Battery from "gi://AstalBattery";
+import Wp from "gi://AstalWp";
+import Network from "gi://AstalNetwork";
+import { Workspaces } from "./Workspaces";
 
-const time = Variable("").poll(1000, "date")
+function Wifi() {
+  const network = Network.get_default();
+  const wifi = bind(network, "wifi");
 
-export default function Bar(gdkmonitor: Gdk.Monitor) {
-    const { TOP, LEFT, RIGHT } = Astal.WindowAnchor
-
-    return <window
-        className="Bar"
-        gdkmonitor={gdkmonitor}
-        exclusivity={Astal.Exclusivity.EXCLUSIVE}
-        anchor={TOP | LEFT | RIGHT}
-        application={App}>
-        <centerbox>
-            <button
-                onClicked="echo hello"
-                halign={Gtk.Align.CENTER}
-            >
-                Welcome to AGS!
-            </button>
-            <box />
-            <button
-                onClicked={() => print("hello")}
-                halign={Gtk.Align.CENTER}
-            >
-                <label label={time()} />
-            </button>
-        </centerbox>
-    </window>
+  return (
+    <box visible={wifi.as(Boolean)}>
+      {wifi.as(
+        (wifi) =>
+          wifi && (
+            <image cssClasses={["Wifi"]} iconName={bind(wifi, "iconName")} />
+          ),
+      )}
+    </box>
+  );
+}
+
+function Audio() {
+  const speaker = Wp.get_default()?.audio.defaultSpeaker!;
+
+  return (
+    <box cssClasses={["AudioSlider"]}>
+      <image iconName={bind(speaker, "volumeIcon")} />
+    </box>
+  );
+}
+
+function BatteryLevel() {
+  const bat = Battery.get_default();
+
+  return (
+    <box cssClasses={["Battery"]} visible={bind(bat, "isPresent")}>
+      <image iconName={bind(bat, "batteryIconName")} />
+      <label
+        label={bind(bat, "percentage").as((p) => `${Math.floor(p * 100)} %`)}
+      />
+    </box>
+  );
+}
+
+function Time({ format = "%H:%M - %A %e." }) {
+  const time = Variable<string>("").poll(
+    1000,
+    () => GLib.DateTime.new_now_local().format(format)!,
+  );
+
+  return (
+    <label cssClasses={["Time"]} onDestroy={() => time.drop()} label={time()} />
+  );
+}
+
+export default function Bar(monitor: Gdk.Monitor) {
+  const { TOP, LEFT, RIGHT } = Astal.WindowAnchor;
+
+  return (
+    <window
+      visible
+      namespace={"bar"}
+      cssClasses={["Bar"]}
+      gdkmonitor={monitor}
+      exclusivity={Astal.Exclusivity.EXCLUSIVE}
+      anchor={TOP | LEFT | RIGHT}
+    >
+      <centerbox>
+        <box hexpand halign={Gtk.Align.START}>
+          <Workspaces />
+        </box>
+        <box>
+          <Time />
+        </box>
+        <box cssClasses={["NotificationCenter"]} hexpand halign={Gtk.Align.END}>
+          <Audio />
+          <Wifi />
+          <BatteryLevel />
+        </box>
+      </centerbox>
+    </window>
+  );
 }
diff --git a/widget/Workspaces.tsx b/widget/Workspaces.tsx
new file mode 100644
index 0000000..b103fa9
--- /dev/null
+++ b/widget/Workspaces.tsx
@@ -0,0 +1,24 @@
+import { bind } from "astal";
+import Hyprland from "gi://AstalHyprland";
+
+export const Workspaces = () => {
+  const hypr = Hyprland.get_default();
+
+  return (
+    <box cssClasses={["Workspaces"]}>
+      {bind(hypr, "workspaces").as((wss) =>
+        wss
+          .filter((ws) => !(ws.id >= -99 && ws.id <= -2)) // filter out special workspaces
+          .sort((a, b) => a.id - b.id)
+          .map((ws) => (
+            <button
+              cssClasses={bind(hypr, "focusedWorkspace").as((fw) =>
+                ws === fw ? ["focused"] : [""],
+              )}
+              onClicked={() => ws.focus()}
+            ></button>
+          )),
+      )}
+    </box>
+  );
+};