From 388c024298bb81ee33052d61e69a72995c2b32ec Mon Sep 17 00:00:00 2001 From: idm1try Date: Tue, 19 Sep 2023 18:50:39 +0500 Subject: [PATCH 1/3] fix(backlight): wrong percentage numbers for device apple-panel-bl --- flake.nix | 1 + result | 1 + src/modules/backlight.cpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 120000 result diff --git a/flake.nix b/flake.nix index 24fcae9f..15e70b63 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,7 @@ inherit (nixpkgs) lib; genSystems = lib.genAttrs [ "x86_64-linux" + "aarch64-linux" ]; pkgsFor = genSystems (system: diff --git a/result b/result new file mode 120000 index 00000000..a8f7089b --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/0pz53p83i16kv8ff5pwxhpp7zvmxapm9-waybar-0.9.22+date=2023-09-13_dirty \ No newline at end of file diff --git a/src/modules/backlight.cpp b/src/modules/backlight.cpp index 27871048..40c63f07 100644 --- a/src/modules/backlight.cpp +++ b/src/modules/backlight.cpp @@ -244,7 +244,7 @@ void waybar::modules::Backlight::upsert_device(ForwardIt first, ForwardIt last, check_nn(name); const char *actual_brightness_attr = - strncmp(name, "amdgpu_bl", 9) == 0 ? "brightness" : "actual_brightness"; + strncmp(name, "amdgpu_bl", 9) == 0 ? "brightness" : strcmp(name, "apple-panel-bl") == 0 ? "brightness" : "actual_brightness"; const char *actual = udev_device_get_sysattr_value(dev, actual_brightness_attr); const char *max = udev_device_get_sysattr_value(dev, "max_brightness"); From 954bea36f4f7f9205e563d49c283f9e40d43af38 Mon Sep 17 00:00:00 2001 From: idm1try Date: Tue, 19 Sep 2023 18:52:00 +0500 Subject: [PATCH 2/3] chore: remove result dir by nix --- result | 1 - 1 file changed, 1 deletion(-) delete mode 120000 result diff --git a/result b/result deleted file mode 120000 index a8f7089b..00000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/0pz53p83i16kv8ff5pwxhpp7zvmxapm9-waybar-0.9.22+date=2023-09-13_dirty \ No newline at end of file From 81ffeebfb1d7a761c7069627dd2462388043487c Mon Sep 17 00:00:00 2001 From: idm1try Date: Thu, 21 Sep 2023 09:03:13 +0500 Subject: [PATCH 3/3] fix: style Co-authored-by: Alexis Rouillard --- src/modules/backlight.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/backlight.cpp b/src/modules/backlight.cpp index 40c63f07..dff10743 100644 --- a/src/modules/backlight.cpp +++ b/src/modules/backlight.cpp @@ -244,7 +244,7 @@ void waybar::modules::Backlight::upsert_device(ForwardIt first, ForwardIt last, check_nn(name); const char *actual_brightness_attr = - strncmp(name, "amdgpu_bl", 9) == 0 ? "brightness" : strcmp(name, "apple-panel-bl") == 0 ? "brightness" : "actual_brightness"; + strncmp(name, "amdgpu_bl", 9) == 0 || strcmp(name, "apple-panel-bl") == 0 ? "brightness" : "actual_brightness"; const char *actual = udev_device_get_sysattr_value(dev, actual_brightness_attr); const char *max = udev_device_get_sysattr_value(dev, "max_brightness");