Switch to kdl

Cargo.toml

@@ -14,6 +14,7 @@ rust-version = "1.59"
 
 [dependencies]
 anyhow = "1.0"
+thiserror = "1.0.30"
 names = { version = "0.13.0", default-features = false }
 miette = { version = "3.3.0", features = ["fancy"] }
 zellij-client = { path = "zellij-client/", version = "0.32.0" }

Makefile.toml

@@ -83,7 +83,7 @@ args = [
 
 # Simple clippy tweak
 [tasks.clippy]
-args = ["clippy", "--all-targets","--all-features","--","--deny","warnings", "@@split(CARGO_MAKE_TASK_ARGS,;)"]
+args = ["clippy", "--all-targets", "--all-features", "@@split(CARGO_MAKE_TASK_ARGS,;)"]
 
 # Release building and installing Zellij
 [tasks.install]

default-plugins/status-bar/src/second_line.rs

@@ -161,7 +161,7 @@ fn get_keys_and_hints(mi: &ModeInfo) -> Vec<(String, String, Vec<Key>)> {
         (s("Embed pane"), s("Embed"), action_key(&km, &[A::TogglePaneEmbedOrFloating, TO_NORMAL])),
         (s("Next"), s("Next"), action_key(&km, &[A::SwitchFocus])),
         (s("Select pane"), s("Select"), to_normal_key),
-    ]} else if mi.mode == IM::Tab { 
+    ]} else if mi.mode == IM::Tab {
         // With the default bindings, "Move focus" for tabs is tricky: It binds all the arrow keys
         // to moving tabs focus (left/up go left, right/down go right). Since we sort the keys
         // above and then dedpulicate based on the actions, we will end up with LeftArrow for
@@ -180,9 +180,9 @@ fn get_keys_and_hints(mi: &ModeInfo) -> Vec<(String, String, Vec<Key>)> {
 
         vec![
         (s("Move focus"), s("Move"), focus_keys),
-        (s("New"), s("New"), action_key(&km, &[A::NewTab(None), TO_NORMAL])),
+        (s("New"), s("New"), action_key(&km, &[A::NewTab(None, None), TO_NORMAL])),
         (s("Close"), s("Close"), action_key(&km, &[A::CloseTab, TO_NORMAL])),
-        (s("Rename"), s("Rename"), 
+        (s("Rename"), s("Rename"),
             action_key(&km, &[A::SwitchToMode(IM::RenameTab), A::TabNameInput(vec![0])])),
         (s("Sync"), s("Sync"), action_key(&km, &[A::ToggleActiveSyncTab, TO_NORMAL])),
         (s("Toggle"), s("Toggle"), action_key(&km, &[A::ToggleTab])),
@@ -192,7 +192,7 @@ fn get_keys_and_hints(mi: &ModeInfo) -> Vec<(String, String, Vec<Key>)> {
             &[A::Resize(RDir::Left)], &[A::Resize(RDir::Down)],
             &[A::Resize(RDir::Up)], &[A::Resize(RDir::Right)]])),
         (s("Increase/Decrease size"), s("Increase/Decrease"),
-            action_key_group(&km, &[&[A::Resize(RDir::Increase)], &[A::Resize(RDir::Decrease)]])), 
+            action_key_group(&km, &[&[A::Resize(RDir::Increase)], &[A::Resize(RDir::Decrease)]])),
         (s("Select pane"), s("Select"), to_normal_key),
     ]} else if mi.mode == IM::Move { vec![
         (s("Move"), s("Move"), action_key_group(&km, &[
@@ -242,7 +242,7 @@ fn get_keys_and_hints(mi: &ModeInfo) -> Vec<(String, String, Vec<Key>)> {
         (s("Split down"), s("Down"), action_key(&km, &[A::NewPane(Some(Dir::Down)), TO_NORMAL])),
         (s("Split right"), s("Right"), action_key(&km, &[A::NewPane(Some(Dir::Right)), TO_NORMAL])),
         (s("Fullscreen"), s("Fullscreen"), action_key(&km, &[A::ToggleFocusFullscreen, TO_NORMAL])),
-        (s("New tab"), s("New"), action_key(&km, &[A::NewTab(None), TO_NORMAL])),
+        (s("New tab"), s("New"), action_key(&km, &[A::NewTab(None, None), TO_NORMAL])),
         (s("Rename tab"), s("Rename"),
             action_key(&km, &[A::SwitchToMode(IM::RenameTab), A::TabNameInput(vec![0])])),
         (s("Previous Tab"), s("Previous"), action_key(&km, &[A::GoToPreviousTab, TO_NORMAL])),

default-plugins/status-bar/src/tip/data/quicknav.rs

@@ -72,13 +72,18 @@ fn add_keybinds(help: &ModeInfo) -> Keygroups {
         style_key_with_modifier(&new_pane_keys, &help.style.colors)
     };
 
-    let resize_keys = action_key_group(
+    let mut resize_keys = action_key_group(
         &normal_keymap,
         &[
             &[Action::Resize(ResizeDirection::Increase)],
             &[Action::Resize(ResizeDirection::Decrease)],
         ],
     );
+    if resize_keys.contains(&Key::Alt(CharOrArrow::Char('=')))
+        && resize_keys.contains(&Key::Alt(CharOrArrow::Char('+')))
+    {
+        resize_keys.retain(|k| k != &Key::Alt(CharOrArrow::Char('=')));
+    }
     let resize = if resize_keys.is_empty() {
         vec![Style::new().bold().paint("UNBOUND")]
     } else {

example/themes/README.md

@@ -1,7 +1,7 @@
 # Themes
-Please make sure that the theme name and the file name are the same (+`.yaml`).
+Please make sure that the theme name and the file name are the same (+`.kdl`).
 
 Example:
 
 - theme: gruvbox
-- filename: `gruvbox.yaml`
+- filename: `gruvbox.kdl`

example/themes/dracula.kdl

@@ -0,0 +1,17 @@
+// From https://github.com/dracula/zellij
+
+themes {
+   dracula {
+        fg 248 248 242
+        bg 40 42 54
+        black 0 0 0
+        red 255 85 85
+        green 80 250 123
+        yellow 241 250 140
+        blue 98 114 164
+        magenta 255 121 198
+        cyan 139 233 253
+        white 255 255 255
+        orange 255 184 108
+    }
+}

example/themes/gruvbox-dark.kdl

@@ -0,0 +1,16 @@
+themes {
+    gruvbox-dark {
+        fg 213 196 161
+        bg 40 40 40
+        black 60 56 54
+        red 204 36 29
+        green 152 151 26
+        yellow 215 153 33
+        blue 69 133 136
+        magenta 177 98 134
+        cyan 104 157 106
+        white 251 241 199
+        orange 214 93 14
+    }
+}
+

example/themes/gruvbox-light.kdl

@@ -0,0 +1,16 @@
+themes {
+    gruvbox-light {
+        fg 60 56 54
+        bg 251 82 75
+        black 40 40 40
+        red 205 75 69
+        green 152 151 26
+        yellow 215 153 33
+        blue 69 133 136
+        magenta 177 98 134
+        cyan 104 157 106
+        white 213 196 161
+        orange 214 93 14
+    }
+}
+

example/themes/molokai-dark.kdl

@@ -0,0 +1,16 @@
+themes {
+    molokai-dark {
+        fg 248 248 240
+        bg 27 29 30
+        black 0 0 0
+        red 255 0 0
+        green 0 140 0
+        yellow 255 255 0
+        blue 102 217 239
+        magenta 174 129 255
+        cyan 0 255 255
+        white 255 255 255
+        orange 253 151 31
+    }
+}
+

example/themes/nord.kdl

@@ -0,0 +1,15 @@
+themes {
+    nord {
+        fg 216 222 233 // #D8DEE9
+        bg 46 52 64 // #2E3440
+        black 59 66 82 // #3B4252
+        red 191 97 106 // #BF616A
+        green 163 190 140 // #A3BE8C
+        yellow 235 203 139 // #EBCB8B
+        blue 129 161 193 // #81A1C1
+        magenta 180 142 173 // #B48EAD
+        cyan 136 192 208 // #88C0D0
+        white 229 233 240 // #E5E9F0
+        orange 208 135 112 // #D08770
+    }
+}