From 16d7c9d8497465a360e214f40944a2624852ea30 Mon Sep 17 00:00:00 2001
From: zspher <66728045+zspher@users.noreply.github.com>
Date: Tue, 28 Oct 2025 13:35:48 -0600
Subject: [PATCH 1/2] feat(image): expand `~` & `$HOME` in path

---
 src/modules/image.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/modules/image.cpp b/src/modules/image.cpp
index 173aabd3..8b9888bc 100644
--- a/src/modules/image.cpp
+++ b/src/modules/image.cpp
@@ -1,5 +1,7 @@
 #include "modules/image.hpp"
 
+#include <config.hpp>
+
 waybar::modules::Image::Image(const std::string& id, const Json::Value& config)
     : AModule(config, "image", id), box_(Gtk::ORIENTATION_HORIZONTAL, 0) {
   box_.pack_start(image_);
@@ -56,6 +58,10 @@ auto waybar::modules::Image::update() -> void {
     path_ = "";
   }
 
+  // expand path if "~" or "$HOME" is present in original path
+  auto result = Config::tryExpandPath(path_, "");
+  path_ = result.empty() ? "" : result.front();
+
   if (Glib::file_test(path_, Glib::FILE_TEST_EXISTS)) {
     Glib::RefPtr<Gdk::Pixbuf> pixbuf;
 

From d61bc859ae7a086abed0f9b93cf69ce7f4e8b3bf Mon Sep 17 00:00:00 2001
From: zspher <66728045+zspher@users.noreply.github.com>
Date: Wed, 29 Oct 2025 17:07:36 -0600
Subject: [PATCH 2/2] perf(image): set image from `path` only once

---
 src/modules/image.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/modules/image.cpp b/src/modules/image.cpp
index 8b9888bc..02b6d336 100644
--- a/src/modules/image.cpp
+++ b/src/modules/image.cpp
@@ -28,6 +28,13 @@ waybar::modules::Image::Image(const std::string& id, const Json::Value& config)
     size_ = 16;
   }
 
+  if (config_["path"].isString()) {
+    auto result = Config::tryExpandPath(config_["path"].asString(), "");
+    path_ = result.empty() ? "" : result.front();
+  } else {
+    path_.clear();
+  }
+
   if (interval_.count() == 0) {
     interval_ = std::chrono::milliseconds::max();
   }
@@ -49,19 +56,14 @@ void waybar::modules::Image::refresh(int sig) {
 }
 
 auto waybar::modules::Image::update() -> void {
-  if (config_["path"].isString()) {
-    path_ = config_["path"].asString();
-  } else if (config_["exec"].isString()) {
+  if (config_["exec"].isString()) {
     output_ = util::command::exec(config_["exec"].asString(), "");
     parseOutputRaw();
-  } else {
-    path_ = "";
+    // expand path if "~" or "$HOME" is present in original path
+    auto result = Config::tryExpandPath(path_, "");
+    path_ = result.empty() ? "" : result.front();
   }
 
-  // expand path if "~" or "$HOME" is present in original path
-  auto result = Config::tryExpandPath(path_, "");
-  path_ = result.empty() ? "" : result.front();
-
   if (Glib::file_test(path_, Glib::FILE_TEST_EXISTS)) {
     Glib::RefPtr<Gdk::Pixbuf> pixbuf;