From 702b0a63bf75204d03f9229f1667cb2e77c1b8b8 Mon Sep 17 00:00:00 2001
From: Claire Neveu <mail@claireneveu.com>
Date: Tue, 2 Apr 2024 23:04:48 -0400
Subject: [PATCH 1/5] feat: Add orientation support for clock

---
 src/config/common.rs | 13 +++++++++++++
 src/config/mod.rs    |  2 +-
 src/modules/clock.rs | 19 ++++++++++++++-----
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/config/common.rs b/src/config/common.rs
index 286e294e..876334a7 100644
--- a/src/config/common.rs
+++ b/src/config/common.rs
@@ -40,6 +40,19 @@ pub enum TransitionType {
     SlideEnd,
 }
 
+#[derive(Debug, Deserialize, Clone)]
+#[serde(rename_all = "snake_case")]
+pub enum ModuleOrientation {
+    Horizontal,
+    Vertical,
+}
+
+impl Default for ModuleOrientation {
+    fn default() -> Self {
+        ModuleOrientation::Horizontal
+    }
+}
+
 impl TransitionType {
     pub const fn to_revealer_transition_type(
         &self,
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 52fcb8d6..e57fac8e 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -34,7 +34,7 @@ use color_eyre::Result;
 use serde::Deserialize;
 use std::collections::HashMap;
 
-pub use self::common::{CommonConfig, TransitionType};
+pub use self::common::{CommonConfig, ModuleOrientation, TransitionType};
 pub use self::truncate::TruncateMode;
 
 #[derive(Debug, Deserialize, Clone)]
diff --git a/src/modules/clock.rs b/src/modules/clock.rs
index 9978716c..295ae130 100644
--- a/src/modules/clock.rs
+++ b/src/modules/clock.rs
@@ -8,7 +8,7 @@ use serde::Deserialize;
 use tokio::sync::{broadcast, mpsc};
 use tokio::time::sleep;
 
-use crate::config::CommonConfig;
+use crate::config::{CommonConfig, ModuleOrientation};
 use crate::gtk_helpers::IronbarGtkExt;
 use crate::modules::{
     Module, ModuleInfo, ModuleParts, ModulePopup, ModuleUpdateEvent, PopupButton, WidgetContext,
@@ -31,6 +31,9 @@ pub struct ClockModule {
     #[serde(default = "default_locale")]
     locale: String,
 
+    #[serde(default)]
+    orientation: ModuleOrientation,
+
     #[serde(flatten)]
     pub common: Option<CommonConfig>,
 }
@@ -41,6 +44,7 @@ impl Default for ClockModule {
             format: default_format(),
             format_popup: default_popup_format(),
             locale: default_locale(),
+            orientation: ModuleOrientation::Horizontal,
             common: Some(CommonConfig::default()),
         }
     }
@@ -97,10 +101,15 @@ impl Module<Button> for ClockModule {
         info: &ModuleInfo,
     ) -> Result<ModuleParts<Button>> {
         let button = Button::new();
-        let label = Label::builder()
-            .angle(info.bar_position.get_angle())
-            .use_markup(true)
-            .build();
+        let label = if matches!(self.orientation, ModuleOrientation::Vertical) {
+            Label::builder()
+                .angle(info.bar_position.get_angle())
+                .use_markup(true)
+        } else {
+            Label::builder()
+                .use_markup(true)
+            
+        }.build();
         button.add(&label);
 
         let tx = context.tx.clone();

From 70b2c592b284965382182098b0b90b40bdac9965 Mon Sep 17 00:00:00 2001
From: Claire Neveu <mail@claireneveu.com>
Date: Thu, 4 Apr 2024 16:12:45 -0400
Subject: [PATCH 2/5] feat: Add orientation support for custom label and button

---
 docs/modules/Clock.md          |  1 +
 docs/modules/Custom.md         |  2 +
 src/config/common.rs           | 20 +++++++++
 src/modules/clock.rs           | 13 ++----
 src/modules/custom/box.rs      | 10 ++---
 src/modules/custom/button.rs   |  8 ++++
 src/modules/custom/label.rs    |  7 +++
 src/modules/custom/mod.rs      | 11 -----
 src/modules/custom/progress.rs | 15 ++++---
 src/modules/custom/slider.rs   | 15 ++++---
 test-configs/orientation.yaml  | 82 ++++++++++++++++++++++++++++++++++
 11 files changed, 145 insertions(+), 39 deletions(-)
 create mode 100644 test-configs/orientation.yaml

diff --git a/docs/modules/Clock.md b/docs/modules/Clock.md
index 28630ffa..627be83b 100644
--- a/docs/modules/Clock.md
+++ b/docs/modules/Clock.md
@@ -13,6 +13,7 @@ Clicking on the widget opens a popup with the time and a calendar.
 | `format`       | `string` | `%d/%m/%Y %H:%M`                   | Date/time format string. Pango markup is supported.                                 |
 | `format_popup` | `string` | `%H:%M:%S`                         | Date/time format string to display in the popup header. Pango markup is supported.  |
 | `locale`       | `string` | `$LC_TIME` or `$LANG` or `'POSIX'` | Locale to use (eg `en_GB`). Defaults to the system language (reading from env var). |
+| `orientation` | `'horizontal'` or `'vertical'` (shorthand: `'h'` or `'v'`) | `'horizontal'` | Orientation of the time on the clock button.                                                                                                      |
 
 > Detail on available tokens can be found here: <https://docs.rs/chrono/latest/chrono/format/strftime/index.html>
 
diff --git a/docs/modules/Custom.md b/docs/modules/Custom.md
index 4d9a44b0..f9e718fb 100644
--- a/docs/modules/Custom.md
+++ b/docs/modules/Custom.md
@@ -57,6 +57,7 @@ A text label. Pango markup is supported.
 | Name    | Type                                            | Default | Description                                                         |
 |---------|-------------------------------------------------|---------|---------------------------------------------------------------------|
 | `label` | [Dynamic String](dynamic-values#dynamic-string) | `null`  | Widget text label. Pango markup and embedded scripts are supported. |
+| `orientation` | `'horizontal'` or `'vertical'` (shorthand: `'h'` or `'v'`) | `'horizontal'` | Orientation of the label.                                                                                                      |
 
 #### Button
 
@@ -69,6 +70,7 @@ A clickable button, which can run a command when clicked.
 | `label`    | [Dynamic String](dynamic-values#dynamic-string) | `null`  | Widget text label. Pango markup and embedded scripts are supported. Ignored if `widgets` is set. |
 | `widgets`  | `(Module or Widget)[]`                          | `[]`    | List of modules/widgets to add to this button.                                                   |
 | `on_click` | `string [command]`                              | `null`  | Command to execute. More on this [below](#commands).                                             |
+| `orientation` | `'horizontal'` or `'vertical'` (shorthand: `'h'` or `'v'`) | `'horizontal'` | Orientation of the button.                                                                                                      |
 
 #### Image
 
diff --git a/src/config/common.rs b/src/config/common.rs
index 876334a7..bc8ba202 100644
--- a/src/config/common.rs
+++ b/src/config/common.rs
@@ -43,10 +43,30 @@ pub enum TransitionType {
 #[derive(Debug, Deserialize, Clone)]
 #[serde(rename_all = "snake_case")]
 pub enum ModuleOrientation {
+    #[serde(alias = "h")]
     Horizontal,
+    #[serde(alias = "v")]
     Vertical,
 }
 
+impl ModuleOrientation {
+    pub const fn to_angle(&self) -> f64 {
+        match self {
+            Self::Horizontal => 0.0,
+            Self::Vertical => 90.0
+        }
+    }
+}
+
+impl From<ModuleOrientation> for Orientation {
+    fn from(o: ModuleOrientation) -> Self {
+        match o {
+            ModuleOrientation::Horizontal => Orientation::Horizontal,
+            ModuleOrientation::Vertical => Orientation::Vertical
+        }
+    }
+}
+
 impl Default for ModuleOrientation {
     fn default() -> Self {
         ModuleOrientation::Horizontal
diff --git a/src/modules/clock.rs b/src/modules/clock.rs
index 295ae130..602c6e4b 100644
--- a/src/modules/clock.rs
+++ b/src/modules/clock.rs
@@ -101,15 +101,10 @@ impl Module<Button> for ClockModule {
         info: &ModuleInfo,
     ) -> Result<ModuleParts<Button>> {
         let button = Button::new();
-        let label = if matches!(self.orientation, ModuleOrientation::Vertical) {
-            Label::builder()
-                .angle(info.bar_position.get_angle())
-                .use_markup(true)
-        } else {
-            Label::builder()
-                .use_markup(true)
-            
-        }.build();
+        let label = Label::builder()
+            .angle(self.orientation.to_angle())
+            .use_markup(true)
+            .build();
         button.add(&label);
 
         let tx = context.tx.clone();
diff --git a/src/modules/custom/box.rs b/src/modules/custom/box.rs
index 5e671b9c..bfdb28af 100644
--- a/src/modules/custom/box.rs
+++ b/src/modules/custom/box.rs
@@ -1,15 +1,15 @@
-use super::{try_get_orientation, CustomWidget, CustomWidgetContext};
+use super::{CustomWidget, CustomWidgetContext};
 use crate::build;
+use crate::config::ModuleOrientation;
 use crate::modules::custom::WidgetConfig;
-use gtk::prelude::*;
-use gtk::Orientation;
+use gtk::{prelude::*, Orientation};
 use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone)]
 pub struct BoxWidget {
     name: Option<String>,
     class: Option<String>,
-    orientation: Option<String>,
+    orientation: Option<ModuleOrientation>,
     widgets: Option<Vec<WidgetConfig>>,
 }
 
@@ -21,7 +21,7 @@ impl CustomWidget for BoxWidget {
 
         if let Some(orientation) = self.orientation {
             container.set_orientation(
-                try_get_orientation(&orientation).unwrap_or(Orientation::Horizontal),
+                Orientation::from(orientation),
             );
         }
 
diff --git a/src/modules/custom/button.rs b/src/modules/custom/button.rs
index dba683ef..7b152f3e 100644
--- a/src/modules/custom/button.rs
+++ b/src/modules/custom/button.rs
@@ -2,6 +2,7 @@ use gtk::prelude::*;
 use gtk::{Button, Label, Orientation};
 use serde::Deserialize;
 
+use crate::config::ModuleOrientation;
 use crate::dynamic_value::dynamic_string;
 use crate::modules::PopupButton;
 use crate::{build, try_send};
@@ -15,6 +16,8 @@ pub struct ButtonWidget {
     label: Option<String>,
     on_click: Option<String>,
     widgets: Option<Vec<WidgetConfig>>,
+    #[serde(default)]
+    orientation: ModuleOrientation,
 }
 
 impl CustomWidget for ButtonWidget {
@@ -35,6 +38,11 @@ impl CustomWidget for ButtonWidget {
         } else if let Some(text) = self.label {
             let label = Label::new(None);
             label.set_use_markup(true);
+
+            label.set_angle(
+                self.orientation.to_angle(),
+            );
+
             button.add(&label);
 
             dynamic_string(&text, move |string| {
diff --git a/src/modules/custom/label.rs b/src/modules/custom/label.rs
index 984c45c3..aab28599 100644
--- a/src/modules/custom/label.rs
+++ b/src/modules/custom/label.rs
@@ -3,6 +3,7 @@ use gtk::Label;
 use serde::Deserialize;
 
 use crate::build;
+use crate::config::ModuleOrientation;
 use crate::dynamic_value::dynamic_string;
 
 use super::{CustomWidget, CustomWidgetContext};
@@ -12,6 +13,8 @@ pub struct LabelWidget {
     name: Option<String>,
     class: Option<String>,
     label: String,
+    #[serde(default)]
+    orientation: ModuleOrientation,
 }
 
 impl CustomWidget for LabelWidget {
@@ -20,6 +23,10 @@ impl CustomWidget for LabelWidget {
     fn into_widget(self, _context: CustomWidgetContext) -> Self::Widget {
         let label = build!(self, Self::Widget);
 
+        label.set_angle(
+            self.orientation.to_angle(),
+        );
+
         label.set_use_markup(true);
 
         {
diff --git a/src/modules/custom/mod.rs b/src/modules/custom/mod.rs
index d1a099a5..a0b198c9 100644
--- a/src/modules/custom/mod.rs
+++ b/src/modules/custom/mod.rs
@@ -113,17 +113,6 @@ pub fn set_length<W: WidgetExt>(widget: &W, length: i32, bar_orientation: Orient
     };
 }
 
-/// Attempts to parse an `Orientation` from `String`.
-/// Will accept `horizontal`, `vertical`, `h` or `v`.
-/// Ignores case.
-fn try_get_orientation(orientation: &str) -> Result<Orientation> {
-    match orientation.to_lowercase().as_str() {
-        "horizontal" | "h" => Ok(Orientation::Horizontal),
-        "vertical" | "v" => Ok(Orientation::Vertical),
-        _ => Err(Report::msg("Invalid orientation string in config")),
-    }
-}
-
 impl WidgetOrModule {
     fn add_to(self, parent: &gtk::Box, context: &CustomWidgetContext, common: CommonConfig) {
         match self {
diff --git a/src/modules/custom/progress.rs b/src/modules/custom/progress.rs
index 5fb89bed..cfbb5104 100644
--- a/src/modules/custom/progress.rs
+++ b/src/modules/custom/progress.rs
@@ -1,21 +1,24 @@
 use gtk::prelude::*;
+use gtk::Orientation;
 use gtk::ProgressBar;
 use serde::Deserialize;
 use tokio::sync::mpsc;
 use tracing::error;
 
+use crate::config::ModuleOrientation;
 use crate::dynamic_value::dynamic_string;
 use crate::modules::custom::set_length;
 use crate::script::{OutputStream, Script, ScriptInput};
 use crate::{build, glib_recv_mpsc, spawn, try_send};
 
-use super::{try_get_orientation, CustomWidget, CustomWidgetContext};
+use super::{CustomWidget, CustomWidgetContext};
 
 #[derive(Debug, Deserialize, Clone)]
 pub struct ProgressWidget {
     name: Option<String>,
     class: Option<String>,
-    orientation: Option<String>,
+    #[serde(default)]
+    orientation: ModuleOrientation,
     label: Option<String>,
     value: Option<ScriptInput>,
     #[serde(default = "default_max")]
@@ -33,11 +36,9 @@ impl CustomWidget for ProgressWidget {
     fn into_widget(self, context: CustomWidgetContext) -> Self::Widget {
         let progress = build!(self, Self::Widget);
 
-        if let Some(orientation) = self.orientation {
-            progress.set_orientation(
-                try_get_orientation(&orientation).unwrap_or(context.bar_orientation),
-            );
-        }
+        progress.set_orientation(
+            Orientation::from(self.orientation),
+        );
 
         if let Some(length) = self.length {
             set_length(&progress, length, context.bar_orientation);
diff --git a/src/modules/custom/slider.rs b/src/modules/custom/slider.rs
index e94b3bff..0426039b 100644
--- a/src/modules/custom/slider.rs
+++ b/src/modules/custom/slider.rs
@@ -1,4 +1,5 @@
 use glib::Propagation;
+use gtk::Orientation;
 use std::cell::Cell;
 use std::ops::Neg;
 
@@ -8,17 +9,19 @@ use serde::Deserialize;
 use tokio::sync::mpsc;
 use tracing::error;
 
+use crate::config::ModuleOrientation;
 use crate::modules::custom::set_length;
 use crate::script::{OutputStream, Script, ScriptInput};
 use crate::{build, glib_recv_mpsc, spawn, try_send};
 
-use super::{try_get_orientation, CustomWidget, CustomWidgetContext, ExecEvent};
+use super::{CustomWidget, CustomWidgetContext, ExecEvent};
 
 #[derive(Debug, Deserialize, Clone)]
 pub struct SliderWidget {
     name: Option<String>,
     class: Option<String>,
-    orientation: Option<String>,
+    #[serde(default)]
+    orientation: ModuleOrientation,
     value: Option<ScriptInput>,
     on_change: Option<String>,
     #[serde(default = "default_min")]
@@ -45,11 +48,9 @@ impl CustomWidget for SliderWidget {
     fn into_widget(self, context: CustomWidgetContext) -> Self::Widget {
         let scale = build!(self, Self::Widget);
 
-        if let Some(orientation) = self.orientation {
-            scale.set_orientation(
-                try_get_orientation(&orientation).unwrap_or(context.bar_orientation),
-            );
-        }
+        scale.set_orientation(
+            Orientation::from(self.orientation),
+        );
 
         if let Some(length) = self.length {
             set_length(&scale, length, context.bar_orientation);
diff --git a/test-configs/orientation.yaml b/test-configs/orientation.yaml
new file mode 100644
index 00000000..93594c86
--- /dev/null
+++ b/test-configs/orientation.yaml
@@ -0,0 +1,82 @@
+position: "left"
+start:
+  - type: clock
+    format: "%H:%M"
+  - type: clock
+    format: "%H:%M"
+    orientation: horizontal
+  - type: clock
+    format: "%H:%M"
+    orientation: h
+  - type: clock
+    format: "%H:%M"
+    orientation: vertical
+  - type: clock
+    format: "%H:%M"
+    orientation: v
+  - type: custom
+    bar:
+    - type: label
+      label: "label"
+    - type: label
+      label: "label"
+      orientation: horizontal
+    - type: label
+      label: "label"
+      orientation: h
+    - type: label
+      label: "label"
+      orientation: vertical
+    - type: label
+      label: "label"
+      orientation: v
+  - type: custom
+    bar:
+    - type: button
+      label: "label"
+    - type: button
+      label: "label"
+      orientation: horizontal
+    - type: button
+      label: "label"
+      orientation: h
+    - type: button
+      label: "label"
+      orientation: vertical
+    - type: button
+      label: "label"
+      orientation: v
+  - type: custom
+    bar:
+    - type: progress
+      value: "echo 50"
+    - type: progress
+      value: "echo 50"
+      orientation: horizontal
+    - type: progress
+      value: "echo 50"
+      orientation: h
+    - type: progress
+      value: "echo 50"
+      orientation: vertical
+    - type: progress
+      value: "echo 50"
+      orientation: v
+  - type: custom
+    bar:
+    - type: slider
+      value: "echo 50"
+    - type: slider
+      value: "echo 50"
+      orientation: horizontal
+    - type: slider
+      value: "echo 50"
+      orientation: h
+    - type: slider
+      value: "echo 50"
+      length: 100
+      orientation: vertical
+    - type: slider
+      value: "echo 50"
+      length: 100
+      orientation: v
\ No newline at end of file

From 44be58594b296ff6a1a7d902c88aa01116322538 Mon Sep 17 00:00:00 2001
From: Claire Neveu <mail@claireneveu.com>
Date: Fri, 5 Apr 2024 13:28:47 -0400
Subject: [PATCH 3/5] feat: Add orientation and direction support for sys info

---
 docs/modules/Sys-Info.md       |  2 ++
 src/config/common.rs           | 17 ++++++---------
 src/modules/custom/box.rs      |  6 ++----
 src/modules/custom/button.rs   |  4 +---
 src/modules/custom/label.rs    |  4 +---
 src/modules/custom/mod.rs      |  2 +-
 src/modules/custom/progress.rs |  5 +----
 src/modules/custom/slider.rs   |  5 +----
 src/modules/sysinfo.rs         | 18 ++++++++++++----
 test-configs/orientation.yaml  | 39 ++++++++++++++++++++++++++++++++--
 10 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/docs/modules/Sys-Info.md b/docs/modules/Sys-Info.md
index 232c802f..d2aeddc7 100644
--- a/docs/modules/Sys-Info.md
+++ b/docs/modules/Sys-Info.md
@@ -19,6 +19,8 @@ Pango markup is supported.
 | `interval.temps`   | `integer`          | `5`     | Seconds between refreshing temperature data                                                                                    |
 | `interval.disks`   | `integer`          | `5`     | Seconds between refreshing disk data                                                                                           |
 | `interval.network` | `integer`          | `5`     | Seconds between refreshing network data                                                                                        |
+| `orientation` | `'horizontal'` or `'vertical'` (shorthand: `'h'` or `'v'`) | `'horizontal'` | Orientation of the labels.                                                                                                      |
+| `direction` | `'horizontal'` or `'vertical'` (shorthand: `'h'` or `'v'`) | `'horizontal'` | How the labels are laid out (not the rotation of an individual label).                                                                                                      |
 
 <details>
 <summary>JSON</summary>
diff --git a/src/config/common.rs b/src/config/common.rs
index bc8ba202..25a89446 100644
--- a/src/config/common.rs
+++ b/src/config/common.rs
@@ -40,9 +40,10 @@ pub enum TransitionType {
     SlideEnd,
 }
 
-#[derive(Debug, Deserialize, Clone)]
+#[derive(Debug, Default, Deserialize, Clone, Copy)]
 #[serde(rename_all = "snake_case")]
 pub enum ModuleOrientation {
+    #[default]
     #[serde(alias = "h")]
     Horizontal,
     #[serde(alias = "v")]
@@ -50,10 +51,10 @@ pub enum ModuleOrientation {
 }
 
 impl ModuleOrientation {
-    pub const fn to_angle(&self) -> f64 {
+    pub const fn to_angle(self) -> f64 {
         match self {
             Self::Horizontal => 0.0,
-            Self::Vertical => 90.0
+            Self::Vertical => 90.0,
         }
     }
 }
@@ -61,18 +62,12 @@ impl ModuleOrientation {
 impl From<ModuleOrientation> for Orientation {
     fn from(o: ModuleOrientation) -> Self {
         match o {
-            ModuleOrientation::Horizontal => Orientation::Horizontal,
-            ModuleOrientation::Vertical => Orientation::Vertical
+            ModuleOrientation::Horizontal => Self::Horizontal,
+            ModuleOrientation::Vertical => Self::Vertical,
         }
     }
 }
 
-impl Default for ModuleOrientation {
-    fn default() -> Self {
-        ModuleOrientation::Horizontal
-    }
-}
-
 impl TransitionType {
     pub const fn to_revealer_transition_type(
         &self,
diff --git a/src/modules/custom/box.rs b/src/modules/custom/box.rs
index bfdb28af..dca848a1 100644
--- a/src/modules/custom/box.rs
+++ b/src/modules/custom/box.rs
@@ -2,7 +2,7 @@ use super::{CustomWidget, CustomWidgetContext};
 use crate::build;
 use crate::config::ModuleOrientation;
 use crate::modules::custom::WidgetConfig;
-use gtk::{prelude::*, Orientation};
+use gtk::prelude::*;
 use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone)]
@@ -20,9 +20,7 @@ impl CustomWidget for BoxWidget {
         let container = build!(self, Self::Widget);
 
         if let Some(orientation) = self.orientation {
-            container.set_orientation(
-                Orientation::from(orientation),
-            );
+            container.set_orientation(orientation.into());
         }
 
         if let Some(widgets) = self.widgets {
diff --git a/src/modules/custom/button.rs b/src/modules/custom/button.rs
index 7b152f3e..199420d3 100644
--- a/src/modules/custom/button.rs
+++ b/src/modules/custom/button.rs
@@ -39,9 +39,7 @@ impl CustomWidget for ButtonWidget {
             let label = Label::new(None);
             label.set_use_markup(true);
 
-            label.set_angle(
-                self.orientation.to_angle(),
-            );
+            label.set_angle(self.orientation.to_angle());
 
             button.add(&label);
 
diff --git a/src/modules/custom/label.rs b/src/modules/custom/label.rs
index aab28599..ca551c8d 100644
--- a/src/modules/custom/label.rs
+++ b/src/modules/custom/label.rs
@@ -23,9 +23,7 @@ impl CustomWidget for LabelWidget {
     fn into_widget(self, _context: CustomWidgetContext) -> Self::Widget {
         let label = build!(self, Self::Widget);
 
-        label.set_angle(
-            self.orientation.to_angle(),
-        );
+        label.set_angle(self.orientation.to_angle());
 
         label.set_use_markup(true);
 
diff --git a/src/modules/custom/mod.rs b/src/modules/custom/mod.rs
index a0b198c9..dc54e839 100644
--- a/src/modules/custom/mod.rs
+++ b/src/modules/custom/mod.rs
@@ -18,7 +18,7 @@ use crate::modules::{
 };
 use crate::script::Script;
 use crate::{module_impl, send_async, spawn};
-use color_eyre::{Report, Result};
+use color_eyre::Result;
 use gtk::prelude::*;
 use gtk::{Button, IconTheme, Orientation};
 use serde::Deserialize;
diff --git a/src/modules/custom/progress.rs b/src/modules/custom/progress.rs
index cfbb5104..16f46f8f 100644
--- a/src/modules/custom/progress.rs
+++ b/src/modules/custom/progress.rs
@@ -1,5 +1,4 @@
 use gtk::prelude::*;
-use gtk::Orientation;
 use gtk::ProgressBar;
 use serde::Deserialize;
 use tokio::sync::mpsc;
@@ -36,9 +35,7 @@ impl CustomWidget for ProgressWidget {
     fn into_widget(self, context: CustomWidgetContext) -> Self::Widget {
         let progress = build!(self, Self::Widget);
 
-        progress.set_orientation(
-            Orientation::from(self.orientation),
-        );
+        progress.set_orientation(self.orientation.into());
 
         if let Some(length) = self.length {
             set_length(&progress, length, context.bar_orientation);
diff --git a/src/modules/custom/slider.rs b/src/modules/custom/slider.rs
index 0426039b..6bb3634a 100644
--- a/src/modules/custom/slider.rs
+++ b/src/modules/custom/slider.rs
@@ -1,5 +1,4 @@
 use glib::Propagation;
-use gtk::Orientation;
 use std::cell::Cell;
 use std::ops::Neg;
 
@@ -48,9 +47,7 @@ impl CustomWidget for SliderWidget {
     fn into_widget(self, context: CustomWidgetContext) -> Self::Widget {
         let scale = build!(self, Self::Widget);
 
-        scale.set_orientation(
-            Orientation::from(self.orientation),
-        );
+        scale.set_orientation(self.orientation.into());
 
         if let Some(length) = self.length {
             set_length(&scale, length, context.bar_orientation);
diff --git a/src/modules/sysinfo.rs b/src/modules/sysinfo.rs
index c6a9f664..4b0966f9 100644
--- a/src/modules/sysinfo.rs
+++ b/src/modules/sysinfo.rs
@@ -1,4 +1,4 @@
-use crate::config::CommonConfig;
+use crate::config::{CommonConfig, ModuleOrientation};
 use crate::gtk_helpers::IronbarGtkExt;
 use crate::modules::{Module, ModuleInfo, ModuleParts, ModuleUpdateEvent, WidgetContext};
 use crate::{glib_recv, module_impl, send_async, spawn};
@@ -21,6 +21,11 @@ pub struct SysInfoModule {
     #[serde(default = "Interval::default")]
     interval: Interval,
 
+    #[serde(default)]
+    orientation: ModuleOrientation,
+
+    direction: Option<ModuleOrientation>,
+
     #[serde(flatten)]
     pub common: Option<CommonConfig>,
 }
@@ -182,11 +187,16 @@ impl Module<gtk::Box> for SysInfoModule {
     fn into_widget(
         self,
         context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
-        info: &ModuleInfo,
+        _info: &ModuleInfo,
     ) -> Result<ModuleParts<gtk::Box>> {
         let re = Regex::new(r"\{([^}]+)}")?;
 
-        let container = gtk::Box::new(info.bar_position.orientation(), 10);
+        let layout = match self.direction {
+            Some(orientation) => orientation,
+            None => self.orientation,
+        };
+
+        let container = gtk::Box::new(layout.into(), 10);
 
         let mut labels = Vec::new();
 
@@ -194,7 +204,7 @@ impl Module<gtk::Box> for SysInfoModule {
             let label = Label::builder().label(format).use_markup(true).build();
 
             label.add_class("item");
-            label.set_angle(info.bar_position.get_angle());
+            label.set_angle(self.orientation.to_angle());
 
             container.add(&label);
             labels.push(label);
diff --git a/test-configs/orientation.yaml b/test-configs/orientation.yaml
index 93594c86..8aefd7ab 100644
--- a/test-configs/orientation.yaml
+++ b/test-configs/orientation.yaml
@@ -1,4 +1,4 @@
-position: "left"
+position: "bottom"
 start:
   - type: clock
     format: "%H:%M"
@@ -79,4 +79,39 @@ start:
     - type: slider
       value: "echo 50"
       length: 100
-      orientation: v
\ No newline at end of file
+      orientation: v
+  - type: sys_info
+    format:
+    - ' {cpu_percent}%'
+    - ' {memory_used} / {memory_total} GB ({memory_percent}%)'
+    - '󰥔 {uptime}'
+    interval:
+      cpu: 1
+      disks: 300
+      memory: 30
+      networks: 3
+      temps: 5
+  - type: sys_info
+    orientation: vertical
+    format:
+    - ' {cpu_percent}%'
+    - ' {memory_used} / {memory_total} GB ({memory_percent}%)'
+    - '󰥔 {uptime}'
+    interval:
+      cpu: 1
+      disks: 300
+      memory: 30
+      networks: 3
+      temps: 5
+  - type: sys_info
+    layout: vertical
+    format:
+    - ' {cpu_percent}%'
+    - ' {memory_used} / {memory_total} GB ({memory_percent}%)'
+    - '󰥔 {uptime}'
+    interval:
+      cpu: 1
+      disks: 300
+      memory: 30
+      networks: 3
+      temps: 5
\ No newline at end of file

From dcb5036964524d59a56263e52135574fd7af8459 Mon Sep 17 00:00:00 2001
From: Claire Neveu <mail@claireneveu.com>
Date: Sat, 6 Apr 2024 10:39:56 -0400
Subject: [PATCH 4/5] chore: add test config file

---
 test-configs/orientation.corn | 192 ++++++++++++++++++++++++++++++++++
 test-configs/orientation.yaml | 117 ---------------------
 2 files changed, 192 insertions(+), 117 deletions(-)
 create mode 100644 test-configs/orientation.corn
 delete mode 100644 test-configs/orientation.yaml

diff --git a/test-configs/orientation.corn b/test-configs/orientation.corn
new file mode 100644
index 00000000..c01d0d29
--- /dev/null
+++ b/test-configs/orientation.corn
@@ -0,0 +1,192 @@
+
+{
+  position = "bottom"
+  start = [
+    {
+      type = "clock"
+      format = "%H:%M"
+    }
+    {
+      type = "clock"
+      format = "%H:%M"
+      orientation = "horizontal"
+    }
+    {
+      type = "clock"
+      format = "%H:%M"
+      orientation = "h"
+    }
+    {
+      type = "clock"
+      format = "%H:%M"
+      orientation = "vertical"
+    }
+    {
+      type = "clock"
+      format = "%H:%M"
+      orientation = "v"
+    }
+    {
+      type = "custom"
+      bar = [
+        {
+          type = "label"
+          label = "label"
+        }
+        {
+          type = "label"
+          label = "label"
+          orientation = "horizontal"
+        }
+        {
+          type = "label"
+          label = "label"
+          orientation = "h"
+        }
+        {
+          type = "label"
+          label = "label"
+          orientation = "vertical"
+        }
+        {
+          type = "label"
+          label = "label"
+          orientation = "v"
+        }
+      ]
+    }
+    {
+      type = "custom"
+      bar = [
+        {
+          type = "button"
+          label = "label"
+        }
+        {
+          type = "button"
+          label = "label"
+          orientation = "horizontal"
+        }
+        {
+          type = "button"
+          label = "label"
+          orientation = "h"
+        }
+        {
+          type = "button"
+          label = "label"
+          orientation = "vertical"
+        }
+        {
+          type = "button"
+          label = "label"
+          orientation = "v"
+        }
+      ]
+    }
+    {
+      type = "custom"
+      bar = [
+        {
+          type = "progress"
+          value = "echo 50"
+        }
+        {
+          type = "progress"
+          value = "echo 50"
+          orientation = "horizontal"
+        }
+        {
+          type = "progress"
+          value = "echo 50"
+          orientation = "h"
+        }
+        {
+          type = "progress"
+          value = "echo 50"
+          orientation = "vertical"
+        }
+        {
+          type = "progress"
+          value = "echo 50"
+          orientation = "v"
+        }
+      ]
+    }
+    {
+      type = "custom"
+      bar = [
+        {
+          type = "slider"
+          value = "echo 50"
+          length = 100
+        }
+        {
+          type = "slider"
+          value = "echo 50"
+          length = 100
+          orientation = "horizontal"
+        }
+        {
+          type = "slider"
+          value = "echo 50"
+          length = 100
+          orientation = "h"
+        }
+        {
+          type = "slider"
+          value = "echo 50"
+          length = 100
+          orientation = "vertical"
+        }
+        {
+          type = "slider"
+          value = "echo 50"
+          length = 100
+          orientation = "v"
+        }
+      ]
+    }
+    {
+      type = "sys_info"
+      interval.memory = 30
+      interval.cpu = 1
+      interval.temps = 5
+      interval.disks = 300
+      interval.networks = 3
+      format = [
+        " {cpu_percent}%"
+        " {memory_used} / {memory_total} GB ({memory_percent}%)"
+        "󰥔 {uptime}"
+      ]
+    }
+    {
+      type = "sys_info"
+      orientation = "vertical"
+      interval.memory = 30
+      interval.cpu = 1
+      interval.temps = 5
+      interval.disks = 300
+      interval.networks = 3
+      format = [
+        " {cpu_percent}%"
+        " {memory_used} / {memory_total} GB ({memory_percent}%)"
+        "󰥔 {uptime}"
+      ]
+    }
+    {
+      type = "sys_info"
+      layout = "vertical"
+      interval.memory = 30
+      interval.cpu = 1
+      interval.temps = 5
+      interval.disks = 300
+      interval.networks = 3
+      format = [
+        " {cpu_percent}%"
+        " {memory_used} / {memory_total} GB ({memory_percent}%)"
+        "󰥔 {uptime}"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test-configs/orientation.yaml b/test-configs/orientation.yaml
deleted file mode 100644
index 8aefd7ab..00000000
--- a/test-configs/orientation.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-position: "bottom"
-start:
-  - type: clock
-    format: "%H:%M"
-  - type: clock
-    format: "%H:%M"
-    orientation: horizontal
-  - type: clock
-    format: "%H:%M"
-    orientation: h
-  - type: clock
-    format: "%H:%M"
-    orientation: vertical
-  - type: clock
-    format: "%H:%M"
-    orientation: v
-  - type: custom
-    bar:
-    - type: label
-      label: "label"
-    - type: label
-      label: "label"
-      orientation: horizontal
-    - type: label
-      label: "label"
-      orientation: h
-    - type: label
-      label: "label"
-      orientation: vertical
-    - type: label
-      label: "label"
-      orientation: v
-  - type: custom
-    bar:
-    - type: button
-      label: "label"
-    - type: button
-      label: "label"
-      orientation: horizontal
-    - type: button
-      label: "label"
-      orientation: h
-    - type: button
-      label: "label"
-      orientation: vertical
-    - type: button
-      label: "label"
-      orientation: v
-  - type: custom
-    bar:
-    - type: progress
-      value: "echo 50"
-    - type: progress
-      value: "echo 50"
-      orientation: horizontal
-    - type: progress
-      value: "echo 50"
-      orientation: h
-    - type: progress
-      value: "echo 50"
-      orientation: vertical
-    - type: progress
-      value: "echo 50"
-      orientation: v
-  - type: custom
-    bar:
-    - type: slider
-      value: "echo 50"
-    - type: slider
-      value: "echo 50"
-      orientation: horizontal
-    - type: slider
-      value: "echo 50"
-      orientation: h
-    - type: slider
-      value: "echo 50"
-      length: 100
-      orientation: vertical
-    - type: slider
-      value: "echo 50"
-      length: 100
-      orientation: v
-  - type: sys_info
-    format:
-    - ' {cpu_percent}%'
-    - ' {memory_used} / {memory_total} GB ({memory_percent}%)'
-    - '󰥔 {uptime}'
-    interval:
-      cpu: 1
-      disks: 300
-      memory: 30
-      networks: 3
-      temps: 5
-  - type: sys_info
-    orientation: vertical
-    format:
-    - ' {cpu_percent}%'
-    - ' {memory_used} / {memory_total} GB ({memory_percent}%)'
-    - '󰥔 {uptime}'
-    interval:
-      cpu: 1
-      disks: 300
-      memory: 30
-      networks: 3
-      temps: 5
-  - type: sys_info
-    layout: vertical
-    format:
-    - ' {cpu_percent}%'
-    - ' {memory_used} / {memory_total} GB ({memory_percent}%)'
-    - '󰥔 {uptime}'
-    interval:
-      cpu: 1
-      disks: 300
-      memory: 30
-      networks: 3
-      temps: 5
\ No newline at end of file

From f50a65eab5edfa3a96e4e3b7e54de754ead1eb21 Mon Sep 17 00:00:00 2001
From: Claire Neveu <mail@claireneveu.com>
Date: Sat, 6 Apr 2024 10:42:21 -0400
Subject: [PATCH 5/5] fix: upower module should display correctly for vertical
 bars

---
 src/modules/upower.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/modules/upower.rs b/src/modules/upower.rs
index 8d1e53b7..f2b19394 100644
--- a/src/modules/upower.rs
+++ b/src/modules/upower.rs
@@ -181,7 +181,6 @@ impl Module<gtk::Button> for UpowerModule {
             try_send!(tx, ModuleUpdateEvent::TogglePopup(button.popup_id()));
         });
 
-        label.set_angle(info.bar_position.get_angle());
         let format = self.format.clone();
 
         let rx = context.subscribe();