From 95353bb8d6eff752a430f9a6fb48c7d541a8b340 Mon Sep 17 00:00:00 2001 From: benstrb Date: Fri, 20 Mar 2026 23:01:18 +0100 Subject: [PATCH 1/3] muhehe --- .direnv/bin/nix-direnv-reload | 10 +++++----- .../774f2myazjrl15013q55gc6bibqnr8vr-source | 1 + .../f5cfz7byd8pwcv6dyg34b66fck7iqsc0-source | 1 - ...le-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa | 2 +- ...a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa.rc | 14 ++++++-------- flake.nix | 3 +-- src/main.rs | 18 +++++++++++++----- 7 files changed, 27 insertions(+), 22 deletions(-) create mode 120000 .direnv/flake-inputs/774f2myazjrl15013q55gc6bibqnr8vr-source delete mode 120000 .direnv/flake-inputs/f5cfz7byd8pwcv6dyg34b66fck7iqsc0-source diff --git a/.direnv/bin/nix-direnv-reload b/.direnv/bin/nix-direnv-reload index 6f1652e..059b68b 100755 --- a/.direnv/bin/nix-direnv-reload +++ b/.direnv/bin/nix-direnv-reload @@ -1,19 +1,19 @@ #!/usr/bin/env bash set -e -if [[ ! -d "/mnt/removable/Projects/Rust/wayland_panel" ]]; then +if [[ ! -d "/home/benag/.nix-config/configuration/modules/dots/wayland_panel" ]]; then echo "Cannot find source directory; Did you move it?" - echo "(Looking for "/mnt/removable/Projects/Rust/wayland_panel")" + echo "(Looking for "/home/benag/.nix-config/configuration/modules/dots/wayland_panel")" echo 'Cannot force reload with this script - use "direnv reload" manually and then try again' exit 1 fi # rebuild the cache forcefully -_nix_direnv_force_reload=1 direnv exec "/mnt/removable/Projects/Rust/wayland_panel" true +_nix_direnv_force_reload=1 direnv exec "/home/benag/.nix-config/configuration/modules/dots/wayland_panel" true # Update the mtime for .envrc. # This will cause direnv to reload again - but without re-building. -touch "/mnt/removable/Projects/Rust/wayland_panel/.envrc" +touch "/home/benag/.nix-config/configuration/modules/dots/wayland_panel/.envrc" # Also update the timestamp of whatever profile_rc we have. # This makes sure that we know we are up to date. -touch -r "/mnt/removable/Projects/Rust/wayland_panel/.envrc" "/mnt/removable/Projects/Rust/wayland_panel/.direnv"/*.rc +touch -r "/home/benag/.nix-config/configuration/modules/dots/wayland_panel/.envrc" "/home/benag/.nix-config/configuration/modules/dots/wayland_panel/.direnv"/*.rc diff --git a/.direnv/flake-inputs/774f2myazjrl15013q55gc6bibqnr8vr-source b/.direnv/flake-inputs/774f2myazjrl15013q55gc6bibqnr8vr-source new file mode 120000 index 0000000..a772d6e --- /dev/null +++ b/.direnv/flake-inputs/774f2myazjrl15013q55gc6bibqnr8vr-source @@ -0,0 +1 @@ +/nix/store/774f2myazjrl15013q55gc6bibqnr8vr-source \ No newline at end of file diff --git a/.direnv/flake-inputs/f5cfz7byd8pwcv6dyg34b66fck7iqsc0-source b/.direnv/flake-inputs/f5cfz7byd8pwcv6dyg34b66fck7iqsc0-source deleted file mode 120000 index af3dc82..0000000 --- a/.direnv/flake-inputs/f5cfz7byd8pwcv6dyg34b66fck7iqsc0-source +++ /dev/null @@ -1 +0,0 @@ -/nix/store/f5cfz7byd8pwcv6dyg34b66fck7iqsc0-source \ No newline at end of file diff --git a/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa b/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa index 1196720..d8b34ee 120000 --- a/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa +++ b/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa @@ -1 +1 @@ -/nix/store/sw4zwpy7r16mhiqlx6niqmrfa16niy10-nix-shell-env \ No newline at end of file +/nix/store/19sic4f4w000jj6fscbhz98zaib4f4ml-nix-shell-env \ No newline at end of file diff --git a/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa.rc b/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa.rc index 65e0266..e5832b6 100644 --- a/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa.rc +++ b/.direnv/flake-profile-a5d5b61aa8a61b7d9d765e1daf971a9a578f1cfa.rc @@ -35,7 +35,7 @@ LD='ld' export LD LD_FOR_TARGET='ld' export LD_FOR_TARGET -LD_LIBRARY_PATH='/nix/store/jcc9imfj4samq59gwsskxalcd9rjicip-wayland-1.24.0/lib:/nix/store/k1gvr4prs9736r1lhqyy1plxrrvv9b4m-libxkbcommon-1.11.0/lib:/nix/store/1qm74vf93ik1xjrr9kl6qvjrklljlcqh-glib-2.86.3/lib:/nix/store/1il4q8s87v0p8xp1g2q8mmbswbwkj23l-vulkan-loader-1.4.341.0/lib:/nix/store/g7wjwz546f510jv95318n23330c3ni7k-mesa-26.0.2/lib:/nix/store/wwckb31fcbwj479g7qwcb3b7cv6416pf-libglvnd-1.7.0/lib' +LD_LIBRARY_PATH='/run/opengl-driver/lib:/nix/store/jcc9imfj4samq59gwsskxalcd9rjicip-wayland-1.24.0/lib:/nix/store/k1gvr4prs9736r1lhqyy1plxrrvv9b4m-libxkbcommon-1.11.0/lib:/nix/store/1qm74vf93ik1xjrr9kl6qvjrklljlcqh-glib-2.86.3/lib:/nix/store/1il4q8s87v0p8xp1g2q8mmbswbwkj23l-vulkan-loader-1.4.341.0/lib:/nix/store/g7wjwz546f510jv95318n23330c3ni7k-mesa-26.0.2/lib:/nix/store/wwckb31fcbwj479g7qwcb3b7cv6416pf-libglvnd-1.7.0/lib' export LD_LIBRARY_PATH LINENO='76' MACHTYPE='x86_64-pc-linux-gnu' @@ -47,7 +47,7 @@ NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1' export NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu NIX_BINTOOLS_WRAPPER_TARGET_TARGET_x86_64_unknown_linux_gnu='1' export NIX_BINTOOLS_WRAPPER_TARGET_TARGET_x86_64_unknown_linux_gnu -NIX_BUILD_CORES='16' +NIX_BUILD_CORES='4' export NIX_BUILD_CORES NIX_CC='/nix/store/kbw2j1vag664b3sj3rjwz9v53cqx87sb-gcc-wrapper-15.2.0' export NIX_CC @@ -57,7 +57,7 @@ NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1' export NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu NIX_CC_WRAPPER_TARGET_TARGET_x86_64_unknown_linux_gnu='1' export NIX_CC_WRAPPER_TARGET_TARGET_x86_64_unknown_linux_gnu -NIX_CFLAGS_COMPILE=' -frandom-seed=sw4zwpy7r1 -isystem /nix/store/d0irz6jq0d16h6iggq1mcwwvvxzi4lvy-gnumake-4.4.1/include -isystem /nix/store/d0irz6jq0d16h6iggq1mcwwvvxzi4lvy-gnumake-4.4.1/include -isystem /nix/store/blr5zdnxfckm1690cdx6anmh3s17sx5p-wayland-1.24.0-dev/include -isystem /nix/store/blr5zdnxfckm1690cdx6anmh3s17sx5p-wayland-1.24.0-dev/include -isystem /nix/store/ixxx8nb52qxl25lix063rb35lk94p7r8-libxkbcommon-1.11.0-dev/include -isystem /nix/store/ixxx8nb52qxl25lix063rb35lk94p7r8-libxkbcommon-1.11.0-dev/include -isystem /nix/store/jhb15l57qmqxck5ddd1dh2ys729vc8gb-glib-2.86.3-dev/include -isystem /nix/store/jhb15l57qmqxck5ddd1dh2ys729vc8gb-glib-2.86.3-dev/include -isystem /nix/store/87y9237m9c9m9mxk9ajwdfmn78vz6w2y-zlib-1.3.1-dev/include -isystem /nix/store/87y9237m9c9m9mxk9ajwdfmn78vz6w2y-zlib-1.3.1-dev/include -isystem /nix/store/xff3v3hj0slzkxhksrsrscva5scf35an-libffi-3.5.2-dev/include -isystem /nix/store/xff3v3hj0slzkxhksrsrscva5scf35an-libffi-3.5.2-dev/include -isystem /nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/include -isystem /nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/include -isystem /nix/store/p73x5sdhi1wgas4d6mm8yxbzawih2yp2-glibc-iconv-2.42/include -isystem /nix/store/p73x5sdhi1wgas4d6mm8yxbzawih2yp2-glibc-iconv-2.42/include -isystem /nix/store/3drkfkyzxfb9rcpnv1xy0nvdj78qngy8-libglvnd-1.7.0-dev/include -isystem /nix/store/3drkfkyzxfb9rcpnv1xy0nvdj78qngy8-libglvnd-1.7.0-dev/include -isystem /nix/store/d0irz6jq0d16h6iggq1mcwwvvxzi4lvy-gnumake-4.4.1/include -isystem /nix/store/d0irz6jq0d16h6iggq1mcwwvvxzi4lvy-gnumake-4.4.1/include -isystem /nix/store/blr5zdnxfckm1690cdx6anmh3s17sx5p-wayland-1.24.0-dev/include -isystem /nix/store/blr5zdnxfckm1690cdx6anmh3s17sx5p-wayland-1.24.0-dev/include -isystem /nix/store/ixxx8nb52qxl25lix063rb35lk94p7r8-libxkbcommon-1.11.0-dev/include -isystem /nix/store/ixxx8nb52qxl25lix063rb35lk94p7r8-libxkbcommon-1.11.0-dev/include -isystem /nix/store/jhb15l57qmqxck5ddd1dh2ys729vc8gb-glib-2.86.3-dev/include -isystem /nix/store/jhb15l57qmqxck5ddd1dh2ys729vc8gb-glib-2.86.3-dev/include -isystem /nix/store/87y9237m9c9m9mxk9ajwdfmn78vz6w2y-zlib-1.3.1-dev/include -isystem /nix/store/87y9237m9c9m9mxk9ajwdfmn78vz6w2y-zlib-1.3.1-dev/include -isystem /nix/store/xff3v3hj0slzkxhksrsrscva5scf35an-libffi-3.5.2-dev/include -isystem /nix/store/xff3v3hj0slzkxhksrsrscva5scf35an-libffi-3.5.2-dev/include -isystem /nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/include -isystem /nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/include -isystem /nix/store/p73x5sdhi1wgas4d6mm8yxbzawih2yp2-glibc-iconv-2.42/include -isystem /nix/store/p73x5sdhi1wgas4d6mm8yxbzawih2yp2-glibc-iconv-2.42/include -isystem /nix/store/3drkfkyzxfb9rcpnv1xy0nvdj78qngy8-libglvnd-1.7.0-dev/include -isystem /nix/store/3drkfkyzxfb9rcpnv1xy0nvdj78qngy8-libglvnd-1.7.0-dev/include' +NIX_CFLAGS_COMPILE=' -frandom-seed=19sic4f4w0 -isystem /nix/store/d0irz6jq0d16h6iggq1mcwwvvxzi4lvy-gnumake-4.4.1/include -isystem /nix/store/d0irz6jq0d16h6iggq1mcwwvvxzi4lvy-gnumake-4.4.1/include -isystem /nix/store/blr5zdnxfckm1690cdx6anmh3s17sx5p-wayland-1.24.0-dev/include -isystem /nix/store/blr5zdnxfckm1690cdx6anmh3s17sx5p-wayland-1.24.0-dev/include -isystem /nix/store/ixxx8nb52qxl25lix063rb35lk94p7r8-libxkbcommon-1.11.0-dev/include -isystem /nix/store/ixxx8nb52qxl25lix063rb35lk94p7r8-libxkbcommon-1.11.0-dev/include -isystem /nix/store/jhb15l57qmqxck5ddd1dh2ys729vc8gb-glib-2.86.3-dev/include -isystem /nix/store/jhb15l57qmqxck5ddd1dh2ys729vc8gb-glib-2.86.3-dev/include -isystem /nix/store/87y9237m9c9m9mxk9ajwdfmn78vz6w2y-zlib-1.3.1-dev/include -isystem /nix/store/87y9237m9c9m9mxk9ajwdfmn78vz6w2y-zlib-1.3.1-dev/include -isystem /nix/store/xff3v3hj0slzkxhksrsrscva5scf35an-libffi-3.5.2-dev/include -isystem /nix/store/xff3v3hj0slzkxhksrsrscva5scf35an-libffi-3.5.2-dev/include -isystem /nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/include -isystem /nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/include -isystem /nix/store/p73x5sdhi1wgas4d6mm8yxbzawih2yp2-glibc-iconv-2.42/include -isystem /nix/store/p73x5sdhi1wgas4d6mm8yxbzawih2yp2-glibc-iconv-2.42/include -isystem /nix/store/3drkfkyzxfb9rcpnv1xy0nvdj78qngy8-libglvnd-1.7.0-dev/include -isystem /nix/store/3drkfkyzxfb9rcpnv1xy0nvdj78qngy8-libglvnd-1.7.0-dev/include -isystem /nix/store/d0irz6jq0d16h6iggq1mcwwvvxzi4lvy-gnumake-4.4.1/include -isystem /nix/store/d0irz6jq0d16h6iggq1mcwwvvxzi4lvy-gnumake-4.4.1/include -isystem /nix/store/blr5zdnxfckm1690cdx6anmh3s17sx5p-wayland-1.24.0-dev/include -isystem /nix/store/blr5zdnxfckm1690cdx6anmh3s17sx5p-wayland-1.24.0-dev/include -isystem /nix/store/ixxx8nb52qxl25lix063rb35lk94p7r8-libxkbcommon-1.11.0-dev/include -isystem /nix/store/ixxx8nb52qxl25lix063rb35lk94p7r8-libxkbcommon-1.11.0-dev/include -isystem /nix/store/jhb15l57qmqxck5ddd1dh2ys729vc8gb-glib-2.86.3-dev/include -isystem /nix/store/jhb15l57qmqxck5ddd1dh2ys729vc8gb-glib-2.86.3-dev/include -isystem /nix/store/87y9237m9c9m9mxk9ajwdfmn78vz6w2y-zlib-1.3.1-dev/include -isystem /nix/store/87y9237m9c9m9mxk9ajwdfmn78vz6w2y-zlib-1.3.1-dev/include -isystem /nix/store/xff3v3hj0slzkxhksrsrscva5scf35an-libffi-3.5.2-dev/include -isystem /nix/store/xff3v3hj0slzkxhksrsrscva5scf35an-libffi-3.5.2-dev/include -isystem /nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/include -isystem /nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/include -isystem /nix/store/p73x5sdhi1wgas4d6mm8yxbzawih2yp2-glibc-iconv-2.42/include -isystem /nix/store/p73x5sdhi1wgas4d6mm8yxbzawih2yp2-glibc-iconv-2.42/include -isystem /nix/store/3drkfkyzxfb9rcpnv1xy0nvdj78qngy8-libglvnd-1.7.0-dev/include -isystem /nix/store/3drkfkyzxfb9rcpnv1xy0nvdj78qngy8-libglvnd-1.7.0-dev/include' export NIX_CFLAGS_COMPILE NIX_CFLAGS_COMPILE_FOR_TARGET=' -isystem /nix/store/d0irz6jq0d16h6iggq1mcwwvvxzi4lvy-gnumake-4.4.1/include -isystem /nix/store/blr5zdnxfckm1690cdx6anmh3s17sx5p-wayland-1.24.0-dev/include -isystem /nix/store/ixxx8nb52qxl25lix063rb35lk94p7r8-libxkbcommon-1.11.0-dev/include -isystem /nix/store/jhb15l57qmqxck5ddd1dh2ys729vc8gb-glib-2.86.3-dev/include -isystem /nix/store/87y9237m9c9m9mxk9ajwdfmn78vz6w2y-zlib-1.3.1-dev/include -isystem /nix/store/xff3v3hj0slzkxhksrsrscva5scf35an-libffi-3.5.2-dev/include -isystem /nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/include -isystem /nix/store/p73x5sdhi1wgas4d6mm8yxbzawih2yp2-glibc-iconv-2.42/include -isystem /nix/store/3drkfkyzxfb9rcpnv1xy0nvdj78qngy8-libglvnd-1.7.0-dev/include' export NIX_CFLAGS_COMPILE_FOR_TARGET @@ -65,7 +65,7 @@ NIX_ENFORCE_NO_NATIVE='1' export NIX_ENFORCE_NO_NATIVE NIX_HARDENING_ENABLE='bindnow format fortify fortify3 libcxxhardeningextensive libcxxhardeningfast pic relro stackclashprotection stackprotector strictoverflow zerocallusedregs' export NIX_HARDENING_ENABLE -NIX_LDFLAGS='-rpath /mnt/removable/Projects/Rust/wayland_panel/outputs/out/lib -L/nix/store/fv438zxk1mvcfi2sj20mgn4s91qpjdcd-rust-default-1.94.0/lib -L/nix/store/fv438zxk1mvcfi2sj20mgn4s91qpjdcd-rust-default-1.94.0/lib -L/nix/store/jcc9imfj4samq59gwsskxalcd9rjicip-wayland-1.24.0/lib -L/nix/store/jcc9imfj4samq59gwsskxalcd9rjicip-wayland-1.24.0/lib -L/nix/store/k1gvr4prs9736r1lhqyy1plxrrvv9b4m-libxkbcommon-1.11.0/lib -L/nix/store/k1gvr4prs9736r1lhqyy1plxrrvv9b4m-libxkbcommon-1.11.0/lib -L/nix/store/vl8jkqpr0l3fac3cxiy4nwc5paiww1lv-zlib-1.3.1/lib -L/nix/store/vl8jkqpr0l3fac3cxiy4nwc5paiww1lv-zlib-1.3.1/lib -L/nix/store/5mnq195cx3cagnpbbvf5ncbp4fjgy0sz-libffi-3.5.2/lib -L/nix/store/5mnq195cx3cagnpbbvf5ncbp4fjgy0sz-libffi-3.5.2/lib -L/nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/lib -L/nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/lib -L/nix/store/1qm74vf93ik1xjrr9kl6qvjrklljlcqh-glib-2.86.3/lib -L/nix/store/1qm74vf93ik1xjrr9kl6qvjrklljlcqh-glib-2.86.3/lib -L/nix/store/1il4q8s87v0p8xp1g2q8mmbswbwkj23l-vulkan-loader-1.4.341.0/lib -L/nix/store/1il4q8s87v0p8xp1g2q8mmbswbwkj23l-vulkan-loader-1.4.341.0/lib -L/nix/store/g7wjwz546f510jv95318n23330c3ni7k-mesa-26.0.2/lib -L/nix/store/g7wjwz546f510jv95318n23330c3ni7k-mesa-26.0.2/lib -L/nix/store/wwckb31fcbwj479g7qwcb3b7cv6416pf-libglvnd-1.7.0/lib -L/nix/store/wwckb31fcbwj479g7qwcb3b7cv6416pf-libglvnd-1.7.0/lib -L/nix/store/fv438zxk1mvcfi2sj20mgn4s91qpjdcd-rust-default-1.94.0/lib -L/nix/store/fv438zxk1mvcfi2sj20mgn4s91qpjdcd-rust-default-1.94.0/lib -L/nix/store/jcc9imfj4samq59gwsskxalcd9rjicip-wayland-1.24.0/lib -L/nix/store/jcc9imfj4samq59gwsskxalcd9rjicip-wayland-1.24.0/lib -L/nix/store/k1gvr4prs9736r1lhqyy1plxrrvv9b4m-libxkbcommon-1.11.0/lib -L/nix/store/k1gvr4prs9736r1lhqyy1plxrrvv9b4m-libxkbcommon-1.11.0/lib -L/nix/store/vl8jkqpr0l3fac3cxiy4nwc5paiww1lv-zlib-1.3.1/lib -L/nix/store/vl8jkqpr0l3fac3cxiy4nwc5paiww1lv-zlib-1.3.1/lib -L/nix/store/5mnq195cx3cagnpbbvf5ncbp4fjgy0sz-libffi-3.5.2/lib -L/nix/store/5mnq195cx3cagnpbbvf5ncbp4fjgy0sz-libffi-3.5.2/lib -L/nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/lib -L/nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/lib -L/nix/store/1qm74vf93ik1xjrr9kl6qvjrklljlcqh-glib-2.86.3/lib -L/nix/store/1qm74vf93ik1xjrr9kl6qvjrklljlcqh-glib-2.86.3/lib -L/nix/store/1il4q8s87v0p8xp1g2q8mmbswbwkj23l-vulkan-loader-1.4.341.0/lib -L/nix/store/1il4q8s87v0p8xp1g2q8mmbswbwkj23l-vulkan-loader-1.4.341.0/lib -L/nix/store/g7wjwz546f510jv95318n23330c3ni7k-mesa-26.0.2/lib -L/nix/store/g7wjwz546f510jv95318n23330c3ni7k-mesa-26.0.2/lib -L/nix/store/wwckb31fcbwj479g7qwcb3b7cv6416pf-libglvnd-1.7.0/lib -L/nix/store/wwckb31fcbwj479g7qwcb3b7cv6416pf-libglvnd-1.7.0/lib' +NIX_LDFLAGS='-rpath /home/benag/.nix-config/configuration/modules/dots/wayland_panel/outputs/out/lib -L/nix/store/fv438zxk1mvcfi2sj20mgn4s91qpjdcd-rust-default-1.94.0/lib -L/nix/store/fv438zxk1mvcfi2sj20mgn4s91qpjdcd-rust-default-1.94.0/lib -L/nix/store/jcc9imfj4samq59gwsskxalcd9rjicip-wayland-1.24.0/lib -L/nix/store/jcc9imfj4samq59gwsskxalcd9rjicip-wayland-1.24.0/lib -L/nix/store/k1gvr4prs9736r1lhqyy1plxrrvv9b4m-libxkbcommon-1.11.0/lib -L/nix/store/k1gvr4prs9736r1lhqyy1plxrrvv9b4m-libxkbcommon-1.11.0/lib -L/nix/store/vl8jkqpr0l3fac3cxiy4nwc5paiww1lv-zlib-1.3.1/lib -L/nix/store/vl8jkqpr0l3fac3cxiy4nwc5paiww1lv-zlib-1.3.1/lib -L/nix/store/5mnq195cx3cagnpbbvf5ncbp4fjgy0sz-libffi-3.5.2/lib -L/nix/store/5mnq195cx3cagnpbbvf5ncbp4fjgy0sz-libffi-3.5.2/lib -L/nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/lib -L/nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/lib -L/nix/store/1qm74vf93ik1xjrr9kl6qvjrklljlcqh-glib-2.86.3/lib -L/nix/store/1qm74vf93ik1xjrr9kl6qvjrklljlcqh-glib-2.86.3/lib -L/nix/store/1il4q8s87v0p8xp1g2q8mmbswbwkj23l-vulkan-loader-1.4.341.0/lib -L/nix/store/1il4q8s87v0p8xp1g2q8mmbswbwkj23l-vulkan-loader-1.4.341.0/lib -L/nix/store/g7wjwz546f510jv95318n23330c3ni7k-mesa-26.0.2/lib -L/nix/store/g7wjwz546f510jv95318n23330c3ni7k-mesa-26.0.2/lib -L/nix/store/wwckb31fcbwj479g7qwcb3b7cv6416pf-libglvnd-1.7.0/lib -L/nix/store/wwckb31fcbwj479g7qwcb3b7cv6416pf-libglvnd-1.7.0/lib -L/nix/store/fv438zxk1mvcfi2sj20mgn4s91qpjdcd-rust-default-1.94.0/lib -L/nix/store/fv438zxk1mvcfi2sj20mgn4s91qpjdcd-rust-default-1.94.0/lib -L/nix/store/jcc9imfj4samq59gwsskxalcd9rjicip-wayland-1.24.0/lib -L/nix/store/jcc9imfj4samq59gwsskxalcd9rjicip-wayland-1.24.0/lib -L/nix/store/k1gvr4prs9736r1lhqyy1plxrrvv9b4m-libxkbcommon-1.11.0/lib -L/nix/store/k1gvr4prs9736r1lhqyy1plxrrvv9b4m-libxkbcommon-1.11.0/lib -L/nix/store/vl8jkqpr0l3fac3cxiy4nwc5paiww1lv-zlib-1.3.1/lib -L/nix/store/vl8jkqpr0l3fac3cxiy4nwc5paiww1lv-zlib-1.3.1/lib -L/nix/store/5mnq195cx3cagnpbbvf5ncbp4fjgy0sz-libffi-3.5.2/lib -L/nix/store/5mnq195cx3cagnpbbvf5ncbp4fjgy0sz-libffi-3.5.2/lib -L/nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/lib -L/nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/lib -L/nix/store/1qm74vf93ik1xjrr9kl6qvjrklljlcqh-glib-2.86.3/lib -L/nix/store/1qm74vf93ik1xjrr9kl6qvjrklljlcqh-glib-2.86.3/lib -L/nix/store/1il4q8s87v0p8xp1g2q8mmbswbwkj23l-vulkan-loader-1.4.341.0/lib -L/nix/store/1il4q8s87v0p8xp1g2q8mmbswbwkj23l-vulkan-loader-1.4.341.0/lib -L/nix/store/g7wjwz546f510jv95318n23330c3ni7k-mesa-26.0.2/lib -L/nix/store/g7wjwz546f510jv95318n23330c3ni7k-mesa-26.0.2/lib -L/nix/store/wwckb31fcbwj479g7qwcb3b7cv6416pf-libglvnd-1.7.0/lib -L/nix/store/wwckb31fcbwj479g7qwcb3b7cv6416pf-libglvnd-1.7.0/lib' export NIX_LDFLAGS NIX_LDFLAGS_FOR_TARGET=' -L/nix/store/fv438zxk1mvcfi2sj20mgn4s91qpjdcd-rust-default-1.94.0/lib -L/nix/store/jcc9imfj4samq59gwsskxalcd9rjicip-wayland-1.24.0/lib -L/nix/store/k1gvr4prs9736r1lhqyy1plxrrvv9b4m-libxkbcommon-1.11.0/lib -L/nix/store/vl8jkqpr0l3fac3cxiy4nwc5paiww1lv-zlib-1.3.1/lib -L/nix/store/5mnq195cx3cagnpbbvf5ncbp4fjgy0sz-libffi-3.5.2/lib -L/nix/store/md592gfars4m9madyrpj9yrq5jhckgjf-gettext-0.26/lib -L/nix/store/1qm74vf93ik1xjrr9kl6qvjrklljlcqh-glib-2.86.3/lib -L/nix/store/1il4q8s87v0p8xp1g2q8mmbswbwkj23l-vulkan-loader-1.4.341.0/lib -L/nix/store/g7wjwz546f510jv95318n23330c3ni7k-mesa-26.0.2/lib -L/nix/store/wwckb31fcbwj479g7qwcb3b7cv6416pf-libglvnd-1.7.0/lib' export NIX_LDFLAGS_FOR_TARGET @@ -115,8 +115,6 @@ STRIP='strip' export STRIP STRIP_FOR_TARGET='strip' export STRIP_FOR_TARGET -VK_ICD_FILENAMES='/nix/store/g7wjwz546f510jv95318n23330c3ni7k-mesa-26.0.2/share/vulkan/icd.d/intel_icd.x86_64.json' -export VK_ICD_FILENAMES XDG_DATA_DIRS='/nix/store/590yx3aynyhs48jyk8ip37fk1mjqfhkb-patchelf-0.15.2/share' export XDG_DATA_DIRS __structuredAttrs='' @@ -178,7 +176,7 @@ name='nix-shell-env' export name nativeBuildInputs='' export nativeBuildInputs -out='/mnt/removable/Projects/Rust/wayland_panel/outputs/out' +out='/home/benag/.nix-config/configuration/modules/dots/wayland_panel/outputs/out' export out outputBin='out' outputDev='out' @@ -211,7 +209,7 @@ declare -a preFixupHooks=('_moveToShare' '_multioutDocs' '_multioutDevs' ) preInstallPhases=' glibPreInstallPhase' preferLocalBuild='1' export preferLocalBuild -prefix='/mnt/removable/Projects/Rust/wayland_panel/outputs/out' +prefix='/home/benag/.nix-config/configuration/modules/dots/wayland_panel/outputs/out' declare -a propagatedBuildDepFiles=('propagated-build-build-deps' 'propagated-native-build-inputs' 'propagated-build-target-deps' ) propagatedBuildInputs='' export propagatedBuildInputs diff --git a/flake.nix b/flake.nix index 19350f2..7f6c799 100644 --- a/flake.nix +++ b/flake.nix @@ -58,8 +58,7 @@ ] ++ runtimeLibs; - LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath runtimeLibs; - VK_ICD_FILENAMES = "${pkgs.mesa}/share/vulkan/icd.d/intel_icd.x86_64.json"; + LD_LIBRARY_PATH = "/run/opengl-driver/lib:${pkgs.lib.makeLibraryPath runtimeLibs}"; }; }; } diff --git a/src/main.rs b/src/main.rs index 6a2f76f..28a7691 100644 --- a/src/main.rs +++ b/src/main.rs @@ -47,7 +47,7 @@ impl Default for App { fn default() -> Self { let mut output = Self { popups: HashMap::new(), - power_off_widget: PowerOffWidget(None), + power_off_widget: PowerOffWidget(None, false), time_widget: Default::default(), battery_widget: Default::default(), }; @@ -64,7 +64,7 @@ impl App { fn close_popup(&mut self, id: iced::window::Id) -> Task { self.popups.remove(&id); - return Task::done(Message::RemoveWindow(id)); + Task::done(Message::RemoveWindow(id)) } fn view(&self, id: iced::window::Id) -> Element<'_, Message> { @@ -227,13 +227,21 @@ impl PanelWidget for TimeWidget { } #[derive(Default)] -struct PowerOffWidget(Option); +struct PowerOffWidget(Option, bool); impl PanelWidget for PowerOffWidget { - fn update(&mut self) {} + fn update(&mut self) { + self.1 = !self.1; + } fn view(&self) -> Element<'_, Message> { - button("⏻").on_press(Message::PowerOff).into() + button("⏻") + .on_press(if self.1 { + Message::PowerOffCancel + } else { + Message::PowerOff + }) + .into() } } From 9bf4c44aa2505f98ef252d8b36846eda2d251ca8 Mon Sep 17 00:00:00 2001 From: benstrb Date: Sat, 21 Mar 2026 00:24:18 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=CE=A3:3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.rs | 3 +- src/main.rs | 243 ++-------------------------------- src/widgets/focused_window.rs | 30 +++++ src/widgets/mod.rs | 1 + 4 files changed, 41 insertions(+), 236 deletions(-) create mode 100644 src/widgets/focused_window.rs diff --git a/src/app.rs b/src/app.rs index 12a8041..ade6afd 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,9 +1,9 @@ use crate::widget::{Message, PanelWidget}; use crate::widgets::battery::BatteryWidget; use crate::widgets::clock::ClockWidget; +use crate::widgets::focused_window::FocusedWindowWidget; use crate::widgets::powerbutton::ShutdownWidget; use crate::widgets::spacer::Spacer; - use iced::Color; use iced::Element; use iced::Subscription; @@ -24,6 +24,7 @@ impl App { Box::new(ShutdownWidget::new()), Box::new(Spacer::new(iced::Length::Fill)), Box::new(BatteryWidget::new()), + Box::new(FocusedWindowWidget::new()), ], } } diff --git a/src/main.rs b/src/main.rs index 28a7691..3ca9b28 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,28 +1,22 @@ -use iced::Color; -use iced::Element; -use iced::Task; -use iced::widget::button; -use iced::widget::container; -use iced::widget::row; -use iced::widget::text; use iced_layershell::daemon; use iced_layershell::reexport::Anchor; -use iced_layershell::reexport::NewLayerShellSettings; use iced_layershell::settings::LayerShellSettings; use iced_layershell::settings::Settings; -use iced_layershell::to_layer_message; -use std::collections::HashMap; -use std::time::Duration; + +mod app; +mod widget; +mod widgets; +use app::App; pub fn main() -> Result<(), iced_layershell::Error> { - daemon(App::default, App::name, App::update, App::view) + daemon(App::new, App::name, App::update, App::view) .style(App::style) .theme(App::theme) .subscription(App::subscription) .settings(Settings { layer_settings: LayerShellSettings { - size: Some((0, 32)), - exclusive_zone: 32, + size: Some((0, App::WINDOW_HEIGHT)), + exclusive_zone: App::WINDOW_HEIGHT as i32, anchor: Anchor::Top | Anchor::Left | Anchor::Right, start_mode: iced_layershell::settings::StartMode::AllScreens, ..Default::default() @@ -32,224 +26,3 @@ pub fn main() -> Result<(), iced_layershell::Error> { .run() } -struct App { - popups: HashMap, - power_off_widget: PowerOffWidget, - time_widget: TimeWidget, - battery_widget: BatteryWidget, -} - -enum PopupKind { - PowerOff, -} - -impl Default for App { - fn default() -> Self { - let mut output = Self { - popups: HashMap::new(), - power_off_widget: PowerOffWidget(None, false), - time_widget: Default::default(), - battery_widget: Default::default(), - }; - let _ = output.update(Message::Clock); - - output - } -} - -impl App { - fn name() -> String { - "wayland_panel".into() - } - - fn close_popup(&mut self, id: iced::window::Id) -> Task { - self.popups.remove(&id); - Task::done(Message::RemoveWindow(id)) - } - - fn view(&self, id: iced::window::Id) -> Element<'_, Message> { - if let Some(kind) = self.popups.get(&id) { - return match kind { - PopupKind::PowerOff => container( - row![ - text("Shut down?"), - button("✓").on_press(Message::PowerOffConfirm), - button("✗").on_press(Message::PowerOffCancel), - ] - .spacing(8) - .align_y(iced::Alignment::Center), - ) - .center(iced::Length::Fill) - .into(), - }; - } - - // default: the bar - let content = row![ - self.time_widget.view(), - iced::widget::space().width(iced::Length::Fill), - self.power_off_widget.view(), - iced::widget::space().width(iced::Length::Fill), - self.battery_widget.view(), - ] - .padding(iced::Padding::from([0, 5])) - .height(iced::Length::Fill) - .width(iced::Length::Fill) - .align_y(iced::Alignment::Center); - - container(content).into() - } - - fn update(&mut self, message: Message) -> Task { - match message { - Message::Clock => { - self.time_widget.update(); - self.battery_widget.update(); - - Task::none() - } - Message::PowerOff => { - let id = iced::window::Id::unique(); - self.popups.insert(id, PopupKind::PowerOff); - - self.power_off_widget.0 = Some(id); - - Task::done(Message::NewLayerShell { - settings: NewLayerShellSettings { - size: Some((220, 40)), - anchor: Anchor::Top, - layer: iced_layershell::reexport::Layer::Overlay, - keyboard_interactivity: - iced_layershell::reexport::KeyboardInteractivity::OnDemand, - exclusive_zone: None, - ..Default::default() - }, - id, - }) - } - Message::PowerOffConfirm => { - std::process::Command::new("poweroff").spawn().ok(); - Task::none() - } - Message::PowerOffCancel => self.close_popup(self.power_off_widget.0.unwrap()), - _ => Task::none(), - } - } - - fn style(&self, theme: &iced::Theme) -> iced::theme::Style { - iced::theme::Style { - background_color: Color::TRANSPARENT, - text_color: theme.palette().text, - } - } - - fn theme(&self, _id: iced::window::Id) -> iced::Theme { - iced::Theme::GruvboxDark - } - - fn subscription(&self) -> iced::Subscription { - iced::time::every(Duration::from_secs(1)).map(|_| Message::Clock) - } -} - -trait PanelWidget { - fn update(&mut self); - fn view(&self) -> Element<'_, Message>; -} - -#[derive(Default)] -struct BatteryWidget { - battery: Option, -} - -impl PanelWidget for BatteryWidget { - fn update(&mut self) { - let file_content = std::fs::read_to_string(std::path::Path::new( - "/sys/class/power_supply/BAT0/capacity", - )); - - let Ok(file_string) = file_content else { - self.battery = None; - return; - }; - - let file_string = file_string.trim(); - - let Ok(value) = file_string.parse::() else { - self.battery = None; - return; - }; - - self.battery = Some(value); - } - - fn view(&self) -> Element<'_, Message> { - match self.battery { - Some(battery) => text!("{} {}", battery.to_string(), Self::get_icon(battery)), - None => text("󰂃"), - } - .into() - } -} - -impl BatteryWidget { - fn get_icon(battery: usize) -> &'static str { - match battery { - 0..6 => "󰂎", - 6..11 => "󰁺", - 11..21 => "󰁻", - 21..31 => "󰁼", - 31..41 => "󰁽", - 41..51 => "󰁾", - 51..61 => "󰁿", - 61..71 => "󰂀", - 71..81 => "󰂁", - 81..91 => "󰂂", - 91..101 => "󰁹", - _ => "󰂃", - } - } -} - -#[derive(Default)] -struct TimeWidget { - current_time: chrono::DateTime, -} - -impl PanelWidget for TimeWidget { - fn update(&mut self) { - self.current_time = chrono::Local::now(); - } - - fn view(&self) -> Element<'_, Message> { - text!("{}", self.current_time.format("%H:%m")).into() - } -} - -#[derive(Default)] -struct PowerOffWidget(Option, bool); - -impl PanelWidget for PowerOffWidget { - fn update(&mut self) { - self.1 = !self.1; - } - - fn view(&self) -> Element<'_, Message> { - button("⏻") - .on_press(if self.1 { - Message::PowerOffCancel - } else { - Message::PowerOff - }) - .into() - } -} - -#[to_layer_message(multi)] -#[derive(Debug, Clone)] -pub enum Message { - Clock, - PowerOff, - PowerOffConfirm, - PowerOffCancel, -} diff --git a/src/widgets/focused_window.rs b/src/widgets/focused_window.rs new file mode 100644 index 0000000..53d4c37 --- /dev/null +++ b/src/widgets/focused_window.rs @@ -0,0 +1,30 @@ +use iced::{Subscription, Task}; +use wayland_protocols_wlr::foreign_toplevel; + +use crate::widget::PanelWidget; + +pub struct FocusedWindowWidget { + focused_window: String, +} + +impl FocusedWindowWidget { + pub fn new() -> Self { + Self { + focused_window: foreign_toplevel::v1::client::zwlr_foreign_toplevel_manager_v1::Event, + } + } +} + +impl PanelWidget for FocusedWindowWidget { + fn update(&mut self, _message: &crate::widget::Message) -> iced::Task { + Task::none() + } + + fn subscribe(&self) -> iced::Subscription { + Subscription::none() + } + + fn view(&self, _id: iced::window::Id) -> iced::Element<'_, crate::widget::Message> { + iced::widget::text!("{}", self.focused_window).into() + } +} diff --git a/src/widgets/mod.rs b/src/widgets/mod.rs index 22184f7..ae671a2 100644 --- a/src/widgets/mod.rs +++ b/src/widgets/mod.rs @@ -1,4 +1,5 @@ pub mod battery; pub mod clock; +pub mod focused_window; pub mod powerbutton; pub mod spacer; From 4895333ff1e6b2b9442a58a3c69dad96d7f3b8f3 Mon Sep 17 00:00:00 2001 From: benstrb Date: Sat, 21 Mar 2026 22:00:34 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=CE=A3:3=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 11 ++++++ Cargo.toml | 1 + flake.lock | 12 +++---- src/widget.rs | 1 + src/widgets/focused_window.rs | 64 ++++++++++++++++++++++++++++++----- 5 files changed, 75 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f563be..8f9ee3b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1787,6 +1787,16 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "niri-ipc" +version = "25.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12bd9eb4e437f5282ce853cf66837658379cb537b4b6bae687da59246005329a" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -3310,6 +3320,7 @@ dependencies = [ "chrono", "iced", "iced_layershell", + "niri-ipc", "tokio", "winit", "zbus", diff --git a/Cargo.toml b/Cargo.toml index 539476c..ac9b81c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,7 @@ edition = "2024" chrono = "0.4.44" iced = { version = "0.14.0", default-features = false, features = ["wgpu", "wayland", "tokio"] } iced_layershell = { version = "0.15.0", default-features = false } +niri-ipc = "25.11.0" tokio = { version = "1.50.0", features = ["time"] } winit = { version = "0.30.12", default-features = false, features = ["wayland"] } zbus = "5.14.0" diff --git a/flake.lock b/flake.lock index fd1d531..beb223f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1773579282, - "narHash": "sha256-LWvZj9Bvm1EuoO6zbX4yjZebwnZNfeTbmCJGS7RGQ3Y=", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a88de74db0e948139be4b46f9a94d64aa11391c", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1773630837, - "narHash": "sha256-zJhgAGnbVKeBMJOb9ctZm4BGS/Rnrz+5lfSXTVah4HQ=", + "lastModified": 1773975983, + "narHash": "sha256-zrRVwdfhDdohANqEhzY/ydeza6EXEi8AG6cyMRNYT9Q=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f600ea449c7b5bb596fa1cf21c871cc5b9e31316", + "rev": "cc80954a95f6f356c303ed9f08d0b63ca86216ac", "type": "github" }, "original": { diff --git a/src/widget.rs b/src/widget.rs index 17beceb..9d89737 100644 --- a/src/widget.rs +++ b/src/widget.rs @@ -20,4 +20,5 @@ pub enum Message { Battery(Option), Time, ShutdownEvent(ShutdownEvents), + FocusChanged(Option), } diff --git a/src/widgets/focused_window.rs b/src/widgets/focused_window.rs index 53d4c37..e974cb9 100644 --- a/src/widgets/focused_window.rs +++ b/src/widgets/focused_window.rs @@ -1,7 +1,7 @@ -use iced::{Subscription, Task}; -use wayland_protocols_wlr::foreign_toplevel; +use iced::{Subscription, Task, futures::SinkExt}; +use niri_ipc::{Event, Request, socket::Socket}; -use crate::widget::PanelWidget; +use crate::widget::{Message, PanelWidget}; pub struct FocusedWindowWidget { focused_window: String, @@ -10,21 +10,69 @@ pub struct FocusedWindowWidget { impl FocusedWindowWidget { pub fn new() -> Self { Self { - focused_window: foreign_toplevel::v1::client::zwlr_foreign_toplevel_manager_v1::Event, + focused_window: "dsadsadsadas".into(), } } } impl PanelWidget for FocusedWindowWidget { - fn update(&mut self, _message: &crate::widget::Message) -> iced::Task { + fn update(&mut self, message: &Message) -> iced::Task { + let Message::FocusChanged(i) = message else { + return Task::none(); + }; + + self.focused_window = match i { + Some(id) => id.to_string(), + None => "None".into(), + }; + Task::none() } - fn subscribe(&self) -> iced::Subscription { - Subscription::none() + //ain't gonna lie, I got no idea wth is going on here, the issue was that, smth smth channel + //not filled, it was not working properly + //this is entirely vibecoded + fn subscribe(&self) -> Subscription { + Subscription::run_with("niri-focus-watcher", |_| { + iced::stream::channel(16, async |mut tx| { + let (btx, brx) = std::sync::mpsc::channel::(); + + std::thread::spawn(move || { + let mut socket = Socket::connect().expect("failed to connect"); + let _ = socket.send(Request::EventStream).expect("failed to send"); + let mut read_event = socket.read_events(); + loop { + match read_event() { + Ok(Event::WindowFocusChanged { id }) => { + if btx.send(Message::FocusChanged(id)).is_err() { + break; + } + } + Ok(_) => {} + Err(e) => { + eprintln!("{e}"); + break; + } + } + } + }); + + loop { + match brx.try_recv() { + Ok(msg) => { + let _ = tx.send(msg).await; + } + Err(std::sync::mpsc::TryRecvError::Empty) => { + tokio::time::sleep(std::time::Duration::from_millis(10)).await; + } + Err(std::sync::mpsc::TryRecvError::Disconnected) => break, + } + } + }) + }) } - fn view(&self, _id: iced::window::Id) -> iced::Element<'_, crate::widget::Message> { + fn view(&self, _id: iced::window::Id) -> iced::Element<'_, Message> { iced::widget::text!("{}", self.focused_window).into() } }