15 files changed, 226 insertions, 115 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" "$*"
+}
+
+
+
@@ -1,92 +1,92 @@
 [user]
-        email = acdw@acdw.net
-        name = Case Duckworth
+    email = acdw@acdw.net
+    name = Case Duckworth
 
 [init]
-        defaultBranch = main
+    defaultBranch = main
 
 [push]
-        default = simple
+    default = simple
 
 [pull]
-        rebase = false  
+    rebase = false
 
 [core]
-        editor = vim
-        precomposeunicode = true
-        pager = less
-        autocrlf = false
-        eol = lf
+    editor = emacsclient
+    precomposeunicode = true
+    pager = less
+    autocrlf = false
+    eol = lf
 
 [merge]
-        conflictstyle = diff3
-        tool = vimdiff
+    conflictstyle = diff3
+    tool = vimdiff
 
 [alias]
-        # Easier locations
-        root = rev-parse --show-toplevel
-        current-branch = rev-parse --abbrev-ref HEAD
-        # Easier listing and info
-        branches = branch -a
-        tags = tag -l
-        stashes = stash list
-        remotes = remote -v
-        staged = diff --cached
-        graph = log --graph -10 --branches --remotes --tags --format=format:'%Cgreen%h %Creset: %<(75,trunc)%s (%cN, %cr) %Cred%d' --date-order
-        precommit = diff --cached --diff-algorithm=minimal -w
-        # Easier actions
-        discard = checkout --
-        uncommit = reset --soft HEAD^
-        unstage = reset HEAD --
-        amend = commit --amend
-        pushall = !git remote | xargs -L1 git push --all
-        # Shortened commonalities
-        st = status -bs
-        ac = !git add . && git commit -m
+    # Easier locations
+    root = rev-parse --show-toplevel
+    current-branch = rev-parse --abbrev-ref HEAD
+    # Easier listing and info
+    branches = branch -a
+    tags = tag -l
+    stashes = stash list
+    remotes = remote -v
+    staged = diff --cached
+    graph = log --graph -10 --branches --remotes --tags --format=format:'%Cgreen%h %Creset: %<(75,trunc)%s (%cN, %cr) %Cred%d' --date-order
+    precommit = diff --cached --diff-algorithm=minimal -w
+    # Easier actions
+    discard = checkout --
+    uncommit = reset --soft HEAD^
+    unstage = reset HEAD --
+    amend = commit --amend
+    pushall = !git remote | xargs -L1 git push --all
+    # Shortened commonalities
+    st = status -bs
+    ac = !git add . && git commit -m
 
-# diffing       
+# diffing
 [diff "lisp"]
-        xfuncname = "^(\\(.*)$"
+    xfuncname = "^(\\(.*)$"
 [diff "org"]
-        xfuncname = "^(\\*+.*)$"        
+    xfuncname = "^(\\*+.*)$"
 
 ; [credential]
 ;       helper = /home/case/.local/bin/pass-git-helper
 ;       useHttpPath = true
 
 [bash]
-        showUntrackedFiles = true
-        showDirtyState = true
+    showUntrackedFiles = true
+    showDirtyState = true
 
 [sendemail]
-        smtpserver = smtp.fastmail.com
-        smtpuser = acdw@fastmail.com
-        smtpencryption = tls
-        smtpserverport = 465
-        
+    smtpserver = smtp.fastmail.com
+    smtpuser = acdw@fastmail.com
+    smtpencryption = tls
+    smtpserverport = 465
+
 # Better urls
 [url "https://github.com/"]
-        insteadOf = "gh:"
+    insteadOf = "gh:"
 [url "git@github.com:"]
-        pushInsteadOf = "gh:"
+    pushInsteadOf = "gh:"
 [github]
-        user = duckwork
-        
+    user = duckwork
+
 [url "https://gitlab.com/"]
-        insteadOf = "gl:"
+    insteadOf = "gl:"
 [url "git@gitlab.com:"]
-        pushInsteadOf = "gl:"
+    pushInsteadOf = "gl:"
 [gitlab]
-        user = acdw
+    user = acdw
 
 [url "https://git.sr.ht/"]
-        insteadOf = "sr:"
+    insteadOf = "sr:"
 [url "git@git.sr.ht:"]
-        pushInsteadOf = "sr:"
+    pushInsteadOf = "sr:"
 
 [url "https://tildegit.org/"]
-        insteadOf = "tg:"
+    insteadOf = "tg:"
 [url "git@tildegit.org:"]
-        pushInsteadOf = "tg:"   
+    pushInsteadOf = "tg:"
 [gitea "tildegit.org/api/v1"]
