Update readme and deps

Signed-off-by: Andrew Opalach <andrew@akon.city>

9 files changed, 48 insertions, 35 deletions

diff --git a/.gitignore b/.gitignore
index 14be12e..bdc079a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,11 +15,11 @@ subprojects/janus-*/
 subprojects/jsmn.wrap
 subprojects/jsmn/
 subprojects/libalabaster
-subprojects/libalabaster/
+subprojects/libalabaster-*/
 subprojects/libev-4.33/
 subprojects/libev.wrap
 subprojects/libnaunet
-subprojects/libnaunet/
+subprojects/libnaunet-*/
 subprojects/lz4-*/
 subprojects/nlohmann_json-*/
 subprojects/notcurses-*/
@@ -27,7 +27,7 @@ subprojects/packagecache/
 subprojects/s3tc-dxt-decompression-*/
 subprojects/stb-*/
 subprojects/stela
-subprojects/stela/
+subprojects/stela-*/
 subprojects/wayland-protocols-*/
 subprojects/wayland-protocols.wrap
 subprojects/wlr-protocols-*/
diff --git a/README.txt b/README.txt
index f47400f..455aaef 100644
--- a/README.txt
+++ b/README.txt
@@ -25,21 +25,28 @@
 * wayland-protocols
 * wlr-protocols
 
-debian12: +
-{nbsp}common: +
-{nbsp}{nbsp} `sudo apt install git meson cmake pkg-config libegl-dev nlohmann-json3-dev liblz4-dev libstb-dev libglm-dev libjansson-dev libavcodec-dev libavdevice-dev libunistring-dev libdeflate-dev libtinfo-dev` +
-{nbsp}wayland: +
-{nbsp}{nbsp} `sudo apt install libwayland-dev` +
-{nbsp}x11: +
-{nbsp}{nbsp} `sudo apt install libxext-dev libxrandr-dev` +
+=== Packages
+==== debian12
+[source,sh]
+----
+# Common.
+sudo apt install git meson cmake pkg-config libegl-dev nlohmann-json3-dev liblz4-dev libstb-dev libglm-dev libjansson-dev libavcodec-dev libavdevice-dev libunistring-dev libdeflate-dev libtinfo-dev
+# Wayland.
+sudo apt install libwayland-dev
+# X11.
+sudo apt install libxext-dev libxrandr-dev
+----
 
-archlinux: +
-{nbsp}common: +
-{nbsp}{nbsp} `sudo pacman -S --needed git meson cmake libegl nlohmann-json lz4 stb glm jansson ffmpeg libdeflate` +
-{nbsp}wayland: +
-{nbsp}{nbsp} `sudo pacman -S --needed wayland wayland-protocols wlr-protocols` +
-{nbsp}x11: +
-{nbsp}{nbsp} `sudo pacman -S --needed libxext libxrandr` +
+==== archlinux
+[source,sh]
+----
+# Common.
+sudo pacman -S --needed git meson cmake libegl nlohmann-json lz4 stb glm jansson ffmpeg libdeflate
+# Wayland.
+sudo pacman -S --needed wayland wayland-protocols wlr-protocols
+# X11.
+sudo pacman -S --needed libxext libxrandr
+----
 
 === Compiling
 [source,sh]
@@ -116,7 +123,7 @@ $ taro
 ----
 
 === Keybinds
-[cols="19%,50%",width="44%"]
+[%autowidth]
 |================
 |←↓↑→/hjkl  |Move Selection, Edit Value
 |Enter/Space|Confirm Selection
diff --git a/flake.lock b/flake.lock
index f2d2da2..4ab3227 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1755027561,
-        "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=",
+        "lastModified": 1761672384,
+        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3",
+        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 8c53776..b18c512 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,9 @@
           egl-wayland
           xorg.libXext
           xorg.libXrandr
+          xorg.libXfixes
+          xorg.libXcursor
+          libxkbcommon
           jansson
           # notcurses build
           libdeflate
diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap
index e3aedee..145c015 100644
--- a/subprojects/libalabaster.wrap
+++ b/subprojects/libalabaster.wrap
@@ -1,4 +1,5 @@
 [wrap-git]
