From fff683e301537815dcf4cc249b988a0a8207e856 Mon Sep 17 00:00:00 2001
From: Kiana Sheibani <kiana.a.sheibani@gmail.com>
Date: Sun, 23 Feb 2025 02:27:49 -0500
Subject: [PATCH] fix: poll idle inhibitor on toggle

This requires the latest version of EWW, so that will be its own
input until nixpkgs catches up.
---
 flake.lock                                    | 76 ++++++++++++++++++-
 flake.nix                                     |  2 +-
 home-manager/wayland/eww/eww.yuck             |  2 +-
 .../wayland/eww/scripts/toggle-idle-inhibit   |  2 -
 home-manager/wayland/wltools.nix              |  3 +-
 5 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index a274a2a..56dd747 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,41 @@
 {
   "nodes": {
+    "eww": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1739720778,
+        "narHash": "sha256-iA/OTtsymhuCMRDC0IJE7YXuCeFJbkuMwPaj7tAVbQw=",
+        "owner": "elkowar",
+        "repo": "eww",
+        "rev": "5b4cc3e7a8055afb758421f4a114ef4032806e39",
+        "type": "github"
+      },
+      "original": {
+        "owner": "elkowar",
+        "repo": "eww",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "locked": {
+        "lastModified": 1709944340,
+        "narHash": "sha256-xr54XK0SjczlUxRo5YwodibUSlpivS9bqHt8BNyWVQA=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "baa7aa7bd0a570b3b9edd0b8da859fee3ffaa4d4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "ref": "refs/pull/65/head",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -69,6 +105,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1725534445,
+        "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1736344531,
         "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
@@ -86,15 +138,37 @@
     },
     "root": {
       "inputs": {
+        "eww": "eww",
         "home-manager": "home-manager",
         "macos-hyprcursor-src": "macos-hyprcursor-src",
         "mobile-nixos": "mobile-nixos",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "sxmo": "sxmo",
         "tokyo-night-sddm-src": "tokyo-night-sddm-src"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "eww",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1725675754,
+        "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "sxmo": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index a261243..ed6fd9f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,9 +15,9 @@ inputs = {
 
   tokyo-night-sddm-src.url = "github:rototrash/tokyo-night-sddm";
   tokyo-night-sddm-src.flake = false;
-
   macos-hyprcursor-src.url = "github:driedpampas/macOS-hyprcursor";
   macos-hyprcursor-src.flake = false;
+  eww.url = "github:elkowar/eww";
 };
 outputs = { self,
             nixpkgs,
diff --git a/home-manager/wayland/eww/eww.yuck b/home-manager/wayland/eww/eww.yuck
index 403b74b..ab90e4c 100644
--- a/home-manager/wayland/eww/eww.yuck
+++ b/home-manager/wayland/eww/eww.yuck
@@ -234,7 +234,7 @@
   "pgrep -c -f wayland\"\"-idle-inhibitor || true")
 
 (defwidget bar_idleinhibit []
-  (eventbox :onclick "~/.config/eww/scripts/toggle-idle-inhibit"
+  (eventbox :onclick "scripts/toggle-idle-inhibit && ${EWW_CMD} poll idleinhibit"
     (box :class "bar-idleinhibit ${idleinhibit > 0 ? "active" : ""}"
       (label :text {idleinhibit > 0 ? "󰈈" : "󰛑"}))))
 
diff --git a/home-manager/wayland/eww/scripts/toggle-idle-inhibit b/home-manager/wayland/eww/scripts/toggle-idle-inhibit
index 8c32e4b..6981e75 100755
--- a/home-manager/wayland/eww/scripts/toggle-idle-inhibit
+++ b/home-manager/wayland/eww/scripts/toggle-idle-inhibit
@@ -4,5 +4,3 @@ if pkill -0 -f wayland-idle-inhibitor; then
 else
   wayland-idle-inhibitor &
 fi
-# TODO: Uncomment when force-poll feature is merged
-# eww poll idleinhibit
diff --git a/home-manager/wayland/wltools.nix b/home-manager/wayland/wltools.nix
index ddf338f..d5c9540 100644
--- a/home-manager/wayland/wltools.nix
+++ b/home-manager/wayland/wltools.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, lib, config, eww, ... }:
 {
   home.packages = with pkgs; [
     wl-clipboard
@@ -127,6 +127,7 @@
   # EWW
 
   programs.eww.enable = true;
+  programs.eww.package = eww.packages.${pkgs.system}.eww;
   programs.eww.configDir = ./eww;
 
   systemd.user.services.eww =