diff --git a/atuin/src/command/init.rs b/atuin/src/command/init.rs index 87b876cc..eea4fa48 100644 --- a/atuin/src/command/init.rs +++ b/atuin/src/command/init.rs @@ -32,16 +32,18 @@ impl Cmd { println!("{base}"); if std::env::var("ATUIN_NOBIND").is_err() { - const BIND_CTRL_R: &str = r#"bindkey -M emacs '^r' _atuin_search_widget + const BIND_CTRL_R: &str = r"bindkey -M emacs '^r' _atuin_search_widget bindkey -M vicmd '^r' _atuin_search_widget -bindkey -M viins '^r' _atuin_search_widget"#; - const BIND_UP_ARROW: &str = r#"bindkey -M emacs '^[[A' _atuin_up_search_widget +bindkey -M viins '^r' _atuin_search_widget"; + + const BIND_UP_ARROW: &str = r"bindkey -M emacs '^[[A' _atuin_up_search_widget bindkey -M vicmd '^[[A' _atuin_up_search_widget bindkey -M viins '^[[A' _atuin_up_search_widget bindkey -M emacs '^[OA' _atuin_up_search_widget bindkey -M vicmd '^[OA' _atuin_up_search_widget bindkey -M viins '^[OA' _atuin_up_search_widget -bindkey -M vicmd 'k' _atuin_up_search_widget"#; +bindkey -M vicmd 'k' _atuin_up_search_widget"; + if !self.disable_ctrl_r { println!("{BIND_CTRL_R}"); } @@ -105,7 +107,7 @@ bind -M insert \e\[A _atuin_bind_up"; println!("{full}"); if std::env::var("ATUIN_NOBIND").is_err() { - const BIND_CTRL_R: &str = r#"$env.config = ( + const BIND_CTRL_R: &str = r"$env.config = ( $env.config | upsert keybindings ( $env.config.keybindings | append { @@ -116,8 +118,8 @@ bind -M insert \e\[A _atuin_bind_up"; event: { send: executehostcommand cmd: (_atuin_search_cmd) } } ) -)"#; - const BIND_UP_ARROW: &str = r#" +)"; + const BIND_UP_ARROW: &str = r" # The up arrow keybinding has surprising behavior in Nu, and is disabled by default. # See https://github.com/atuinsh/atuin/issues/1025 for details # $env.config = ( @@ -132,7 +134,7 @@ bind -M insert \e\[A _atuin_bind_up"; # } # ) # ) -"#; +"; if !self.disable_ctrl_r { println!("{BIND_CTRL_R}"); }