Update early-init.zsh

early-init.zsh

@@ -3,6 +3,11 @@ export PATH="${HOME}/.local/bin:${PATH}"
 export LD_LIBRARY_PATH="${HOME}/.local/lib:${LD_LIBRARY_PATH}"
 export PKG_CONFIG_PATH="${HOME}/.local/lib/pkgconfig:${PKG_CONFIG_PATH}"
 
+# Make sure this is PATH
+if [[ -d "${HOME}/.ghcup/bin" ]]; then
+   export PATH=":${HOME}/.ghcup/bin:${PATH}"
+fi
+
 # Because I use zsh to start graphical sessions
 [[ -v ZSH_GRAPHICAL_LOGIN ]] || ZSH_GRAPHICAL_LOGIN=true
 if [[ -o login ]] && [[ "${ZSH_GRAPHICAL_LOGIN}" = 'true' ]] ; then

emacs-bookmark.zsh

@@ -289,7 +289,7 @@ compdef _bmrm bmrm
 
 function __bm_precmd_hook {
     # Auto reload
-    if [[ "${BM_AUTO_RELOAD}" == true ]] &&
+    if [[ "${BM_AUTO_RELOAD}" == true ]] && [[ -e "${BM_BOOKMARK_PATH}" ]] &&
            (( ${__bm_last_read_time} < $(zstat +mtime "${BM_BOOKMARK_PATH}") )); then
         __bm_update_bookmark_list
     fi

init.zsh

@@ -28,6 +28,8 @@ function source_user_file {
     fi
 }
 
+# Mostly for setting $PATH before the GUI starts
+source_user_file "local-early"
 # Load user early init file
 source_user_file "early-init"
 
@@ -95,12 +97,12 @@ if cmd_exists doas; then
     __zsh_sudo_cmd=doas
     alias sudo='doas '
     alias doas='doas '
-    alias sudoedit="doas $EDITOR "
-    alias se="doas $EDITOR "
+    alias sudoedit="doas $EDITOR"
+    alias se="doas $EDITOR"
 else
     __zsh_sudo_cmd=sudo
     alias sudo='sudo '
-    alias se='sudoedit '
+    alias se='sudoedit'
     alias doas='sudo '
 fi
 
@@ -115,24 +117,24 @@ elif [[ "${is_in_distrobox}" == true ]]; then
     if [[ -v INSIDE_EMACS ]]; then
         [[ -z "${XDG_RUNTIME_DIR}" ]] && \
             export XDG_RUNTIME_DIR="/run/user/${UID}"
-        export EDITOR='distrobox-host-exec emacsclient -a nvim '
-        alias emacs='distrobox-host-exec emacsclient -a nvim '
+        export EDITOR='distrobox-host-exec emacsclient -a nvim'
+        alias emacs='distrobox-host-exec emacsclient -a nvim'
     else
-        export EDITOR='distrobox-host-exec emacsclient -a nvim -c '
-        alias emacs='distrobox-host-exec emacsclient -a nvim -c '
+        export EDITOR='distrobox-host-exec emacsclient -a nvim -c'
+        alias emacs='distrobox-host-exec emacsclient -a nvim -c'
     fi
-    alias n='emacs '
-    alias e='emacs '
+    alias n='emacs'
+    alias e='emacs'
 elif [[ -v INSIDE_EMACS ]]; then
     export EDITOR='emacsclient'
-    alias e='emacsclient '
-    alias emacs='emacsclient '
-    alias n='emacsclient '
-    alias nvim='emacsclient '
+    alias e='emacsclient'
+    alias emacs='emacsclient'
+    alias n='emacsclient'
+    alias nvim='emacsclient'
 else
     export EDITOR='emacsclient -a nvim -nw'
     # Because I keep using n by mistake
-    alias emacs="${EDITOR} "
+    alias emacs="${EDITOR}"
     alias n=emacs
     alias e=emacs
     alias nvim=emacs
@@ -152,7 +154,7 @@ if cmd_exists clash; then
     alias tp="clash put"
     alias trr="clash restore"
     alias trl="clash list"
-    alias tre="clash emtpy"
+    alias tre="clash empty"
     alias trm="clash empty"
 elif cmd_exists trash-put; then
     alias rm='echo "rm: I''m unsafe! Don''t use me."; false'