5 files changed, 67 insertions, 23 deletions

@@ -24,3 +24,6 @@ alias lake='make PREFIX=~/usr'
 
 # bash meta
 alias rebash='source ~/.bash_profile'
+
+# Debugging
+alias emacs_goddamnit='pushd ~/.emacs.d;emacs --debug-init;popd'
@@ -10,6 +10,7 @@ BASH_SOURCE_FIRST=(
 
 BASH_SOURCE_LAST=(
     blesh
+    vterm-emacs
 )
 
 for f in "${BASH_SOURCE_FIRST[@]}"; do
@@ -1,8 +1,8 @@
 # Functions
 
 memq() { # memq ITEM ARRAY
-    # Test whether an ITEM is a member of ARRAY.
-    # Pass ARRAY as ${ARRAY[@]}.
+    ## Test whether an ITEM is a member of ARRAY.
+    ## Pass ARRAY as ${ARRAY[@]}.
     local e needle="$1"; shift
     for e; do
         [[ "$e" == "$needle" ]] && {
@@ -12,15 +12,34 @@ memq() { # memq ITEM ARRAY
     return 1
 }
 
+rebashrc() { # rebashrc
+    ## Reload ~/.bashrc
+    printf "Loading ~/.bashrc..." >&2
+    if source "$HOME/.bashrc"; then
+        echo "OK." >&2
+    else
+        echo "ERROR!" >&2
+    fi
+}
+
+first_which() { # first_which COMMAND...
+    ## Return the fully-qualified path of the first COMMAND found in $PATH.
+    while :; do
+        command -v "$1" && break
+        [ -z "$1" ] && return 1
+        shift
+    done
+}
+
 please() { # please [COMMAND...]
-        # if run without arguments, run the last command with 'sudo' (aka sudo !!)
-        # if run WITH arguments, alias as sudo
-        history -d -1
-        if [ -z "$1" ]; then
-                #set -- $(HISTTIMEFORMAT=$'\t' history 2 | sed 's/^.*\t//;q')
-                set -- $(fc -lnr | sed 1q)
-        fi
-        echo >&2 sudo "$@"
-        history -s sudo "$@"
-        "${DEBUG:-false}" || sudo "$@"
+    # if run without arguments, run the last command with 'sudo' (aka sudo !!)
+    # if run WITH arguments, alias as sudo
+    history -d -1
+    if [ -z "$1" ]; then
+        #set -- $(HISTTIMEFORMAT=$'\t' history 2 | sed 's/^.*\t//;q')
+        set -- $(fc -lnr | sed 1q)
+    fi
+    echo >&2 sudo "$@"
+    history -s sudo "$@"
+    "${DEBUG:-false}" || sudo "$@"
 }
@@ -4,7 +4,7 @@ PS1=
 
 # user, host, and cwd
 PROMPT_DIRTRIM=3 # how many dirs above current to print (rest are '...')
-PS1+='\[\e[34m\]# \u@\h \w'
+PS1+='\[\e[0;46m\]\u@\h \w'
 
 # git bit
 # see https://unix.stackexchange.com/questions/278206
@@ -16,13 +16,11 @@ possible_git_prompt_locations=(
 )
 
 for file in "${possible_git_prompt_locations[@]}"; do
-    if [[ -f "$file" ]]; then
-        source "$file" &&
-            PS1+='\[\e[35m\]$(__git_ps1)'
-        break
-    else
-        true
-    fi
+        if [[ -f "$file" ]]; then
+                source "$file" &&
+                        PS1+='\[\e[35m\]$(__git_ps1)'
+                break
+        fi
 done
 
 # newline
@@ -30,9 +28,9 @@ PS1+='\[\e[0m\]\n'
 
 # exit code (only if error)
 __prompt_exit_code() {
-    local ec=$?
-    (( $ec > 0 )) &&
-        printf "$ec"
+        local ec=$?
+        (( $ec > 0 )) &&
+                printf "$ec"
 }
 PS1+='\[\e[31m\]$(__prompt_exit_code)\[\e[0m\]'
 
@@ -0,0 +1,23 @@
+# shell-side configuration for Emacs vterm module
+# https://github.com/akermu/emacs-libvterm#shell-side-configuration
+# Make sure this is the last file loaded by ~/.bashrc!
+
+# Load the requisite code from the vterm install directory
+if [[ "$INSIDE_EMACS" = 'vterm' ]] \
+       && [[ -n ${EMACS_VTERM_PATH} ]] \
+       && [[ -f ${EMACS_VTERM_PATH}/etc/emacs-vterm-bash.sh ]]; then
+        source ${EMACS_VTERM_PATH}/etc/emacs-vterm-bash.sh
+fi
+
+# Extra commands for `vterm-eval-cmds'
+
+find_file() {
+    vterm_cmd find-file "$(realpath "${@:-.}")"
+}
+
+say() {
+    vterm_cmd message "%s" "$*"
+}
+
+
+