# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1579314307 18000
# Node ID 5ba3d8d1eef52d00aab15592dfdb3a4c37ba62ca
# Parent  3cc7cd9eb95451e6175df2423f8e8cf906e65463
More

diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 bash_profile
--- a/bash_profile	Fri Jan 17 20:23:55 2020 -0500
+++ b/bash_profile	Fri Jan 17 21:25:07 2020 -0500
@@ -1,37 +1,69 @@
 #!/usr/bin/env bash
 
 shopt -s expand_aliases
+shopt -s histappend
 
-# This file contains aliases and functions that duplicate some fish
-# functionality, because Vim will use bash as its external command shell.
+# Save multiline commands as a single history entry.
+shopt -s cmdhist
+
+HISTFILESIZE=100000
+HISTSIZE=100000
+HISTCONTROL=ignoreboth
+
+# Flush commands to history immediately instead of waiting for logout.
+PROMPT_COMMAND='history -a'
 
-AG_BIN="`which ag`"
-function ag() {
-    if test -f '.agignore' && grep -q 'pragma: skipvcs' '.agignore'; then
-        $AG_BIN --search-files -U "$@"
-    else
-        $AG_BIN --search-files "$@"
+if test -e ~/.dircolors; then
+    eval "$(dircolors -b ~/.dircolors)"
+fi
+
+D=$'\e[37m'
+PINK=$'\e[35m'
+GREEN=$'\e[32m'
+ORANGE=$'\e[33m'
+RED=$'\e[31m'
+CYAN=$'\e[34m'
+
+function last_return_value() {
+    x="$?"
+    if test "$x" -ne 0; then
+        echo -n "${RED}[$x] ${D}"
     fi
 }
 
-export PATH=~/bin:~/src/dotfiles/bin:~/src/dotfiles/lisp/bin:/usr/local/share/python:/usr/local/bin/:$PATH
+if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
+  HOST_COLOR="$CYAN"
+else
+  HOST_COLOR="$ORANGE"
+fi
+
+export PS1='\n${PINK}\u ${D}at ${HOST_COLOR}\h ${D}in ${GREEN}\w${D}\n$(last_return_value)$ '
+
+alias ..="cd .."
+alias ...="cd ../.."
+alias ....="cd ../../.."
+alias .....="cd ../../../.."
+alias ......="cd ../../../../.."
 
-alias h='hg'
-alias g='git'
-alias pj='python -m json.tool'
-alias pbc='pbcopy'
-alias pbp='pbpaste'
-alias pbpb='pbp | pb'
-alias vu='vagrant up'
-alias vs='vagrant suspend'
-alias o='open'
-alias oo='open .'
+if command -v ag >/dev/null; then
+    AG_BIN="$(command -v ag)"
+    function ag() {
+        if test -f '.agignore' && grep -q 'pragma: skipvcs' '.agignore'; then
+            $AG_BIN --search-files -U "$@"
+        else
+            $AG_BIN --search-files "$@"
+        fi
+    }
+fi
+
+export PATH=~/bin:~/src/dotfiles/bin:~/src/dotfiles/lisp/bin:/usr/local/bin/:$PATH
+export PAGER=less
 
 function psg() {
-    ps auxww | grep --color=always $* | grep -v grep | collapse | cuts -f 2,11-
+    ps auxww | grep --color=always "$@" | grep -v grep | collapse | cuts -f 2,11-
 }
 
-GPG_TTY=`tty`
+GPG_TTY=$(tty)
 export GPG_TTY
 
 export EDITOR=nvim
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 bin/sync-remote-dotfiles
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/sync-remote-dotfiles	Fri Jan 17 21:25:07 2020 -0500
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -xeuo pipefail
+
+ssh "$1" -- mkdir -p src/dotfiles
+rsync --copy-links -avzd "$HOME/src/dotfiles/remote/" "$1:src/dotfiles"
+ssh "$1" -- src/dotfiles/bootstrap.sh
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 fish/config.fish
--- a/fish/config.fish	Fri Jan 17 20:23:55 2020 -0500
+++ b/fish/config.fish	Fri Jan 17 21:25:07 2020 -0500
@@ -131,7 +131,9 @@
 # }}}
 # Z {{{
 
-. ~/src/z-fish/z.fish
+if test -e ~/src/z-fish/z.fish
+    . ~/src/z-fish/z.fish
+end
 
 # }}}
 # Prompt {{{
@@ -142,18 +144,13 @@
 set green (set_color green)
 set cyan (set_color cyan)
 set gray (set_color -o black)
+
 set hg_promptstring "\
 < on $magenta<branch>$normal>\
 < at $cyan<bookmark>$normal>\
 $green<status|modified|unknown><update>$normal\
 " 2>/dev/null
 
-function virtualenv_prompt
-    if [ -n "$VIRTUAL_ENV" ]
-        printf '(%s) ' (basename "$VIRTUAL_ENV")
-    end
-end
-
 function hg_prompt
     hg prompt --angle-brackets $hg_promptstring 2>/dev/null
 end
@@ -174,6 +171,15 @@
     echo $PWD | sed -e "s|^$HOME|~|"
 end
 
+if test -n "$SSH_CLIENT"
+    or test -n "$SSH_TTY"
+    set host_color (set_color cyan)
+    set want_vcs_prompts 0
+else
+    set host_color (set_color yellow)
+    set want_vcs_prompts 1
+end
+
 function fish_prompt
     set last_status $status
 
@@ -184,8 +190,7 @@
     set_color normal
     printf ' at '
 
-    set_color yellow
-    printf '%s' (hostname|cut -d . -f 1)
+    printf "$host_color%s" (hostname|cut -d . -f 1)
     set_color normal
     printf ' in '
 
@@ -193,13 +198,13 @@
     printf '%s' (prompt_pwd)
     set_color normal
 
-    hg_prompt
-    git_prompt
+    if test $want_vcs_prompts -eq 1
+        hg_prompt
+        git_prompt
+    end
 
     echo
 
-    virtualenv_prompt
-
     if test $last_status -eq 0
         set_color white -o
         printf '><((°> '
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 remote/bash_profile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remote/bash_profile	Fri Jan 17 21:25:07 2020 -0500
@@ -0,0 +1,1 @@
+../bash_profile
\ No newline at end of file
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 remote/bootstrap.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remote/bootstrap.sh	Fri Jan 17 21:25:07 2020 -0500
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+function ensure_link {
+    src="$HOME/$1"
+    dst="$HOME/$2"
+    if test -L "$dst"; then
+        # Already linked.
+        true
+    elif test -e "$dst"; then
+        echo File "$dst" already exists and is not a symbolic link.
+        exit 1
+    elif test ! -e "$src"; then
+        echo File "$src" does not exist.
+        exit 1
+    else
+        echo "Linking $src into $dst"
+        ln -s "$src" "$dst"
+    fi
+}
+
+mkdir -p ~/.config/fish
+mkdir -p ~/.config/nvim
+mkdir -p ~/bin
+
+ensure_link "src/dotfiles/gitconfig"     ".gitconfig"
+ensure_link "src/dotfiles/gitignore"     ".gitignore"
+ensure_link "src/dotfiles/bash_profile"  ".bash_profile"
+ensure_link "src/dotfiles/dircolors"     ".dircolors"
+ensure_link "src/dotfiles/ffignore"      ".ffignore"
+ensure_link "src/dotfiles/config.fish"   ".config/fish/config.fish"
+ensure_link "src/dotfiles/tmux.conf"     ".tmux.conf"
+# ensure_link "src/dotfiles/vim"           ".vim"
+# ensure_link "src/dotfiles/vimrc"         ".vimrc"
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 remote/config.fish
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remote/config.fish	Fri Jan 17 21:25:07 2020 -0500
@@ -0,0 +1,1 @@
+../fish/config.fish
\ No newline at end of file
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 remote/dircolors
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remote/dircolors	Fri Jan 17 21:25:07 2020 -0500
@@ -0,0 +1,218 @@
+#  ____            _               _  __
+# | __ )  __ _  __| |_      _____ | |/ _|
+# |  _ \ / _` |/ _` \ \ /\ / / _ \| | |_
+# | |_) | (_| | (_| |\ V  V / (_) | |  _|
+# |____/ \__,_|\__,_| \_/\_/ \___/|_|_|
+#      _ _               _
+#   __| (_)_ __ ___ ___ | | ___  _ __ ___
+#  / _` | | '__/ __/ _ \| |/ _ \| '__/ __|
+# | (_| | | | | (_| (_) | | (_) | |  \__ \
+#  \__,_|_|_|  \___\___/|_|\___/|_|  |___/
+#
+#
+# Author: Jon Bernard
+#
+
+# Below, there should be one TERM entry for each termtype that is colorizable
+TERM Eterm
+TERM ansi
+TERM color-xterm
+TERM con132x25
+TERM con132x30
+TERM con132x43
+TERM con132x60
+TERM con80x25
+TERM con80x28
+TERM con80x30
+TERM con80x43
+TERM con80x50
+TERM con80x60
+TERM cons25
+TERM console
+TERM cygwin
+TERM dtterm
+TERM eterm-color
+TERM gnome
+TERM gnome-256color
+TERM jfbterm
+TERM konsole
+TERM kterm
+TERM linux
+TERM linux-c
+TERM mach-color
+TERM mlterm
+TERM putty
+TERM rxvt
+TERM rxvt-256color
+TERM rxvt-cygwin
+TERM rxvt-cygwin-native
+TERM rxvt-unicode
+TERM rxvt-unicode-256color
+TERM rxvt-unicode256
+TERM screen
+TERM screen-256color
+TERM screen-256color-bce
+TERM screen-bce
+TERM screen-w
+TERM screen.Eterm
+TERM screen.rxvt
+TERM screen.linux
+TERM terminator
+TERM vt100
+TERM xterm
+TERM xterm-16color
+TERM xterm-256color
+TERM xterm-88color
+TERM xterm-color
+TERM xterm-debian
+
+# Below are the color init strings for the basic file types. A color init string
+# consists of one or more of the following numeric codes:
+#
+# Attribute codes:
+# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
+#
+# Text color codes:
+# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
+#
+# Background color codes:
+# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
+
+NORMAL 0;38;5;15                # no color code at all
+#FILE 00                        # regular file: use no color at all
+RESET 0                         # reset to "normal" color
+DIR 1;38;5;39                   # directory
+LINK 01;38;5;14                 # symbolic link. (If you set this to 'target' instead of a
+                                # numerical value, the color is as for the file pointed to.)
+MULTIHARDLINK 00                # regular file with more than one link
+FIFO 40;33                      # pipe
+SOCK 1;38;5;211                 # socket
+DOOR 01;35                      # door
+BLK 40;33;01                    # block device driver
+CHR 40;33;01                    # character device driver
+ORPHAN 40;31;01                 # symlink to nonexistent file, or non-stat'able file
+SETUID 37;41                    # file that is setuid (u+s)
+SETGID 30;43                    # file that is setgid (g+s)
+CAPABILITY 30;41                # file with capability
+STICKY_OTHER_WRITABLE 30;42     # dir that is sticky and other-writable (+t,o+w)
+OTHER_WRITABLE 34;42            # dir that is other-writable (o+w) and not sticky
+STICKY 37;44                    # dir with the sticky bit set (+t) and not other-writable
+
+# This is for files with execute permission:
+EXEC 1;38;5;154
+
+# List any file extensions like '.gz' or '.tar' that you would like ls
+# to colorize below. Put the extension, a space, and the color init string.
+# (and any comments you want to add after a '#')
+# If you use DOS-style suffixes, you may want to uncomment the following:
+#.cmd 01;32 # executables (bright green)
+#.exe 01;32
+#.com 01;32
+#.btm 01;32
+#.bat 01;32
+# Or if you want to colorize scripts even if they do not have the
+# executable bit actually set.
+#.sh 01;32
+#.csh 01;32
+
+# archives or compressed (bright red)
+.tar 01;38;5;196
+.tgz 01;38;5;196
+.arj 01;38;5;196
+.taz 01;38;5;196
+.lzh 01;38;5;196
+.lzma 01;38;5;196
+.tlz 01;38;5;196
+.txz 01;38;5;196
+.zip 01;38;5;196
+.z 01;38;5;196
+.Z 01;38;5;196
+.dz 01;38;5;196
+.gz 01;38;5;196
+.lz 01;38;5;196
+.xz 01;38;5;196
+.bz2 01;38;5;196
+.bz 01;38;5;196
+.tbz 01;38;5;196
+.tbz2 01;38;5;196
+.tz 01;38;5;196
+.deb 01;38;5;196
+.rpm 01;38;5;196
+.jar 01;38;5;196
+.war 01;38;5;196
+.ear 01;38;5;196
+.sar 01;38;5;196
+.rar 01;38;5;196
+.ace 01;38;5;196
+.zoo 01;38;5;196
+.cpio 01;38;5;196
+.7z 01;38;5;196
+.rz 01;38;5;196
+
+# image formats
+.jpg 01;38;5;211
+.jpeg 01;38;5;211
+.gif 01;38;5;211
+.bmp 01;38;5;211
+.pbm 01;38;5;211
+.pgm 01;38;5;211
+.ppm 01;38;5;211
+.tga 01;38;5;211
+.xbm 01;38;5;211
+.xpm 01;38;5;211
+.tif 01;38;5;211
+.tiff 01;38;5;211
+.png 01;38;5;211
+.svg 01;38;5;211
+.svgz 01;38;5;211
+.mng 01;38;5;211
+.pcx 01;38;5;211
+.mov 01;38;5;211
+.mpg 01;38;5;211
+.mpeg 01;38;5;211
+.m2v 01;38;5;211
+.mkv 01;38;5;211
+.webm 01;38;5;211
+.ogm 01;38;5;211
+.mp4 01;38;5;211
+.m4v 01;38;5;211
+.mp4v 01;38;5;211
+.vob 01;38;5;211
+.qt 01;38;5;211
+.nuv 01;38;5;211
+.wmv 01;38;5;211
+.asf 01;38;5;211
+.rm 01;38;5;211
+.rmvb 01;38;5;211
+.flc 01;38;5;211
+.avi 01;38;5;211
+.fli 01;38;5;211
+.flv 01;38;5;211
+.gl 01;38;5;211
+.dl 01;38;5;211
+.xcf 01;38;5;211
+.xwd 01;38;5;211
+.yuv 01;38;5;211
+.cgm 01;38;5;211
+.emf 01;38;5;211
+.axv 01;38;5;211
+.anx 01;38;5;211
+.ogv 01;38;5;211
+.ogx 01;38;5;211
+
+# audio formats
+.aac 0;38;5;214
+.au 0;38;5;214
+.flac 0;38;5;214
+.mid 0;38;5;214
+.midi 0;38;5;214
+.mka 0;38;5;214
+.mp3 0;38;5;214
+.mpc 0;38;5;214
+.ogg 0;38;5;214
+.ra 0;38;5;214
+.wav 0;38;5;214
+.axa 0;38;5;214
+.oga 0;38;5;214
+.spx 0;38;5;214
+.xspf 0;38;5;214
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 remote/ffignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remote/ffignore	Fri Jan 17 21:25:07 2020 -0500
@@ -0,0 +1,1 @@
+../ffignore
\ No newline at end of file
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 remote/gitconfig
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remote/gitconfig	Fri Jan 17 21:25:07 2020 -0500
@@ -0,0 +1,1 @@
+../gitconfig
\ No newline at end of file
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 remote/gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remote/gitignore	Fri Jan 17 21:25:07 2020 -0500
@@ -0,0 +1,1 @@
+../gitignore
\ No newline at end of file
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 remote/tmux.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remote/tmux.conf	Fri Jan 17 21:25:07 2020 -0500
@@ -0,0 +1,1 @@
+../tmux/tmux.conf
\ No newline at end of file
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 servers/bin/bootstrap.sh
--- a/servers/bin/bootstrap.sh	Fri Jan 17 20:23:55 2020 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-function ensure_link {
-    test -L "$HOME/$2" || test ! -e "$HOME/$1" || ln -s "$HOME/$1" "$HOME/$2"
-}
-
-mkdir -p ~/.config/fish
-mkdir -p ~/.config/nvim
-mkdir -p ~/src/hg
-mkdir -p ~/bin
-mkdir -p ~/src
-
-ensure_link "src/dotfiles/hgrc"              ".hgrc"
-ensure_link "src/dotfiles/bash_profile"      ".bash_profile"
-ensure_link "src/dotfiles/dircolors"         ".dircolors"
-ensure_link "src/dotfiles/ffignore"          ".ffignore"
-ensure_link "src/dotfiles/fish/config.fish"  ".config/fish/config.fish"
-ensure_link "src/dotfiles/fish/functions"    ".config/fish/functions"
-ensure_link "src/dotfiles/gitconfig"         ".gitconfig"
-ensure_link "src/dotfiles/gitignore"         ".gitignore"
-ensure_link "src/dotfiles/hgignore"          ".hgignore"
-ensure_link "src/dotfiles/tmux/tmux.conf"    ".tmux.conf"
-ensure_link "src/dotfiles/vim"               ".vim"
-ensure_link "src/dotfiles/vim/vimrc"         ".vimrc"
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 servers/dircolors
--- a/servers/dircolors	Fri Jan 17 20:23:55 2020 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-#  ____            _               _  __
-# | __ )  __ _  __| |_      _____ | |/ _|
-# |  _ \ / _` |/ _` \ \ /\ / / _ \| | |_
-# | |_) | (_| | (_| |\ V  V / (_) | |  _|
-# |____/ \__,_|\__,_| \_/\_/ \___/|_|_|
-#      _ _               _
-#   __| (_)_ __ ___ ___ | | ___  _ __ ___
-#  / _` | | '__/ __/ _ \| |/ _ \| '__/ __|
-# | (_| | | | | (_| (_) | | (_) | |  \__ \
-#  \__,_|_|_|  \___\___/|_|\___/|_|  |___/
-#
-#
-# Author: Jon Bernard
-#
-
-# Below, there should be one TERM entry for each termtype that is colorizable
-TERM Eterm
-TERM ansi
-TERM color-xterm
-TERM con132x25
-TERM con132x30
-TERM con132x43
-TERM con132x60
-TERM con80x25
-TERM con80x28
-TERM con80x30
-TERM con80x43
-TERM con80x50
-TERM con80x60
-TERM cons25
-TERM console
-TERM cygwin
-TERM dtterm
-TERM eterm-color
-TERM gnome
-TERM gnome-256color
-TERM jfbterm
-TERM konsole
-TERM kterm
-TERM linux
-TERM linux-c
-TERM mach-color
-TERM mlterm
-TERM putty
-TERM rxvt
-TERM rxvt-256color
-TERM rxvt-cygwin
-TERM rxvt-cygwin-native
-TERM rxvt-unicode
-TERM rxvt-unicode-256color
-TERM rxvt-unicode256
-TERM screen
-TERM screen-256color
-TERM screen-256color-bce
-TERM screen-bce
-TERM screen-w
-TERM screen.Eterm
-TERM screen.rxvt
-TERM screen.linux
-TERM terminator
-TERM vt100
-TERM xterm
-TERM xterm-16color
-TERM xterm-256color
-TERM xterm-88color
-TERM xterm-color
-TERM xterm-debian
-
-# Below are the color init strings for the basic file types. A color init string
-# consists of one or more of the following numeric codes:
-#
-# Attribute codes:
-# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
-#
-# Text color codes:
-# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
-#
-# Background color codes:
-# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
-
-NORMAL 0;38;5;15                # no color code at all
-#FILE 00                        # regular file: use no color at all
-RESET 0                         # reset to "normal" color
-DIR 1;38;5;39                   # directory
-LINK 01;38;5;14                 # symbolic link. (If you set this to 'target' instead of a
-                                # numerical value, the color is as for the file pointed to.)
-MULTIHARDLINK 00                # regular file with more than one link
-FIFO 40;33                      # pipe
-SOCK 1;38;5;211                 # socket
-DOOR 01;35                      # door
-BLK 40;33;01                    # block device driver
-CHR 40;33;01                    # character device driver
-ORPHAN 40;31;01                 # symlink to nonexistent file, or non-stat'able file
-SETUID 37;41                    # file that is setuid (u+s)
-SETGID 30;43                    # file that is setgid (g+s)
-CAPABILITY 30;41                # file with capability
-STICKY_OTHER_WRITABLE 30;42     # dir that is sticky and other-writable (+t,o+w)
-OTHER_WRITABLE 34;42            # dir that is other-writable (o+w) and not sticky
-STICKY 37;44                    # dir with the sticky bit set (+t) and not other-writable
-
-# This is for files with execute permission:
-EXEC 1;38;5;154
-
-# List any file extensions like '.gz' or '.tar' that you would like ls
-# to colorize below. Put the extension, a space, and the color init string.
-# (and any comments you want to add after a '#')
-# If you use DOS-style suffixes, you may want to uncomment the following:
-#.cmd 01;32 # executables (bright green)
-#.exe 01;32
-#.com 01;32
-#.btm 01;32
-#.bat 01;32
-# Or if you want to colorize scripts even if they do not have the
-# executable bit actually set.
-#.sh 01;32
-#.csh 01;32
-
-# archives or compressed (bright red)
-.tar 01;38;5;196
-.tgz 01;38;5;196
-.arj 01;38;5;196
-.taz 01;38;5;196
-.lzh 01;38;5;196
-.lzma 01;38;5;196
-.tlz 01;38;5;196
-.txz 01;38;5;196
-.zip 01;38;5;196
-.z 01;38;5;196
-.Z 01;38;5;196
-.dz 01;38;5;196
-.gz 01;38;5;196
-.lz 01;38;5;196
-.xz 01;38;5;196
-.bz2 01;38;5;196
-.bz 01;38;5;196
-.tbz 01;38;5;196
-.tbz2 01;38;5;196
-.tz 01;38;5;196
-.deb 01;38;5;196
-.rpm 01;38;5;196
-.jar 01;38;5;196
-.war 01;38;5;196
-.ear 01;38;5;196
-.sar 01;38;5;196
-.rar 01;38;5;196
-.ace 01;38;5;196
-.zoo 01;38;5;196
-.cpio 01;38;5;196
-.7z 01;38;5;196
-.rz 01;38;5;196
-
-# image formats
-.jpg 01;38;5;211
-.jpeg 01;38;5;211
-.gif 01;38;5;211
-.bmp 01;38;5;211
-.pbm 01;38;5;211
-.pgm 01;38;5;211
-.ppm 01;38;5;211
-.tga 01;38;5;211
-.xbm 01;38;5;211
-.xpm 01;38;5;211
-.tif 01;38;5;211
-.tiff 01;38;5;211
-.png 01;38;5;211
-.svg 01;38;5;211
-.svgz 01;38;5;211
-.mng 01;38;5;211
-.pcx 01;38;5;211
-.mov 01;38;5;211
-.mpg 01;38;5;211
-.mpeg 01;38;5;211
-.m2v 01;38;5;211
-.mkv 01;38;5;211
-.webm 01;38;5;211
-.ogm 01;38;5;211
-.mp4 01;38;5;211
-.m4v 01;38;5;211
-.mp4v 01;38;5;211
-.vob 01;38;5;211
-.qt 01;38;5;211
-.nuv 01;38;5;211
-.wmv 01;38;5;211
-.asf 01;38;5;211
-.rm 01;38;5;211
-.rmvb 01;38;5;211
-.flc 01;38;5;211
-.avi 01;38;5;211
-.fli 01;38;5;211
-.flv 01;38;5;211
-.gl 01;38;5;211
-.dl 01;38;5;211
-.xcf 01;38;5;211
-.xwd 01;38;5;211
-.yuv 01;38;5;211
-.cgm 01;38;5;211
-.emf 01;38;5;211
-.axv 01;38;5;211
-.anx 01;38;5;211
-.ogv 01;38;5;211
-.ogx 01;38;5;211
-
-# audio formats
-.aac 0;38;5;214
-.au 0;38;5;214
-.flac 0;38;5;214
-.mid 0;38;5;214
-.midi 0;38;5;214
-.mka 0;38;5;214
-.mp3 0;38;5;214
-.mpc 0;38;5;214
-.ogg 0;38;5;214
-.ra 0;38;5;214
-.wav 0;38;5;214
-.axa 0;38;5;214
-.oga 0;38;5;214
-.spx 0;38;5;214
-.xspf 0;38;5;214
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 shellcheckrc
--- a/shellcheckrc	Fri Jan 17 20:23:55 2020 -0500
+++ b/shellcheckrc	Fri Jan 17 21:25:07 2020 -0500
@@ -1,2 +1,4 @@
 # Fuck off with the UUOC bullshit
 disable=SC2002
+
+disable=SC2009
diff -r 3cc7cd9eb954 -r 5ba3d8d1eef5 skeletal_bashrc
--- a/skeletal_bashrc	Fri Jan 17 20:23:55 2020 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-if [ -f /etc/bashrc ]; then
-        . /etc/bashrc
-fi
-
-eval "$(dircolors -b ~/.dircolors)"
-
-D=$'\e[37m'
-PINK=$'\e[35m'
-GREEN=$'\e[32m'
-ORANGE=$'\e[33m'
-
-export PS1='\n${PINK}\u ${D}at ${ORANGE}\h ${D}in ${GREEN}\w${D}\n$ '
-
-alias nvim=vim
-alias ..="cd .."
-alias ...="cd ../.."
-alias ....="cd ../../.."
-alias g=git
-alias h=hg
-
-alias l1="tree --dirsfirst -ChFL 1"
-alias l2="tree --dirsfirst -ChFL 2"
-alias l3="tree --dirsfirst -ChFL 3"
-alias l4="tree --dirsfirst -ChFL 4"
-alias l5="tree --dirsfirst -ChFL 5"
-alias ll1="tree --dirsfirst -ChFupDaL 1"
-alias ll2="tree --dirsfirst -ChFupDaL 2"
-alias ll3="tree --dirsfirst -ChFupDaL 3"
-alias ll4="tree --dirsfirst -ChFupDaL 4"
-alias ll5="tree --dirsfirst -ChFupDaL 5"
-
-alias l=l1
-alias ll=ll1
-
-export PAGER=less
-
-shopt -s histappend
-HISTFILESIZE=100000
-HISTSIZE=100000
-HISTCONTROL=ignoreboth
-shopt -s cmdhist
-
-PROMPT_COMMAND='history -a'
-
-PATH=$PATH:$HOME/.local/bin:$HOME/bin
-export PATH