init.zsh

@@ -55,17 +55,8 @@ alias cd..="cd .."
 
 # Make xargs, sudo, etc. understand aliases
 alias xargs='xargs '
-if cmd_exists doas; then
+cmd_exists sudo && alias sudo='sudo '
-    __zsh_sudo_cmd=doas
+cmd_exists doas && alias doas='doas '
-    alias sudo='doas '
-    alias doas='doas '
-    alias sudoedit="doas $EDITOR "
-    alias se="doas $EDITOR "
-else
-    __zsh_sudo_cmd=sudo
-    alias sudo='sudo '
-    alias se='sudoedit '
-fi
 
 # Emacs and Neovim stuff
 if [[ -v NVIM ]]; then
@@ -101,6 +92,7 @@ else
     alias d=dired
 fi
 export VISUAL="${EDITOR}"
+alias se=sudoedit
 
 # Safer file functions
 alias cp="cp -i"
@@ -178,10 +170,16 @@ alias gt="git status"
 # Sudo last line with <Esc><Esc>
 sudo-command-line() {
     [[ -z $BUFFER ]] && zle up-history
-    if [[ $BUFFER == ${__zsh_sudo_cmd}\ * ]]; then
+    if [[ $BUFFER == sudo\ * ]]; then
-        LBUFFER="${LBUFFER#${__zsh_sudo_cmd} }"
+        LBUFFER="${LBUFFER#sudo }"
+    elif [[ $BUFFER == $EDITOR\ * ]]; then
+        LBUFFER="${LBUFFER#$EDITOR }"
+        LBUFFER="sudoedit $LBUFFER"
+    elif [[ $BUFFER == sudoedit\ * ]]; then
+        LBUFFER="${LBUFFER#sudoedit }"
+        LBUFFER="$EDITOR $LBUFFER"
     else
-        LBUFFER="${__zsh_sudo_cmd} $LBUFFER"
+        LBUFFER="sudo $LBUFFER"
     fi
 }
 zle -N sudo-command-line