From a5616aea8fa28db6f8f7b1a44e28f90aab3363b7 Mon Sep 17 00:00:00 2001
From: Jamie Quigley <jamie@quigley.xyz>
Date: Sat, 24 Dec 2022 17:18:44 +0000
Subject: Rework `atuin init` (#652)

* Rework `atuin init`

This allows users to disable the CTRL-R and Up Arrow bindings,
independently from one another

* Document --disable-{ctrl-r,up-arrow}

* Apply suggestions from code review

Co-authored-by: Ellie Huxtable <ellie@elliehuxtable.com>

Co-authored-by: Ellie Huxtable <ellie@elliehuxtable.com>
---
 src/shell/atuin.zsh | 56 +++++++++++++++++++++++------------------------------
 1 file changed, 24 insertions(+), 32 deletions(-)

(limited to 'src/shell/atuin.zsh')

diff --git a/src/shell/atuin.zsh b/src/shell/atuin.zsh
index dd5c1afc..b0e160ff 100644
--- a/src/shell/atuin.zsh
+++ b/src/shell/atuin.zsh
@@ -12,42 +12,42 @@ autoload -U add-zsh-hook
 export ATUIN_SESSION=$(atuin uuid)
 export ATUIN_HISTORY="atuin history list"
 
-_atuin_preexec(){
-	local id; id=$(atuin history start -- "$1")
-	export ATUIN_HISTORY_ID="$id"
+_atuin_preexec() {
+    local id
+    id=$(atuin history start -- "$1")
+    export ATUIN_HISTORY_ID="$id"
 }
 
-_atuin_precmd(){
-	local EXIT="$?"
+_atuin_precmd() {
+    local EXIT="$?"
 
-	[[ -z "${ATUIN_HISTORY_ID}" ]] && return
+    [[ -z "${ATUIN_HISTORY_ID}" ]] && return
 
-
-	(RUST_LOG=error atuin history end --exit $EXIT -- $ATUIN_HISTORY_ID &) > /dev/null 2>&1
+    (RUST_LOG=error atuin history end --exit $EXIT -- $ATUIN_HISTORY_ID &) >/dev/null 2>&1
 }
 
-_atuin_search(){
-	emulate -L zsh
-	zle -I
+_atuin_search() {
+    emulate -L zsh
+    zle -I
 
-	# Switch to cursor mode, then back to application
-	echoti rmkx
-	# swap stderr and stdout, so that the tui stuff works
-	# TODO: not this
+    # Switch to cursor mode, then back to application
+    echoti rmkx
+    # swap stderr and stdout, so that the tui stuff works
+    # TODO: not this
     # shellcheck disable=SC2048
-	output=$(RUST_LOG=error atuin search $* -i -- $BUFFER 3>&1 1>&2 2>&3)
-	echoti smkx
+    output=$(RUST_LOG=error atuin search $* -i -- $BUFFER 3>&1 1>&2 2>&3)
+    echoti smkx
 
-	if [[ -n $output ]] ; then
-		RBUFFER=""
-		LBUFFER=$output
-	fi
+    if [[ -n $output ]]; then
+        RBUFFER=""
+        LBUFFER=$output
+    fi
 
-	zle reset-prompt
+    zle reset-prompt
 }
 
-_atuin_up_search(){
-  _atuin_search --shell-up-key-binding
+_atuin_up_search() {
+    _atuin_search --shell-up-key-binding
 }
 
 add-zsh-hook preexec _atuin_preexec
@@ -55,11 +55,3 @@ add-zsh-hook precmd _atuin_precmd
 
 zle -N _atuin_search_widget _atuin_search
 zle -N _atuin_up_search_widget _atuin_up_search
-
-if [[ -z $ATUIN_NOBIND ]]; then
-	bindkey '^r' _atuin_search_widget
-
-	# depends on terminal mode
-  bindkey '^[[A' _atuin_up_search_widget
-  bindkey '^[OA' _atuin_up_search_widget
-fi
-- 
cgit v1.3.1