-url = https://git.akon.city/libalabaster
-revision = 93f664a69a3c688d196bdc228d572b45a65e7991
-depth = 1
+directory = libalabaster-0d1bc6c
+url = https://git.akon.city/libalabaster.git
+push-url = git@git.akon.city:libalabaster.git
+revision = 0d1bc6cf7483d2a53c2d5f04d15a0ce3da85f29b
diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap
index 462c1a7..df923b0 100644
--- a/subprojects/libnaunet.wrap
+++ b/subprojects/libnaunet.wrap
@@ -1,4 +1,5 @@
 [wrap-git]
-url = https://git.akon.city/libnaunet
-revision = fc8df3fe9cd15fe7b0b86c6584e0b3fb487d6886
-depth = 1
+directory = libnaunet-5edcdda
+url = https://git.akon.city/libnaunet.git
+push-url = git@git.akon.city:libnaunet.git
+revision = 5edcdda9efadd7c6ff5a47bef2897c0eb995057f
diff --git a/subprojects/stela.wrap b/subprojects/stela.wrap
index c34c19d..7122113 100644
--- a/subprojects/stela.wrap
+++ b/subprojects/stela.wrap
@@ -1,4 +1,5 @@
 [wrap-git]
-url = https://git.akon.city/stela
-revision = 234e3cb390c7bb149ddd281d695d81a368e1a441
-depth = 1
+directory = stela-9d69eec
+url = https://git.akon.city/stela.git
+push-url = git@git.akon.city:stela.git
+revision = 9d69eec9ab48f009a04b9ab710f57c85b240dd19
diff --git a/taro/daemon.c b/taro/daemon.c
index bd993bc..d701ae6 100644
--- a/taro/daemon.c
+++ b/taro/daemon.c
@@ -62,7 +62,7 @@ static s32 parse_and_set_props(str *selection, str *wallpaper_id, bool *is_packa
 {
     u32 index = al_str_find(selection, '|');
     u32 rindex = al_str_rfind(selection, '|');
-    if (index == AL_STR_NPOS || rindex == AL_STR_NPOS || index == rindex) {
+    if (index == AL_STR_NO_POS || rindex == AL_STR_NO_POS || index == rindex) {
         return -1;
     }
 
diff --git a/taro/ui.c b/taro/ui.c
index 2b1de3b..25aa844 100644
--- a/taro/ui.c
+++ b/taro/ui.c
@@ -21,8 +21,8 @@
 #define UI_RESERVE_WIDTH 33
 #define UI_RESERVE_HEIGHT 2
 
-#define GRID_TILE_WIDTH 18 // img = 16
-#define GRID_TILE_HEIGHT 9 // img = 8
+#define GRID_TILE_WIDTH 22 // img = 20
+#define GRID_TILE_HEIGHT 11 // img = 10
 
 #define GRID_TEXT_WIDTH (GRID_TILE_WIDTH - 4)
 
@@ -144,7 +144,7 @@ static s32 get_entry_from_config(struct ui *u)
     str config;
     if (nn_file_open_and_read_wholly(&u->m.selection_path, &config, false)) {
         u32 index = al_str_find(&config, '|');
-        if (index != AL_STR_NPOS && index > 2) {
+        if (index != AL_STR_NO_POS && index > 2) {
             str id = al_str_substr(&config, 0, index - 2);
             struct entry *e;
             al_array_foreach_ptr(u->db.entries, i, e) {
@@ -323,7 +323,7 @@ struct image *get_image_from_pool(struct image_pool *pool, str *path)
     }
 
     u32 index = al_str_rfind(path, '.');
-    bool is_gif = index != AL_STR_NPOS && al_str_cmp(path, &al_str_c(".gif"), index, 4) == 0;
+    bool is_gif = index != AL_STR_NO_POS && al_str_cmp(path, &al_str_c(".gif"), index, 4) == 0;
     char *c_str = al_str_to_c_str(path);
     struct ncvisual *v = ncvisual_from_file(c_str);
     al_free(c_str);