-        user = acdw
+    user = acdw
@@ -0,0 +1,62 @@
+# utility functions for all shells
+# these should be POSIX-compatible.
+
+# add a path to PATH, but only if it's not already there
+path_add_to_PATH() { # path_add [-a] PATH...
+    # -a appends (default is prepend)
+    APPEND=false
+    if [ "x$1" = "x-a" ]; then
+        APPEND=true
+        shift
+    fi
+
+    for p; do
+        case ":$PATH:" in
+            *:"$p":*) ;;
+            *)
+                if $APPEND; then
+                    PATH="$PATH:$p"
+                else
+                    PATH="$p:$PATH"
+                fi
+                ;;
+        esac
+    done
+
+    unset APPEND
+}
+
+# Generalization of `path_add_to_PATH' for any variable.
+path_add_unsafe() { #path_add_unsafe [-a] [-d DELIM] VAR PATH...
+    ## Add PATH... to VAR, delimiting with DELIM (default :).
+    # By default, the VAR will be prepended to; passing -a will append the
+    # variable.  -d DELIM defines the delimiter.
+    #
+    # This function has the _unsafe suffix because it uses `eval' to set
+    # variables.
+    APPEND=false; DELIM=:
+    while getopts ad: opt; do
+        case "$opt" in
+            a) APPEND=true ;;
+            d) DELIM="$OPTARG" ;;
+            *) return 1 ;;
+        esac
+    done
+    shift $(expr $OPTIND - 1)
+
+    var="$1"; shift
+
+    for path; do
+        case ":$(eval "echo \$$var"):" in
+            *:"$path":*) ;;
+            *)
+                if $APPEND; then
+                    eval "$var=\$$var${var:+$DELIM}$path"
+                else
+                    eval "$var=$path${var:+$DELIM}\$$var"
+                fi
+                ;;
+        esac
+    done
+    unset -v APPEND DELIM var
+}
@@ -0,0 +1,6 @@
+# PATH
+
+# see 00_functions.sh for `path_add'
+path_add_to_PATH "$HOME/bin" "$HOME/usr/bin"
+
+command -v luarocks >/dev/null 2>&1 && path_add "$HOME/.luarocks/bin"
@@ -2,7 +2,7 @@
 
 export GUILE_INSTALL_LOCALE=0
 export TZ=America/Chicago
-export QT_STYLE_OVERRIDE=adwaita-qt
+#export QT_STYLE_OVERRIDE=adwaita-qt
 export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/keyring/ssh"
 
 export CDPATH=:~ # thanks june :)
@@ -0,0 +1,2 @@
+export GOPATH="${XDG_DATA_HOME:=$HOME/.local/share}/go"
+command -v go >/dev/null 2>&1 && path_add_to_PATH "$(go env GOPATH)/bin"
@@ -1 +1,7 @@
-export INFOPATH="/usr/share/info:${XDG_DATA_HOME:-$HOME/.local/share}/info"
+# See 00_functions.sh for `path_add_unsafe'.
+
+path_add_unsafe INFOPATH \
+                /usr/share/info \
+                "${XDG_DATA_HOME:-$HOME/.local/share}/info"
+
+export INFOPATH
@@ -1,9 +1,15 @@
-# $MANPATH shouldn't be too extra complicated (as opposed to $PATH),
-# so I'm not going to include a whole other function.  AT SOME POINT,
-# I suppose I should generalize that function to set /any/ path-type
-# variable, not just $PATH.
+# See 00_functions.sh for `path_add_unsafe'.
+
+path_add_unsafe MANPATH \
+                "${XDG_DATA_HOME:-$HOME/.local/share}/man" \
+                "$HOME/.local/local/man" \
+                "$HOME/usr/local/man"
+
 # $MANPATH ends with `:' so that manpath(1) will prepend it to its
 # special thing.
+case "$MANPATH" in
+    *:) ;;
+    *) MANPATH="$MANPATH:" ;;
+esac
 
-MANPATH="${XDG_DATA_HOME:-$HOME/.local/share}/man:"
 export MANPATH
@@ -1,30 +0,0 @@
-# PATH
-
-# add a path to PATH, but only if it's not already there
-path_add() { # path_add [-a] PATH...
-        # -a appends (default is prepend)
-        APPEND=false
-        if [ "x$1" = "x-a" ]; then
-                APPEND=true
-                shift
-        fi
-
-        for p; do
-                case ":$PATH:" in
-                *:"$p":*) ;;
-                *)
-                        if $APPEND; then
-                                PATH="$PATH:$p"
-                        else
-                                PATH="$p:$PATH"
-                        fi
-                        ;;
-                esac
-        done
-
-        unset APPEND
-}
-
-path_add "$HOME/bin" "$HOME/usr/bin"
-
-command -v luarocks >/dev/null 2>&1 && path_add "$HOME/.luarocks/bin"
@@ -18,3 +18,13 @@ if [ -d "$XDG_CONFIG_HOME/profile" ]; then
                 [ -r "$file" ] && . "$file"
         done
 fi
+
+# refresh profile
+reprofile() {
+    printf "Loading ~/.profile..." >&2
+    if . "$HOME/.profile"; then
+        echo "OK." >&2
+    else
+        echo "ERROR!" >&2
+    fi
+}
@@ -13,7 +13,7 @@ export LESSHISTFILE="$XDG_CACHE_HOME"/less/history
 mkdir -p "$XDG_CACHE_HOME"/less
 
 # Vim
-export VIMINIT="let \$MYVIMRC=\"$XDG_CONFIG_HOME/vim/vimrc\" | source \$MYVIMRC"
+export VIMINIT="source ${XDG_CONFIG_HOME:=$HOME/.config}/vim/vimrc"
 
 # Weechat
 export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
@@ -23,3 +23,8 @@ export LYNX_CFG="$XDG_CONFIG_HOME/lynx/lynx.cfg"
 
 # Xorg
 export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-$HOME}"
+export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
+export XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc"
+
+# Notmuch
+export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:=$HOME/.config}/notmuch/config"