Make command_bar a configurable shortcut

This also allows us to use the shortcut widget which
will capture the shortcut and prevent it from showing
up in the text input.

data/src/config/keys.rs

@@ -24,6 +24,8 @@ pub struct Keys {
     pub cycle_previous_buffer: KeyBind,
     #[serde(default = "KeyBind::toggle_nick_list")]
     pub toggle_nick_list: KeyBind,
+    #[serde(default = "KeyBind::command_bar")]
+    pub command_bar: KeyBind,
 }
 
 impl Default for Keys {
@@ -39,6 +41,7 @@ impl Default for Keys {
             cycle_next_buffer: KeyBind::cycle_next_buffer(),
             cycle_previous_buffer: KeyBind::cycle_previous_buffer(),
             toggle_nick_list: KeyBind::toggle_nick_list(),
+            command_bar: KeyBind::command_bar(),
         }
     }
 }
@@ -58,6 +61,7 @@ impl Keys {
             shortcut(self.cycle_next_buffer.clone(), CycleNextBuffer),
             shortcut(self.cycle_previous_buffer.clone(), CyclePreviousBuffer),
             shortcut(self.toggle_nick_list.clone(), ToggleNickList),
+            shortcut(self.command_bar.clone(), CommandBar),
         ]
     }
 }

data/src/shortcut.rs

@@ -33,6 +33,7 @@ pub enum Command {
     CycleNextBuffer,
     CyclePreviousBuffer,
     ToggleNickList,
+    CommandBar,
 }
 
 macro_rules! default {
@@ -108,6 +109,7 @@ impl KeyBind {
     default!(cycle_next_buffer, Tab, CTRL);
     default!(cycle_previous_buffer, Tab, CTRL | SHIFT);
     default!(toggle_nick_list, "m", COMMAND | ALT);
+    default!(command_bar, "k", COMMAND);
 
     pub fn is_pressed(
         &self,

src/event.rs

@@ -7,7 +7,6 @@ pub enum Event {
     Escape,
     Home,
     End,
-    CommandBar,
 }
 
 pub fn events() -> Subscription<Event> {
@@ -35,11 +34,6 @@ fn filtered_events(event: iced::Event, status: iced::event::Status) -> Option<Ev
             key: keyboard::Key::Named(keyboard::key::Named::End),
             ..
         }) if ignored(status) => Some(Event::End),
-        iced::Event::Keyboard(keyboard::Event::KeyPressed {
-            key: keyboard::Key::Character(c),
-            modifiers,
-            ..
-        }) if c.as_str() == "k" && modifiers.command() => Some(Event::CommandBar),
         iced::Event::Window(_, window::Event::CloseRequested) => Some(Event::CloseRequested),
         _ => None,
     }

src/screen/dashboard.rs

@@ -456,6 +456,13 @@ impl Dashboard {
                             });
                         }
                     }
+                    CommandBar => {
+                        return self.toggle_command_bar(
+                            &closed_buffers(self, clients),
+                            config,
+                            theme,
+                        );
+                    }
                 }
             }
         }
@@ -618,7 +625,6 @@ impl Dashboard {
 
                 Command::perform(task, |_| Message::Close)
             }
-            CommandBar => self.toggle_command_bar(&closed_buffers(self, clients), config, theme),
         }
     }