Merge pull request #5 from Aylur/nix/lua-builder

Aylur · web-flow · commit 6c5d7659a75c · 2024-09-12T00:40:04.000+02:00
lua example, nix builder
diff --git a/core/gjs/src/variable.ts b/core/gjs/src/variable.ts
@@ -1,6 +1,6 @@
 import Binding, { type Connectable } from "./binding.js"
 import { Astal } from "./imports.js"
-import { interval } from "./time.js"
+import { interval, idle } from "./time.js"
 import { execAsync, subprocess } from "./process.js"
 
 class VariableWrapper<T> extends Function {
@@ -101,7 +101,7 @@ class VariableWrapper<T> extends Function {
 
     drop() {
         this.variable.emit("dropped")
-        this.variable.run_dispose()
+        idle(() => this.variable.run_dispose())
     }
 
     onDropped(callback: () => void) {
diff --git a/core/lua/astal/binding.lua b/core/lua/astal/binding.lua
@@ -29,10 +29,13 @@ function Binding:__tostring()
 end
 
 function Binding:get()
+    if self.property ~= nil and GObject.Object:is_type_of(self.emitter) then
+        return self.transformFn(self.emitter[self.property])
+    end
     if type(self.emitter.get) == "function" then
         return self.transformFn(self.emitter:get())
     end
-    return self.transformFn(self.emitter[self.property])
+    error("can not get: Not a GObject or a Variable " + self)
 end
 
 ---@param transform fun(value: any): any
@@ -48,17 +51,20 @@ end
 ---@param callback fun(value: any)
 ---@return function
 function Binding:subscribe(callback)
+    if self.property ~= nil and GObject.Object:is_type_of(self.emitter) then
+        local id = self.emitter.on_notify:connect(function()
+            callback(self:get())
+        end, self.property, false)
+        return function()
+            GObject.signal_handler_disconnect(self.emitter, id)
+        end
+    end
     if type(self.emitter.subscribe) == "function" then
         return self.emitter:subscribe(function()
             callback(self:get())
         end)
     end
-    local id = self.emitter.on_notify:connect(function()
-        callback(self:get())
-    end, self.property, false)
-    return function()
-        GObject.signal_handler_disconnect(self.emitter, id)
-    end
+    error("can not subscribe: Not a GObject or a Variable " + self)
 end
 
 Binding.__index = Binding
diff --git a/core/lua/astal/process.lua b/core/lua/astal/process.lua
@@ -72,7 +72,7 @@ function M.exec_async(commandline, on_stdout, on_stderr)
     local out, err = defualt_proc_args(on_stdout, on_stderr)
     if type(commandline) == "table" then
         Astal.Process.exec_asyncv(commandline, function(_, res)
-            local stdout, fail = Astal.exec_asyncv_finish(res)
+            local stdout, fail = Astal.Process.exec_asyncv_finish(res)
             if fail ~= nil then
                 err(fail)
             else
@@ -81,7 +81,7 @@ function M.exec_async(commandline, on_stdout, on_stderr)
         end)
     else
         Astal.Process.exec_async(commandline, function(_, res)
-            local stdout, fail = Astal.exec_finish(res)
+            local stdout, fail = Astal.Process.exec_finish(res)
             if fail ~= nil then
                 err(fail)
             else
diff --git a/core/lua/astal/variable.lua b/core/lua/astal/variable.lua
@@ -123,7 +123,9 @@ end
 
 function Variable:drop()
     self.variable.emit_dropped()
-    self.variable.run_dispose()
+    Astal.Time.idle(GObject.Closure(function()
+        self.variable.run_dispose()
+    end))
 end
 
 ---@param callback function
diff --git a/core/lua/test.lua b/core/lua/test.lua
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
@@ -4,7 +4,7 @@
 
 maintainer: [@Aylur](https://github.com/Aylur)
 
-Read more about it on the [nix page](./nix)
+Read more about it on the [nix page](./nix#astal)
 
 ## Arch
 
diff --git a/docs/getting-started/nix.md b/docs/getting-started/nix.md
@@ -6,19 +6,32 @@ Using Astal on Nix will require you to package your project.
 
 :::code-group
 
-```nix [typescript.nix]
-# Not documented yet
-```
+```nix [<i class="devicon-lua-plain"></i> Lua]
+{
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    astal = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nixos/nixpkgs/nixos-unstable";
+    };
+  };
 
-```nix [lua.nix]
-# Not documented yet
+  outputs = { self, nixpkgs, astal }: let
+    system = "x86_64-linux";
+    pkgs = nixpkgs.legacyPackages.${system};
+  in {
+    packages.${system}.default = astal.lib.mkLuaPacakge {
+      inherit pkgs;
+    };
+  };
+}
 ```
 
-```nix [python.nix]
+```nix [<i class="devicon-python-plain"></i> Python]
 # Not documented yet
 ```
 
-```nix [vala.nix]
+```nix [<i class="devicon-vala-plain"></i> Vala]
 # Not documented yet
 ```
 
@@ -34,7 +47,7 @@ Example content of a `flake.nix` file that contains your `homeConfigurations`.
 
 :::code-group
 
-```nix [flake.nix]
+```nix [<i class="devicon-nixos-plain"></i> flake.nix]
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -71,7 +84,7 @@ Example content of `home.nix` file
 
 :::code-group
 
-```nix [home.nix]
+```nix [<i class="devicon-nixos-plain"></i> home.nix]
 { inputs, pkgs, ... }:
 {
   # add the home manager module
diff --git a/docs/getting-started/supported-languages.md b/docs/getting-started/supported-languages.md
@@ -25,7 +25,8 @@ components that don't render child nodes dynamically, bars and panels for exampl
 
 Examples:
 
-- TODO
+- [Simple Bar](https://github.com/Aylur/astal/tree/main/examples/lua/simple-bar)
+![simple-bar](https://github.com/user-attachments/assets/a306c864-56b7-44c4-8820-81f424f32b9b)
 
 ## Python
 
diff --git a/examples/js/simple-bar/README.md b/examples/js/simple-bar/README.md
@@ -1,6 +1,6 @@
 # Simple Bar Example
 
-![sime-bar](https://github.com/user-attachments/assets/a306c864-56b7-44c4-8820-81f424f32b9b)
+![simple-bar](https://github.com/user-attachments/assets/a306c864-56b7-44c4-8820-81f424f32b9b)
 
 A simple bar for Hyprland using
 
diff --git a/examples/js/simple-bar/widget/Bar.tsx b/examples/js/simple-bar/widget/Bar.tsx
@@ -22,7 +22,7 @@ function SysTray() {
                 onClickRelease={self => {
                     menu?.popup_at_widget(self, Gdk.Gravity.SOUTH, Gdk.Gravity.NORTH, null)
                 }}>
-                <icon g_icon={bind(item, "gicon")}/>
+                <icon gIcon={bind(item, "gicon")} />
             </button>
         }))}
     </box>
@@ -64,21 +64,27 @@ function BatteryLevel() {
 }
 
 function Media() {
-    const player = Mpris.Player.new("spotify")
+    const mpris = Mpris.get_default()
 
     return <box className="Media">
-        <box
-            className="Cover"
-            valign={Gtk.Align.CENTER}
-            css={bind(player, "coverArt").as(cover =>
-                `background-image: url('${cover}');`
-            )}
-        />
-        <label
-            label={bind(player, "title").as(() =>
-                `${player.title} - ${player.artist}`
-            )}
-        />
+        {bind(mpris, "players").as(ps => ps[0] ? (
+            <box>
+                <box
+                    className="Cover"
+                    valign={Gtk.Align.CENTER}
+                    css={bind(ps[0], "coverArt").as(cover =>
+                        `background-image: url('${cover}');`
+                    )}
+                />
+                <label
+                    label={bind(ps[0], "title").as(() =>
+                        `${ps[0].title} - ${ps[0].artist}`
+                    )}
+                />
+            </box>
+        ) : (
+            "Nothing Playing"
+        ))}
     </box>
 }
 
diff --git a/examples/lua/simple-bar/README.md b/examples/lua/simple-bar/README.md
@@ -0,0 +1,12 @@
+# Simple Bar Example
+
+![simple-bar](https://github.com/user-attachments/assets/a306c864-56b7-44c4-8820-81f424f32b9b)
+
+A simple bar for Hyprland using
+
+- [Audio library](https://aylur.github.io/astal/libraries/audio).
+- [Battery library](https://aylur.github.io/astal/libraries/battery).
+- [Hyprland library](https://aylur.github.io/astal/libraries/hyprland).
+- [Mpris library](https://aylur.github.io/astal/libraries/mpris).
+- [Network library](https://aylur.github.io/astal/libraries/network).
+- [dart-sass](https://sass-lang.com/dart-sass/) as the css precompiler
diff --git a/examples/lua/simple-bar/app.lua b/examples/lua/simple-bar/app.lua
@@ -0,0 +1,20 @@
+#!/usr/bin/lua
+local astal = require("astal")
+local App = astal.App
+
+local Bar = require("widget.Bar")
+local src = require("lib").src
+
+local scss = src("style.scss")
+local css = "/tmp/style.css"
+
+astal.exec("sass " .. scss .. " " .. css)
+
+App:start({
+	css = css,
+	main = function()
+		for _, mon in pairs(App.monitors) do
+			Bar(mon)
+		end
+	end,
+})
diff --git a/examples/lua/simple-bar/lib.lua b/examples/lua/simple-bar/lib.lua
@@ -0,0 +1,25 @@
+local Variable = require("astal").Variable
+
+local M = {}
+
+function M.src(path)
+	local str = debug.getinfo(2, "S").source:sub(2)
+	local src = str:match("(.*/)") or str:match("(.*\\)") or "./"
+	return src .. path
+end
+
+---@generic T, R
+---@param arr T[]
+---@param func fun(T, integer): R
+---@return R[]
+function M.map(arr, func)
+	local new_arr = {}
+	for i, v in ipairs(arr) do
+		new_arr[i] = func(v, i)
+	end
+	return new_arr
+end
+
+M.date = Variable(""):poll(1000, "date")
+
+return M
diff --git a/examples/lua/simple-bar/style.scss b/examples/lua/simple-bar/style.scss
@@ -0,0 +1,88 @@
+$bg: #212223;
+$fg: #f1f1f1;
+$accent: #378DF7;
+$radius: 7px;
+
+window.Bar {
+    border: none;
+    box-shadow: none;
+    background-color: $bg;
+    color: $fg;
+    font-size: 1.1em;
+    font-weight: bold;
+
+    button {
+        all: unset;
+        background-color: transparent;
+
+        &:hover label {
+            background-color: transparentize($fg, 0.84);
+            border-color: transparentize($accent, 0.8);
+        }
+
+        &:active label {
+            background-color: transparentize($fg, 0.8)
+        }
+    }
+
+    label {
+        transition: 200ms;
+        padding: 0 8px;
+        margin: 2px;
+        border-radius: $radius;
+        border: 1pt solid transparent;
+    }
+
+    .Workspaces .focused label {
+        color: $accent;
+        border-color: $accent;
+    }
+
+    .FocusedClient {
+        color: $accent;
+    }
+
+    .Media .Cover {
+        min-height: 1.2em;
+        min-width: 1.2em;
+        border-radius: $radius;
+        background-position: center;
+        background-size: contain;
+    }
+
+    .Battery label {
+        padding-left: 0;
+        margin-left: 0;
+    }
+
+    .AudioSlider {
+        * {
+            all: unset;
+        }
+
+        icon {
+            margin-right: .6em;
+        }
+
+        margin: 0 1em;
+
+        trough {
+            background-color: transparentize($fg, 0.8);
+            border-radius: $radius;
+        }
+
+        highlight {
+            background-color: $accent;
+            min-height: .8em;
+            border-radius: $radius;
+        }
+
+        slider {
+            background-color: $fg;
+            border-radius: $radius;
+            min-height: 1em;
+            min-width: 1em;
+            margin: -.2em;
+        }
+    }
+}
diff --git a/examples/lua/simple-bar/widget/Bar.lua b/examples/lua/simple-bar/widget/Bar.lua
diff --git a/flake.nix b/flake.nix
diff --git a/nix/devshell.nix b/nix/devshell.nix
diff --git a/nix/lua.nix b/nix/lua.nix
