fix(config): restore user path expansion lost in 51265b5

Author: ItsLemmy

src/config/schema/config_schema.cpp

@@ -90,7 +90,7 @@ namespace noctalia::config::schema {
         field(&LockscreenConfig::blurredDesktop, "blurred_desktop"),
         field(&LockscreenConfig::blurIntensity, "blur_intensity", kUnitRange),
         field(&LockscreenConfig::tintIntensity, "tint_intensity", kUnitRange),
-        field(&LockscreenConfig::wallpaper, "wallpaper"),
+        pathStringField(&LockscreenConfig::wallpaper, "wallpaper"),
         field(&LockscreenConfig::monitors, "monitors"),
     };
     return s;
@@ -401,7 +401,7 @@ namespace noctalia::config::schema {
         field(&DockConfig::showInstanceCount, "show_instance_count"),
         enumField(&DockConfig::launcherPosition, "launcher_position", kDockLauncherPositions),
         field(&DockConfig::launcherIcon, "launcher_icon"),
-        field(&DockConfig::launcherCustomImage, "launcher_custom_image"),
+        pathStringField(&DockConfig::launcherCustomImage, "launcher_custom_image"),
         field(&DockConfig::launcherCustomImageColorize, "launcher_custom_image_colorize"),
         field(&DockConfig::pinned, "pinned"),
         field(&DockConfig::monitors, "monitors"),
@@ -643,36 +643,6 @@ namespace noctalia::config::schema {
       );
     }
 
-    // String holding a filesystem path: ~ and $VARS expand on read, emitted raw.
-    template <typename Struct> Field<Struct> pathStringField(std::string Struct::* member, std::string_view key) {
-      return custom<Struct>(
-          key,
-          [member, key](const toml::table& tbl, Struct& out, std::string_view, Diagnostics&) {
-            if (auto v = tbl[key].value<std::string>()) {
-              out.*member = v->empty() ? *v : FileUtils::expandUserPath(*v).string();
-            }
-          },
-          [member, key](toml::table& tbl, const Struct& in) { tbl.insert_or_assign(key, in.*member); }
-      );
-    }
-
-    template <typename Struct>
-    Field<Struct> optionalPathStringField(std::optional<std::string> Struct::* member, std::string_view key) {
-      return custom<Struct>(
-          key,
-          [member, key](const toml::table& tbl, Struct& out, std::string_view, Diagnostics&) {
-            if (auto v = tbl[key].value<std::string>()) {
-              out.*member = v->empty() ? *v : FileUtils::expandUserPath(*v).string();
-            }
-          },
-          [member, key](toml::table& tbl, const Struct& in) {
-            if ((in.*member).has_value()) {
-              tbl.insert_or_assign(key, *(in.*member));
-            }
-          }
-      );
-    }
-
     template <typename Struct>
     Field<Struct> optionalBoolField(std::optional<bool> Struct::* member, std::string_view key) {
       return custom<Struct>(

src/config/schema/field.h

@@ -3,6 +3,7 @@
 #include "config/config_types.h"
 #include "config/schema/diagnostics.h"
 #include "core/toml.h"
+#include "util/file_utils.h"
 #include "util/string_utils.h"
 
 #include <cmath>
@@ -218,6 +219,36 @@ namespace noctalia::config::schema {
     return Field<Struct>{key, std::move(read), std::move(write)};
   }
 
+  // String holding a filesystem path: ~ and $VARS expand on read, emitted raw.
+  template <typename Struct> Field<Struct> pathStringField(std::string Struct::* member, std::string_view key) {
+    return custom<Struct>(
+        key,
+        [member, key](const toml::table& tbl, Struct& out, std::string_view, Diagnostics&) {
+          if (auto v = tbl[key].value<std::string>()) {
+            out.*member = v->empty() ? *v : FileUtils::expandUserPath(*v).string();
+          }
+        },
+        [member, key](toml::table& tbl, const Struct& in) { tbl.insert_or_assign(key, in.*member); }
+    );
+  }
+
+  template <typename Struct>
+  Field<Struct> optionalPathStringField(std::optional<std::string> Struct::* member, std::string_view key) {
+    return custom<Struct>(
+        key,
+        [member, key](const toml::table& tbl, Struct& out, std::string_view, Diagnostics&) {
+          if (auto v = tbl[key].value<std::string>()) {
+            out.*member = v->empty() ? *v : FileUtils::expandUserPath(*v).string();
+          }
+        },
+        [member, key](toml::table& tbl, const Struct& in) {
+          if ((in.*member).has_value()) {
+            tbl.insert_or_assign(key, *(in.*member));
+          }
+        }
+    );
+  }
+
   // A keyless field that runs cross-field logic after all leaf reads (enforcing
   // invariants a per-field codec can't express, e.g. day > night). Writes
   // nothing. Place it last in a Schema so it sees the fully-read struct.

src/shell/bar/widget_factory.cpp

@@ -46,6 +46,7 @@
 #include "shell/bar/widgets/workspaces_widget.h"
 #include "system/format_units.h"
 #include "ui/style.h"
+#include "util/file_utils.h"
 #include "util/string_utils.h"
 #include "wayland/wayland_connection.h"
 
@@ -90,9 +91,12 @@ namespace {
   }
 
   WidgetCustomImage customImageFor(const WidgetConfig* wc) {
+    if (wc == nullptr) {
+      return {};
+    }
     return WidgetCustomImage{
-        .path = wc != nullptr ? wc->getString("custom_image", "") : std::string{},
-        .colorize = wc != nullptr ? wc->getBool("custom_image_colorize", false) : false,
+        .path = FileUtils::expandUserPath(wc->getString("custom_image", "")).string(),
+        .colorize = wc->getBool("custom_image_colorize", false),
     };
   }
 
@@ -468,7 +472,8 @@ std::unique_ptr<Widget> WidgetFactory::create(
   if (type == "sysmon") {
     const bool verticalBar = barPosition == "left" || barPosition == "right";
     std::string statStr = wc != nullptr ? wc->getString("stat", "cpu_usage") : std::string("cpu_usage");
-    std::string path = wc != nullptr ? wc->getString("path", "/") : std::string("/");
+    std::string path =
+        FileUtils::expandUserPath(wc != nullptr ? wc->getString("path", "/") : std::string("/")).string();
     SysmonStat stat = SysmonStat::CpuUsage;
     if (statStr == "cpu_temp") {
       stat = SysmonStat::CpuTemp;