new astal app launcher, refactor astal build fn

9 files changed, 234 insertions, 43 deletions

diff --git a/pkgs/astal/default.nix b/pkgs/astal/default.nix
index a7e86fe..fb320ee 100644
--- a/pkgs/astal/default.nix
+++ b/pkgs/astal/default.nix
@@ -3,41 +3,59 @@
   inputs,
   system,
   options,
-  runCommand,
-  dart-sass,
   ...
 }: let
+  runCommand = pkgs.runCommand;
+  dart-sass = pkgs.dart-sass;
+
   apkgs = inputs.astal.packages.${system};
   scss = "${dart-sass}/bin/sass";
   theme = import ./theme.nix {inherit options;};
-in
-  inputs.astal.lib.mkLuaPackage {
-    pkgs =
-      pkgs
-      // {
-        # use luajit
-        lua = pkgs.luajit;
-      };
-    src = runCommand "src" {} ''
-      mkdir -p $out
-      cp -r ${./src}/{*.lua,widget} $out/
-      cp -r ${./src}/style/* .
-      echo '${theme}' > theme.scss
-      cat theme.scss style.scss widget/* > main.scss
-      ${scss} main.scss $out/main.css
-    '';
-    name = "astal";
-    extraPackages =
-      (with apkgs; [
-        battery
-        hyprland
-        mpris
-        network
-        notifd
-        tray
-        wireplumber
-      ])
-      ++ (with pkgs; [
-        networkmanager
-      ]);
-  }
+
+  mkAstal = file:
+    inputs.astal.lib.mkLuaPackage {
+      pkgs =
+        pkgs
+        // {
+          # use luajit
+          lua = pkgs.luajit;
+        };
+      src = runCommand "src" {} ''
+        mkdir -p $out
+        cp -r ${./src}/{*.lua,widget} $out/
+        cp $out/${file}.lua $out/init.lua
+        cp -r ${./src}/style/* .
+        echo '${theme}' > theme.scss
+        cat theme.scss style.scss widget/* > main.scss
+        ${scss} main.scss $out/main.css
+      '';
+      name = "astal-${file}";
+      extraPackages =
+        (with apkgs; [
+          apps
+          battery
+          hyprland
+          mpris
+          network
+          notifd
+          tray
+          wireplumber
+        ])
+        ++ (with pkgs; [
+          networkmanager
+        ]);
+    };
+
+  mkAstalWrapper = file: let
+    pkg = mkAstal file;
+  in
+    pkgs.writeShellApplication {
+      name = "astal-${file}";
+      text = ''
+        ${pkg}/bin/astal-${file}
+      '';
+    };
+in {
+  shell = mkAstalWrapper "shell";
+  launcher = mkAstalWrapper "launcher";
+}
diff --git a/pkgs/astal/src/launcher.lua b/pkgs/astal/src/launcher.lua
new file mode 100644
index 0000000..e645ac4
--- /dev/null
+++ b/pkgs/astal/src/launcher.lua
@@ -0,0 +1,10 @@
+local App = require("astal.gtk3.app")
+local lib = require("lib")
+
+local Launcher = require("widget.launcher")
+
+App:start({
+	instance_name = "launcher",
+	css = lib.src("main.css"),
+	main = Launcher,
+})
diff --git a/pkgs/astal/src/lib.lua b/pkgs/astal/src/lib.lua
index 8b1e443..98a5ecc 100644
--- a/pkgs/astal/src/lib.lua
+++ b/pkgs/astal/src/lib.lua
@@ -34,6 +34,17 @@ lib = {
 		return new_arr
 	end,
 
+	--- slices a list
+	slice = function(array, first, last, step)
+		local new_arr = {}
+
+		for i = first or 1, last or #array, step or 1 do
+			new_arr[#new_arr+1] = array[i]
+		end
+
+		return new_arr
+	end,
+
 	--- sort an array of object on a key
 	sort = function(array, func)
 
diff --git a/pkgs/astal/src/init.lua b/pkgs/astal/src/shell.lua
index 5bdfb03..c370349 100644
--- a/pkgs/astal/src/init.lua
+++ b/pkgs/astal/src/shell.lua
@@ -1,4 +1,3 @@
-local astal = require("astal")
 local App = require("astal.gtk3.app")
 local lib = require("lib")
 
@@ -7,6 +6,7 @@ local Corners = require("widget.corners")
 local Deck = require("widget.deck")
 
 App:start({
+	instance_name = "shell",
 	css = lib.src("main.css"),
 	main = function()
 		for _, mon in pairs(App.monitors) do
diff --git a/pkgs/astal/src/style/style.scss b/pkgs/astal/src/style/style.scss
index 0c66051..ddef6c7 100644
--- a/pkgs/astal/src/style/style.scss
+++ b/pkgs/astal/src/style/style.scss
@@ -4,6 +4,10 @@
 
 @import "./theme";
 
+@function gtkalpha($c, $a) {
+    @return string.unquote("alpha(#{$c},#{$a})");
+}
+
 * {
     all: unset;
 }
diff --git a/pkgs/astal/src/style/widget/deck.scss b/pkgs/astal/src/style/widget/deck.scss
index d7dd69c..adf8c00 100644
--- a/pkgs/astal/src/style/widget/deck.scss
+++ b/pkgs/astal/src/style/widget/deck.scss
@@ -1,8 +1,4 @@
 
-@function gtkalpha($c, $a) {
-    @return string.unquote("alpha(#{$c},#{$a})");
-}
-
 $deck-scale: $font-size * 4;
 
 .deck {
diff --git a/pkgs/astal/src/style/widget/launcher.scss b/pkgs/astal/src/style/widget/launcher.scss
new file mode 100644
index 0000000..b39d292
--- /dev/null
+++ b/pkgs/astal/src/style/widget/launcher.scss
@@ -0,0 +1,41 @@
+
+.launcher {
+    > box {
+        padding: 5em;
+        background: gtkalpha($bg, 0.7);
+        border-radius: $outer-radius;
+    }
+
+	.search {
+		margin-bottom: 5em;
+		color: $surface-fg;
+		background: $surface-bg;
+		padding: $outer-gap;
+		border-radius: $outer-radius;
+		min-width: 20em;
+	}
+
+	.app {
+    	background: transparent;
+		padding: $outer-gap;
+		margin: $outer-gap;
+		border-radius: $outer-radius;
+		min-width: 15em;
+		min-height: 15em;
+
+		&:hover {
+			background: gtkalpha($hover-bg, .5);
+		}
+
+		icon {
+			font-size: 9em;
+		}
+
+		.name {
+			margin-top: $outer-gap;
+			font-size: 1.25em;
+			color: gtkalpha($fg, 0.9);
+		}
+	}
+
+}
diff --git a/pkgs/astal/src/widget/launcher.lua b/pkgs/astal/src/widget/launcher.lua
new file mode 100644
index 0000000..cbac6c3
--- /dev/null
+++ b/pkgs/astal/src/widget/launcher.lua
@@ -0,0 +1,113 @@
+local astal = require("astal")
+local Widget = require("astal.gtk3.widget")
+local App = require("astal.gtk3.app")
+local Gdk = require("astal.gtk3").Gdk
+local Gtk = require("astal.gtk3").Gtk
+local astalify = require("astal.gtk3").astalify
+local Apps = astal.require("AstalApps")
+local Variable = astal.Variable
+local lib = require("lib")
+
+local MAX_ENTRIES = 20
+
+local FlowBox = astalify(Gtk.FlowBox)
+local FlowBoxChild = astalify(Gtk.FlowBoxChild)
+
+local apps = Apps.Apps()
+local text = Variable("")
+local list = text(function(text)
+	return lib.slice(apps:exact_query(text), 0, MAX_ENTRIES)
+end)
+
+function on_show()
+	text:set("")
+end
+
+function close()
+	App:quit()
+end
+
+function on_key_press(self, event)
+	if event.keyval == Gdk.KEY_Escape then
+		close()
+	end
+end
+
+function on_enter()
+	local found = apps:exact_query(text:get())[1]
+	if found then
+		found:launch()
+		close()
+	end
+end
+
+function Application(app)
+	return FlowBoxChild({
+		Widget.Button({
+			class_name = "app",
+			on_clicked = function()
+				app:launch()
+				close()
+			end,
+			Widget.Box({
+				halign = "CENTER",
+				valign = "CENTER",
+				vertical = true,
+				Widget.Icon({
+					icon = app.icon_name,
+				}),
+				Widget.Label({
+					class_name = "name",
+					label = app.name,
+					valign = "CENTER",
+					ellipsize = "END",
+					max_width_chars = 20,
+				}),
+			}),
+		}),
+	})
+end
+
+function Applications(apps)
+	return FlowBox({
+		hexpand = true,
+		homogeneous = true,
+		class_name = "apps",
+		lib.map(apps, Application)
+	})
+end
+
+function Launcher()
+	return Widget.Box({
+		vertical = true,
+		Widget.Entry({
+			class_name = "search",
+			placeholder_text = "Search",
+			halign = "CENTER",
+			text = text(),
+			on_changed = function(self)
+				text:set(self.text)
+			end,
+			on_activate = on_enter,
+		}),
+		Widget.Box({
+			class_name = "apps",
+			list:as(Applications),
+		}),
+	})
+end
+
+return function()
+	local Anchor = astal.require('Astal').WindowAnchor
+
+	return Widget.Window({
+		class_name = "launcher",
+		anchor = Anchor.TOP + Anchor.BOTTOM + Anchor.LEFT + Anchor.RIGHT,
+		exclusivity = "EXCLUSIVE",
+		keymode = "ON_DEMAND",
+		application = App,
+		on_show = on_show,
+		on_key_press_event = on_key_press,
+		Launcher(),
+	})
+end
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 98eb1ea..a3b9d36 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,6 +1,4 @@
-{pkgs, ...} @ inputs: let
-  build = file: pkgs.callPackage file inputs;
-in {
-  astal = build ./astal;
-  unofficial-homestuck-collection = build ./unofficial-homestuck-collection;
+{pkgs, ...} @ inputs: {
+  astal = import ./astal inputs;
+  unofficial-homestuck-collection = pkgs.callPackage ./unofficial-homestuck-collection inputs;
 }