1 files changed, 8 insertions, 9 deletions

diff --git a/src/state/bar.rs b/src/state/bar.rs
index 6462449..2f8e6aa 100644
--- a/src/state/bar.rs
+++ b/src/state/bar.rs
@@ -1,15 +1,14 @@
 macro_rules! BarState {
-    ($name:ident, $cfg:expr, $cfg_mut:expr) => {
+    ($name:ident, $type:ty, $cfg:expr, $cfg_mut:expr) => {
         use crate::lua::evalsto::EvalTo;
-        use crate::state::view::mode::Mode;
         use crate::widgets::statusbar::StatusBar;
         use mlua::{Lua, UserData};
 
         #[derive(Debug, Default, Clone)]
         pub struct $name {
-            pub left: EvalTo<String, Mode>,
-            pub middle: EvalTo<String, Mode>,
-            pub right: EvalTo<String, Mode>,
+            pub left: EvalTo<String, $type>,
+            pub middle: EvalTo<String, $type>,
+            pub right: EvalTo<String, $type>,
         }
 
         impl $name {
@@ -21,7 +20,7 @@ macro_rules! BarState {
                 }
             }
 
-            pub fn apply(bar: &mut StatusBar, mode: Mode, lua: &Lua) {
+            pub fn apply(bar: &mut StatusBar, mode: $type, lua: &Lua) {
                 let (left, middle, right) = (
                     $cfg.left.get(mode, lua).unwrap_or_default(),
                     $cfg.middle.get(mode, lua).unwrap_or_default(),
@@ -36,19 +35,19 @@ macro_rules! BarState {
         impl UserData for $name {
             fn add_fields<'lua, F: mlua::prelude::LuaUserDataFields<'lua, Self>>(fields: &mut F) {
                 fields.add_field_function_get("left", |_, _| Ok($cfg.left.clone()));
-                fields.add_field_function_set("left", |_, _, style: EvalTo<String, Mode>| {
+                fields.add_field_function_set("left", |_, _, style: EvalTo<String, $type>| {
                     $cfg_mut.left = style;
                     Ok(())
                 });
 
                 fields.add_field_function_get("middle", |_, _| Ok($cfg.middle.clone()));
-                fields.add_field_function_set("middle", |_, _, style: EvalTo<String, Mode>| {
+                fields.add_field_function_set("middle", |_, _, style: EvalTo<String, $type>| {
                     $cfg_mut.middle = style;
                     Ok(())
                 });
 
                 fields.add_field_function_get("right", |_, _| Ok($cfg.right.clone()));
-                fields.add_field_function_set("right", |_, _, style: EvalTo<String, Mode>| {
+                fields.add_field_function_set("right", |_, _, style: EvalTo<String, $type>| {
                     $cfg_mut.right = style;
                     Ok(())
                 });