remove TERM var interfering with scp

* 'master' of github.com:charlesreid1/mac-dotfiles:
  minor update to include bascom
  bubble text in vimrc
  set pull option to rebase

.aliases

@@ -10,15 +10,33 @@ git() {
 }
 
 
+# get rid of stupid annoying badges
+# ---------------------------------
+alias clearbadges='defaults write com.apple.systempreferences AttentionPrefBundleIDs 0 && killall Dock'
+
+
 # lazy af
+# -------
 alias mk='make'
 alias smk='snakemake'
 alias smake='snakemake'
 alias py='python3'
 alias ipy='ipython --pylab'
-alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
-alias ipaddr="dig +short myip.opendns.com @resolver1.opendns.com"
+alias ip="curl -4 icanhazip.com"
+alias ipaddr="curl -4 icanhazip.com"
 
+# uuid generator
+alias uuid="uuidgen"
+
+# python stuff
+# ------------
+# https://unix.stackexchange.com/a/459586
+alias vp="[ -d vp ] || virtualenv -p python3 vp && source vp/bin/activate"
+if [[ "${HOSTNAME}" == "aptos" ]]; then
+    alias vpp="[ -d vpp ] || virtualenv --python ${HOME}/.pyenv/versions/pypy3.9-7.3.9/bin/pypy3 vpp && source vpp/bin/activate"
+else
+    alias vpp="[ -d vpp ] || virtualenv -p pypy3 vpp && source vpp/bin/activate"
+fi
 
 # one-letter aliases
 # ---------------
@@ -37,6 +55,7 @@ alias sha1='openssl sha1'
 alias du='du -kh'
 alias dh='dh -kTh'
 alias pc='pelican content'
+alias lsop='lsof -nP +c 15 | /usr/bin/grep LISTEN'
 
 
 
@@ -55,38 +74,39 @@ alias mv='mv -i'
 # --------------------
 # Detect which `ls` flavor is in use
 
-if ls --color > /dev/null 2>&1; then # GNU `ls`
+LS=$(which ls)
+if $LS --color > /dev/null 2>&1; then # GNU `ls`
     colorflag="--color"
     export LS_COLORS='no=00:fi=00:di=01;31:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:'
     groupflag="--group-directories-first"
 else # macOS `ls`
     colorflag="-G"
     export LSCOLORS='BxBxhxDxfxhxhxhxhxcxcx'
-    groupflag=""
+    groupflag="--group-directories-first"
 fi
 
 
 
-alias ls="ls -1 ${colorflag} ${groupflag}"
+alias ls="$LS -1 ${colorflag} ${groupflag}"
 alias sl='ls'
 
 
 
 # List all files colorized in long format
-alias l="ls -lhAF ${colorflag}"
+alias l="$LS -lhAF ${colorflag}"
 alias ll="l"
 
 # List all files colorized in long format, including dot files
 alias la="l -a"
 
 # List only directories
-alias lsd="ls -lF ${colorflag} | grep --color=never '^d'"
+alias lsd="$LS -lF ${colorflag} | grep --color=never '^d'"
 
 
 alias lr='ls -r' # reverse
 alias llr='ll -r' # reverse
 
-alias lt='ls -lhAFt -G' # time
+alias lt='$LS -lhAFt -G' # time
 
 alias lt='ls -t' # time
 alias llt='ll -t' # time
@@ -113,13 +133,79 @@ alias c='clear'
 
 
 
-# socks proxy thru rojo
-# (forwards http traffic thru rojo port 8080)
+# socks proxy thru seawater for private wiki access
+# (use with foxyproxy, point to localhost:5778)
 # ---------------
-alias socks='ssh -fN -D 8080 charles@charlesreid1.com'
+alias socks='ssh -D 5778 -p 5778 charles@charlesreid1.party -f -N'
 
 
 
+# tinc vpn
+# ---------------
+
+alias seawatervpn="seawatervpn"
+function seawatervpn() {
+  ssh-agent > ~/ssh.file # env vars in ssh.file
+  chmod +x ~/ssh.file # execute file
+  ~/ssh.file > /dev/null
+  rm -f ~/ssh.file
+  export IP="192.168.30.1"
+  ssh -p 5778 -Y charles@${IP} # the actual ssh call
+}
+
+alias randalvpn="randalvpn"
+function randalvpn() {
+  ssh-agent > ~/ssh.file # env vars in ssh.file
+  chmod +x ~/ssh.file # execute file
+  ~/ssh.file > /dev/null
+  rm -f ~/ssh.file
+  export IP="192.168.30.10"
+  ssh -p 5778 -Y charles@${IP} # the actual ssh call
+}
+
+alias mayavpn="mayavpn"
+function mayavpn() {
+  ssh-agent > ~/ssh.file # env vars in ssh.file
+  chmod +x ~/ssh.file # execute file
+  ~/ssh.file > /dev/null
+  rm -f ~/ssh.file
+  export IP="192.168.30.20"
+  ssh -Y charles@${IP} # the actual ssh call
+}
+
+alias bearvpn="bearvpn"
+function bearvpn() {
+  ssh-agent > ~/ssh.file # env vars in ssh.file
+  chmod +x ~/ssh.file # execute file
+  ~/ssh.file > /dev/null
+  rm -f ~/ssh.file
+  export IP="192.168.30.40"
+  ssh -p 5778 -Y charles@${IP} # the actual ssh call
+}
+
+alias emmettvpn="emmettvpn"
+function emmettvpn() {
+  ssh-agent > ~/ssh.file # env vars in ssh.file
+  chmod +x ~/ssh.file # execute file
+  ~/ssh.file > /dev/null
+  rm -f ~/ssh.file
+  export IP="192.168.30.55"
+  ssh -p 5778 -Y charles@${IP} # the actual ssh call
+}
+
+# Local machines
+# ---------------
+
+alias randal="randal"
+function randal() {
+  ssh-agent > ~/ssh.file # env vars in ssh.file
+  chmod +x ~/ssh.file # execute file
+  ~/ssh.file > /dev/null
+  rm -f ~/ssh.file
+  export IP="192.168.0.10"
+  ssh -p 5778 -Y charles@${IP} # the actual ssh call
+}
+
 # Remote machines
 # ---------------
 
@@ -130,81 +216,49 @@ function charles() {
   ~/ssh.file > /dev/null
   rm -f ~/ssh.file
   export IP="charlesreid1.com"
-  ssh -Y charles@${IP} # the actual ssh call
+  ssh -p 5778 -Y charles@${IP} # the actual ssh call
 }
 
-alias blackbeard="blackbeard"
-function blackbeard() {
+alias bear="bear"
+function bear() {
   ssh-agent > ~/ssh.file # env vars in ssh.file
   chmod +x ~/ssh.file # execute file
   ~/ssh.file > /dev/null
   rm -f ~/ssh.file
-  export IP="54.191.178.27"
-  ssh -Y charles@${IP} # the actual ssh call
+  export IP="173.255.249.79"
+  ssh -p 5778 -Y charles@${IP} # the actual ssh call
 }
 
-alias jupiter="jupiter"
-function jupiter() {
+alias emmett="emmett"
+function emmett() {
   ssh-agent > ~/ssh.file # env vars in ssh.file
   chmod +x ~/ssh.file # execute file
   ~/ssh.file > /dev/null
   rm -f ~/ssh.file
-  export IP="10.6.0.2"
-  ssh -Y charles@${IP} # the actual ssh call
+  export IP="173.255.252.181"
+  ssh -p 5778 -Y charles@${IP} # the actual ssh call
 }
 
-alias maya="maya"
-function maya() {
+alias seawater="seawater"
+function seawater() {
   ssh-agent > ~/ssh.file # env vars in ssh.file
   chmod +x ~/ssh.file # execute file
   ~/ssh.file > /dev/null
   rm -f ~/ssh.file
-  export IP="10.6.0.10"
-  ssh -Y charles@${IP} # the actual ssh call
+  export IP="charlesreid1.party"
+  ssh -p 5778 -Y charles@${IP} # the actual ssh call
 }
 
-alias cronus="cronus"
-function cronus() {
+alias burro="burro"
+function burro() {
   ssh-agent > ~/ssh.file # env vars in ssh.file
   chmod +x ~/ssh.file # execute file
   ~/ssh.file > /dev/null
   rm -f ~/ssh.file
-  export IP="10.6.0.20"
-  ssh -Y charles@${IP} # the actual ssh call
+  export IP="173.255.210.178"
+  ssh -p 5778 -Y charles@${IP} # the actual ssh call
 }
 
-alias krash="krash"
-function krash() {
-  ssh-agent > ~/ssh.file # env vars in ssh.file 
-  chmod +x ~/ssh.file # execute file
-  ~/ssh.file > /dev/null
-  rm -f ~/ssh.file
-  export IP="krash"
-  ssh -Y charles@${IP} # the actual ssh call
-}
-
-alias wisko="wisko"
-function wisko() {
-  ssh-agent > ~/ssh.file # env vars in ssh.file 
-  chmod +x ~/ssh.file # execute file
-  ~/ssh.file > /dev/null
-  rm -f ~/ssh.file
-  export IP="159.65.75.41"
-  ssh -Y melo@${IP} # the actual ssh call
-}
-
-alias bluebear="bluebear"
-function bluebear() {
-  ssh-agent > ~/ssh.file # env vars in ssh.file 
-  chmod +x ~/ssh.file # execute file
-  ~/ssh.file > /dev/null
-  rm -f ~/ssh.file
-  export IP="bluebear"
-  ssh -Y charles@${IP} # the actual ssh call
-}
-
-
-
 
 # tmux shortcuts
 # constructed with help from https://robots.thoughtbot.com/a-tmux-crash-course
@@ -278,21 +332,22 @@ alias back='cd $OLDPWD'
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."
 alias ...="cd ../.."
-### alias ....="cd ../../.."
-### alias .....="cd ../../../.."
-### alias ~="cd ~" # `cd` is probably faster to type though
-### alias -- -="cd -"
+alias ....="cd ../../.."
+alias .....="cd ../../../.."
+alias ~="cd ~" # `cd` is probably faster to type though
+alias -- -="cd -"
 
 # Shortcuts
 alias d="cd ~/Desktop"
 alias g="git"
+alias gs="git status"
 alias h="history"
 
-alias s="screen"
+#alias s="screen"
 
 # Always enable colored `grep` output
 # Note: `GREP_OPTIONS="--color=auto"` is deprecated, hence the alias usage.
-alias grep='grep -i --color=auto'
+alias grep='grep -i --color=auto --exclude-dir=vp'
 alias fgrep='fgrep --color=auto'
 alias egrep='egrep --color=auto'
 
@@ -374,25 +429,6 @@ alias ifactive="ifconfig | pcregrep -M -o '^[^\t:]+:([^\n]|\n\t)*status: active'
 # Airport CLI alias
 alias airport='/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport'
 
-### # Intuitive map function
-### # For example, to list all directories that contain a certain file:
-### # find . -name .gitattributes | map dirname
-### alias map="xargs -n1"
-### 
-### # One of @janmoesen’s ProTip™s
-### for method in GET HEAD POST PUT DELETE TRACE OPTIONS; do
-### 	alias "${method}"="lwp-request -m '${method}'"
-### done
-### 
-### 
-### # Stuff I never really use but cannot delete either because of http://xkcd.com/530/
-### alias stfu="osascript -e 'set volume output muted true'"
-### alias pumpitup="osascript -e 'set volume output volume 100'"
-### 
-### # Kill all the tabs in Chrome to free up memory
-### # [C] explained: http://www.commandlinefu.com/commands/view/402/exclude-grep-from-your-grepped-output-of-ps-alias-included-in-description
-### alias chromekill="ps ux | grep '[C]hrome Helper --type=renderer' | grep -v extension-process | tr -s ' ' | cut -d ' ' -f2 | xargs kill"
-
 # Lock the screen (when going AFK)
 alias afk="/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend"
 

.bash_profile

@@ -9,12 +9,43 @@
 EDITOR="vim"
 GIT_EDITOR="vim"
 
+# Better man pages
+PAGER="most"
+
+# Go stuff
+GOROOT=$HOME/go
+GOPATH=$HOME/go
 
 # Set $PATH here
+PATH="${HOME}/scripts:${PATH}"
 PATH="/usr/local/bin:$PATH"
 PATH="/usr/local/sbin:${PATH}" # homebrew admin tools
-PATH="${HOME}/go/bin:${PATH}"
-PATH="$(brew --prefix coreutils)/libexec/gnubin:${PATH}"
+PATH="${PATH}:${GOROOT}/bin"
+PATH="/usr/local/opt/coreutils/libexec/gnubin:${PATH}"
+PATH="${HOME}/bin:${PATH}"
+if [[ ("$HOSTNAME" == "seawater") || ("$HOSTNAME" == "bascom") ]]; then
+    PATH="${HOME}/bin/elasticsearch-5.4.2/bin:${PATH}"
+
+    # assume-role cli util:
+    # Add homebrew-installed ruby to path:
+    # (WARNING: THIS CAN CAUSE PROBLEMS!)
+    export PATH="/usr/local/opt/ruby/bin:$PATH"
+
+    # Add homebrew-ruby-gem-installed packages to path:
+    export PATH="/usr/local/lib/ruby/gems/2.6.0/bin:$PATH"
+
+    # aws - load config file when using assume-role
+    export AWS_SDK_LOAD_CONFIG="1"
+fi
+
+# Tell git not to look for getext.sh
+# since pyenv has trouble with that
+export GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=1
+
+if [[ "$HOSTNAME" == "bascom" ]]; then
+    # git tab completion
+    source ${HOME}/.git-completion.bash
+fi
 
 if [[ "$HOSTNAME" == "maya" ]]; then
 
@@ -22,6 +53,10 @@ if [[ "$HOSTNAME" == "maya" ]]; then
 	PATH="$HOME/.local/bin:$PATH"
 	PATH="$HOME/Library/Python/3.6/bin:$PATH"
 
+    # pypy
+    # this should go after /usr/local/bin
+    PATH="${PATH}:/usr/local/share/pypy3"
+
     ### # some weird new homebrew thing??
     ### # this is where python -> python3 lives now
     ### # https://stackoverflow.com/a/45228901
@@ -37,20 +72,38 @@ if [[ "$HOSTNAME" == "maya" ]]; then
 		source $F2
 	fi
 
+    # git tab completion
+    source ${HOME}/.git-completion.bash
+
+    # Enable tab completion for `g` by marking it as an alias for `git`
+    if type _git &> /dev/null && [ -f /usr/local/etc/bash_completion.d/git-completion.bash ]; then
+    	complete -o default -o nospace -F _git g;
+    fi;
 fi
 
+
+# goenv installer
+export GOENV_ROOT="$HOME/.goenv"
+export PATH="$GOENV_ROOT/bin:$PATH"
+
+# Only enable this if you are using go.
+# This will add half a second every time you
+# open a new shell.
+#eval "$(goenv init -)"
+
 # pyenv installer
 # https://github.com/pyenv/pyenv-installer
-export PATH="$HOME/.pyenv/bin:$PATH"
+export PYENV_ROOT="$HOME/.pyenv"
+export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init --path)"
 eval "$(pyenv init -)"
-#eval "$(pyenv virtualenv-init -)"
-
 
 export PATH
 
 # Just let homebrew take care of PYTHONPATH, yeah?
 # But if you really needed to, you could set it here.
 
+
 # Bash history
 
 HISTFILE="$HOME/.bash_history"
@@ -69,6 +122,29 @@ shopt -s histappend;
 # https://askubuntu.com/a/673283
 PROMPT_COMMAND='history -a;history -n'
 
+# don't try to autocomplete commands when tab is pressed and line is empty
+shopt -s no_empty_cmd_completion
+
+#############################
+# ssh-agent setup
+### SSH_ENV="$HOME/.ssh/agent-environment"
+### 
+### function start_agent {
+###     /usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
+###     chmod 600 "${SSH_ENV}"
+###     . "${SSH_ENV}" > /dev/null
+###     /usr/bin/ssh-add;
+### }
+### 
+### # Source SSH settings, if applicable
+### if [ -f "${SSH_ENV}" ]; then
+###     . "${SSH_ENV}" > /dev/null
+###     ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
+###         start_agent;
+###     }
+### else
+###     start_agent;
+### fi
 
 
 #############################
@@ -88,22 +164,13 @@ shopt -s nocaseglob;
 # Autocorrect typos in path names when using `cd`
 shopt -s cdspell;
 
-# Enable some Bash 4 features when possible:
-# * `autocd`, e.g. `**/qux` will enter `./foo/bar/baz/qux`
-# * Recursive globbing, e.g. `echo **/*.txt`
-for option in autocd globstar; do
-	shopt -s "$option" 2> /dev/null;
-done;
-
 if [ -f /etc/bash_completion ]; then
 	source /etc/bash_completion;
 fi;
 
+if [[ "$HOSTNAME" == "bascom" ]]; then
     # Enable tab completion for `g` by marking it as an alias for `git`
     if type _git &> /dev/null && [ -f /usr/local/etc/bash_completion.d/git-completion.bash ]; then
     	complete -o default -o nospace -F _git g;
     fi;
-
-# Add tab completion for SSH hostnames based on ~/.ssh/config, ignoring wildcards
-[ -e "$HOME/.ssh/config" ] && complete -o "default" -o "nospace" -W "$(grep "^Host" ~/.ssh/config | grep -v "[?*]" | cut -d " " -f2- | tr ' ' '\n')" scp sftp ssh;
-
+fi

.bash_prompt

@@ -5,77 +5,30 @@
 # Heavily inspired by @necolas’s prompt: https://github.com/necolas/dotfiles
 # iTerm → Profiles → Text → use 13pt Monaco with 1.1 vertical spacing.
 
-if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
-	export TERM='gnome-256color';
-elif infocmp xterm-256color >/dev/null 2>&1; then
-	export TERM='xterm-256color';
-fi;
+#########   This screws up scp
+#if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
+#	export TERM='gnome-256color';
+#elif infocmp xterm-256color >/dev/null 2>&1; then
+#	export TERM='xterm-256color';
+#fi;
 
-##prompt_git() {
-##	local s='';
-##	local branchName='';
-##
-##	# Check if the current directory is in a Git repository.
-##	if [ $(git rev-parse --is-inside-work-tree &>/dev/null; echo "${?}") == '0' ]; then
-##
-##		# check if the current directory is in .git before running git checks
-##		if [ "$(git rev-parse --is-inside-git-dir 2> /dev/null)" == 'false' ]; then
-##
-##			# Ensure the index is up to date.
-##			git update-index --really-refresh -q &>/dev/null;
-##
-##			# Check for uncommitted changes in the index.
-##			if ! $(git diff --quiet --ignore-submodules --cached); then
-##				s+='+';
-##			fi;
-##
-##			# Check for unstaged changes.
-##			if ! $(git diff-files --quiet --ignore-submodules --); then
-##				s+='!';
-##			fi;
-##
-##			# Check for untracked files.
-##			if [ -n "$(git ls-files --others --exclude-standard)" ]; then
-##				s+='?';
-##			fi;
-##
-##			# Check for stashed files.
-##			if $(git rev-parse --verify refs/stash &>/dev/null); then
-##				s+='$';
-##			fi;
-##
-##		fi;
-##
-##		# Get the short symbolic ref.
-##		# If HEAD isn’t a symbolic ref, get the short SHA for the latest commit
-##		# Otherwise, just give up.
-##		branchName="$(git symbolic-ref --quiet --short HEAD 2> /dev/null || \
-##			git rev-parse --short HEAD 2> /dev/null || \
-##			echo '(unknown)')";
-##
-##		[ -n "${s}" ] && s=" [${s}]";
-##
-##		echo -e "${1}${branchName}${2}${s}";
-##	else
-##		return;
-##	fi;
-##}
-##
-if tput setaf 1 &> /dev/null; then
-	tput sgr0; # reset colors
-	bold=$(tput bold);
-	reset=$(tput sgr0);
+export TPUT="/usr/bin/tput"
+
+if ${TPUT} setaf 1 &> /dev/null; then
+	${TPUT} sgr0; # reset colors
+	bold=$(${TPUT} bold);
+	reset=$(${TPUT} sgr0);
 	# Solarized colors, taken from http://git.io/solarized-colors.
-	black=$(tput setaf 0);
-	blue=$(tput setaf 33);
-	cyan=$(tput setaf 37);
-	green=$(tput setaf 64);
-	orange=$(tput setaf 166);
-	purple=$(tput setaf 125);
-	red=$(tput setaf 124);
-	violet=$(tput setaf 61);
-	white=$(tput setaf 15);
-	yellow=$(tput setaf 136);
+	black=$(${TPUT} setaf 0);
+	blue=$(${TPUT} setaf 33);
+	cyan=$(${TPUT} setaf 37);
+	green=$(${TPUT} setaf 64);
+	orange=$(${TPUT} setaf 166);
+	purple=$(${TPUT} setaf 125);
+	red=$(${TPUT} setaf 124);
+	violet=$(${TPUT} setaf 61);
+	white=$(${TPUT} setaf 15);
+	yellow=$(${TPUT} setaf 136);
 else
 	bold='';
 	reset="\e[0m";
@@ -95,6 +48,8 @@ if [[ "${HOSTNAME}" == "maya" ]]; then
     userStyle="${orange}"
 elif [[ "${HOSTNAME}" == "cronus" ]]; then
     userStyle="${yellow}"
+elif [[ "${HOSTNAME}" == "aptos" ]]; then
+    userStyle="${blue}"
 else
     userStyle="${green}"
 fi
@@ -118,8 +73,8 @@ PS1+="\[${userStyle}\]\u"; # username
 PS1+="\[${white}\] on ";
 PS1+="\[${hostStyle}\]\h"; # host
 PS1+="\[${white}\] at ";
-PS1+="[ \D{%Y-%m-%d} - \t ] in "; # date and time stamp
-#PS1+="\[${green}\]\w"; # working directory full path
+PS1+="[ \D{%Y-%m-%d} - \t ] "; # date and time stamp
+PS1+="in ";
 PS1+="\w"; # working directory full path
 PS1+="\n";
 PS1+="\[${white}\]\$ \[${reset}\]"; # `$` (and reset color)

.bashrc

@@ -1,7 +1,2 @@
-[ -n "$PS1" ] && source ~/.bash_profile;
-
-# mcfly is a pretty cool command completion program
-# Control + R on the command line, then start typing stuff
-if [[ -f "$(brew --prefix)/opt/mcfly/mcfly.bash" ]]; then
-  source "$(brew --prefix)/opt/mcfly/mcfly.bash"
-fi
+#[ -n "$PS1" ] && source ~/.bash_profile;
+source ~/.bash_profile

.functions

@@ -5,11 +5,6 @@ function mkd() {
 	mkdir -p "$@" && cd "$_";
 }
 
-# Change working directory to the top-most Finder window location
-function cdf() { # short for `cdfinder`
-	cd "$(osascript -e 'tell app "Finder" to POSIX path of (insertion location as alias)')";
-}
-
 # Create a .tar.gz archive, using `zopfli`, `pigz` or `gzip` for compression
 function targz() {
 	local tmpFile="${@%/}.tar";
@@ -58,14 +53,6 @@ function fs() {
 	fi;
 }
 
-# Use Git’s colored diff when available
-hash git &>/dev/null;
-if [ $? -eq 0 ]; then
-	function diff() {
-		git diff --no-index --color-words "$@";
-	}
-fi;
-
 # Create a data URL from a file
 function dataurl() {
 	local mimeType=$(file -b --mime-type "$1");
@@ -84,15 +71,6 @@ function server() {
 	python -c $'import SimpleHTTPServer;\nmap = SimpleHTTPServer.SimpleHTTPRequestHandler.extensions_map;\nmap[""] = "text/plain";\nfor key, value in map.items():\n\tmap[key] = value + ";charset=UTF-8";\nSimpleHTTPServer.test();' "$port";
 }
 
-# Start a PHP server from a directory, optionally specifying the port
-# (Requires PHP 5.4.0+.)
-function phpserver() {
-	local port="${1:-4000}";
-	local ip=$(ipconfig getifaddr en1);
-	sleep 1 && open "http://${ip}:${port}/" &
-	php -S "${ip}:${port}";
-}
-
 # Compare original and gzipped file size
 function gz() {
 	local origsize=$(wc -c < "$1");
@@ -160,16 +138,6 @@ function getcertnames() {
 	fi;
 }
 
-# `s` with no arguments opens the current directory in Sublime Text, otherwise
-# opens the given location
-function s() {
-	if [ $# -eq 0 ]; then
-		subl .;
-	else
-		subl "$@";
-	fi;
-}
-
 # `v` with no arguments opens the current directory in Vim, otherwise opens the
 # given location
 function v() {

.gitconfig

@@ -5,9 +5,17 @@
 ## replace any git@github stuff with gh:
 ## replace any ssh://git@g.... with cmr:
 
+[commit]
+    gpgsign = true
 [user]
     email = charlesreid1@gmail.com
     name = Charles Reid
+    signingkey = 078B7759B68B353A # aptos
+[includeIf "gitdir:~/codes/"] 
+    path = .gitconfig_charlesreid1
+[includeIf "gitdir:~/golly/"] 
+    path = .gitconfig_ch4zm
+
 [credential]
     helper = cache
 [filter "media"]
@@ -27,38 +35,92 @@
     lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
     lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n''          %C(white)%s%C(reset)%n''          %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'
 
+    # typo stuff
+    co = checkout
+    cehckout = checkout
+    ceckout = checkout
+    chekout = checkout
+    commti = commit
+    comimt = commit
+    comit = commit
+
+    # https://victorzhou.com/blog/git-aliases/
+    a = add
+    cm = commit -m
+    rh = reset --hard
+    lo = log --oneline -n 10
+    lolo = log --oneline -n 50
 
     # View abbreviated SHA, description, and history graph of the latest 20 commits
     l = log --pretty=oneline -n 20 --graph --abbrev-commit
 
-    # View the current working tree status using the short format
+    # View the current working tree status: short format and long format
     s = status -s
+    ss = status
 
+    # Just print the name of the current branch
+    cb = branch --show-current
+
+    # Show branches
     b = branch -v
     bv = branch -v
+    bb = branch -v
+
     ba = branch -a
     bb = branch -v -a
 
+    # Show remotes
     r = remote -v
     rv = remote -v
     ra = remote -v
 
     f = fetch --all
 
+    # Show log history of commits on this branch
+    # that are different from master
+    # (these aliases are useful for rebases)
+    #
+    # dm = *Different from *Master (log)
+    # https://stackoverflow.com/a/59273667/463213
+    dm = "log --boundary --right-only --graph --oneline master..HEAD"
+
+    # dms = *Different from *Master, *Status
+    dms = "diff --stat master..HEAD"
+
+    # dmf = *Different from *Master, *Files
+    dmf = "diff --name-only master..HEAD"
+
+    # show diff of staged changes
     cdiff = diff --cached
+    cd = diff --cached
+
+    # Interactive rebase with the given number of latest commits
+    # reb N = interactive rebase with last N commits (inclusive)
+    reb = "!r() { git rebase -i HEAD~$1; }; r"
+
+    # continue the rebase
+    rebc = "rebase --continue"
 
     # Show the diff between the latest commit and the current state
     d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
 
-    ### # `git di $number` shows the diff between the state `$number` revisions ago and the current state
-    ### di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
+    # `git di $number` shows the diff between the state `$number` revisions ago and the current state
+    di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
+
+    p = "!f() { git pull $1 $2; }; f"
 
     # Pull in remote changes for the current repository and all its submodules
-    p = !"git pull; git submodule foreach git pull origin master"
+    pp = !"git pull; git submodule foreach git pull origin master"
 
     # Clone a repository including all submodules
     c = clone --recursive
 
+    # Amend the currently staged files to the latest commit
+    amend = commit --amend --reuse-message=HEAD
+
+    # Oops
+    fix = commit --amend --reuse-message=HEAD --edit
+
     # Commit all changes
     ca = !git add -A && git commit -av
 
@@ -74,20 +136,6 @@
     # List aliases
     aliases = config --get-regexp alias
 
-    # Amend the currently staged files to the latest commit
-    amend = commit --amend --reuse-message=HEAD
-
-    # Oops
-    fix = commit --amend --reuse-message=HEAD --edit
-
-
-
-    # Credit an author on the latest commit
-    credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
-
-    # Interactive rebase with the given number of latest commits
-    reb = "!r() { git rebase -i HEAD~$1; }; r"
-
     # Remove the old tag with this name and tag the latest commit with it.
     retag = "!r() { git tag -d $1 && git push origin :refs/tags/$1 && git tag $1; }; r"
 
@@ -212,3 +260,17 @@
 [url "git://gist.github.com/"]
 
     insteadOf = "gist:"
+
+[rerere]
+
+    enabled = true
+    autoupdate = true
+[pull]
+	rebase = true
+[init]
+	defaultBranch = main
+[filter "lfs"]
+	process = git-lfs filter-process
+	required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f

.tmux.conf

@@ -1,67 +1,114 @@
 ###################
 # charles
+#
+# Useful links:
+# https://github.com/mathiasbynens/dotfiles/blob/master/.tmux.conf
+# https://github.com/samoshkin/tmux-config/blob/master/tmux/tmux.conf
+# https://github.com/tony/tmux-config/blob/master/scripts/resize-adaptable.sh
+# https://stackoverflow.com/a/40009032
+# 
+# Basic layout:
+# - .tmux.conf contains tmux configuration variables
+# - .tmux.sessionX contains tmux session setup (keyboard shortcut)
+# - scripts/devtmux contains tmux session setup (named sessions)
 
 set -g default-terminal "screen-256color"
 set-option -g default-terminal screen-256color
 
+# Use C-t instead
+set-option -g prefix C-t
+unbind C-t
+bind C-t send-prefix
 
-# use C-a, since it's on the home row and easier to hit than C-b
-set-option -g prefix C-a
-unbind-key C-a
-bind-key C-a send-prefix
+
+# Set parent terminal title to reflect current window in tmux session
+set -g set-titles on
+set -g set-titles-string "#I:#W"
+
+# Start indexing of windows at 1, not 0
 set -g base-index 1
+setw -g pane-base-index 1
 
 # Easy config reload
 unbind r
-bind-key R source-file ~/.tmux.conf \; display-message "tmux.conf reloaded."
+bind R source-file ~/.tmux.conf \; display-message "tmux.conf reloaded."
 
 # vi is good
 setw -g mode-keys vi
 
-bind-key : command-prompt
-bind-key r refresh-client
-bind-key L clear-history
+bind : command-prompt
+bind r refresh-client
 
-bind-key space next-window
-bind-key bspace previous-window
-bind-key enter next-layout
+bind space next-window
+bind bspace previous-window
+bind enter next-layout
 
 # use vim-like keys for splits and windows
-bind-key v split-window -h -c "#{pane_current_path}"
-bind-key s split-window -v -c "#{pane_current_path}"
-bind-key h select-pane -L
-bind-key j select-pane -D
-bind-key k select-pane -U
-bind-key l select-pane -R
-bind-key C-h select-pane -L
-bind-key C-l select-pane -R
+# 
+#   Control-T plus:
+# 
+#   s = horizontal split
+#   v = vertical split
+#   h = pick left pane
+#   j = pick down pane
+#   k = pick up pane
+#   l = pick right pane
+# 
+bind v split-window -h -c "#{pane_current_path}"
+bind s split-window -v -c "#{pane_current_path}"
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
 
 # smart pane switching with awareness of vim splits
-bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-h) || tmux select-pane -L"
-bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-j) || tmux select-pane -D"
-bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-k) || tmux select-pane -U"
-bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-l) || tmux select-pane -R"
-bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys 'C-\\') || tmux select-pane -l"
-bind C-l send-keys 'C-l'
+# (these interfere with the often-used Control-L shortcut
+# to clear the screen, so that gets really annoying.)
+# 
+# Control then:
+# 
+#   h = pick left pane
+#   j = pick down pane
+#   k = pick up pane
+#   l = pick right pane
+#
+# bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-h) || tmux select-pane -L"
+# bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-j) || tmux select-pane -D"
+# bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-k) || tmux select-pane -U"
+# bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-l) || tmux select-pane -R"
 
-bind-key C-o rotate-window
+# Control-T then Control-O swaps out windows in their respective positions
+bind C-o rotate-window
 
-bind-key + select-layout main-horizontal
-bind-key = select-layout main-vertical
-set-window-option -g other-pane-height 25
-set-window-option -g other-pane-width 80
+# Control-T then + makes existing windows have vertical layout
+bind + select-layout main-vertical
 
-bind-key a last-pane
-bind-key q display-panes
-bind-key c new-window
-bind-key t next-window
-bind-key T previous-window
+# Control-T then = makes existing windows have horizontal layout
+bind = select-layout main-horizontal
 
-bind-key [ copy-mode
-bind-key ] paste-buffer
+# Control-T Control-N makes a new window in the path of the current pane
+bind C-n new-window -c '#{pane_current_path}'
 
+## (no idea what this does)
+#set-window-option -g other-pane-height 25
+#set-window-option -g other-pane-width 80
+
+# Control-T plus [ or ] moves into copy mode or paste mode
+bind [ copy-mode
+bind ] paste-buffer
+
+# (no idea)
 set-window-option -g display-panes-time 1500
 
+# Control-T plus | or _ splits panes vertically (|) or horizontally (_)
+# (this is better than using percent, but now we've got muscle memory for %)
+bind | split-window -h -c "#{pane_current_path}"
+bind _ split-window -v -c "#{pane_current_path}"
+
+# because we were using this before
+bind % split-window -h -c "#{pane_current_path}"
+
+
 # Status Bar
 set-option -g status-interval 1
 set-option -g status-left ''
@@ -78,4 +125,10 @@ set -g visual-activity on
 # Allow the arrow key to be used immediately after changing windows
 set-option -g repeat-time 0
 
+# Set up easy go-to sessions with shortcuts 
+bind s source-file ~/.tmux.session1
 
+# When in copy mode, v starts a selection and y finishes it
+#bind-key -T copy-mode-vi 'v' send -X begin-selection
+#bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel
+bind-key -T copy-mode-vi 'y' send -X copy-pipe

.tmux.session1

@@ -0,0 +1,5 @@
+# https://stackoverflow.com/a/5753059
+new-session -A -s dev -n dev
+send-keys 'vim' C-m
+split-window -v -p 20
+select-pane -t 1

.vim/colors/blue.vim

@@ -0,0 +1,55 @@
+" local syntax file - set colors on a per-machine basis:
+" vim: tw=0 ts=4 sw=4
+" Vim color file
+" Maintainer:	Steven Vertigan <steven@vertigan.wattle.id.au>
+" Last Change:	2006 Sep 23
+" Revision #5: Switch main text from white to yellow for easier contrast,
+" fixed some problems with terminal backgrounds.
+
+set background=dark
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name = "blue"
+hi Normal		guifg=yellow	guibg=darkBlue	ctermfg=yellow	ctermbg=darkBlue
+hi NonText		guifg=magenta	ctermfg=lightMagenta
+hi comment		guifg=gray		ctermfg=gray	ctermbg=darkBlue	gui=bold 
+hi constant		guifg=cyan		ctermfg=cyan
+hi identifier	guifg=gray		ctermfg=red
+hi statement	guifg=white		ctermfg=white	ctermbg=darkBlue	gui=none
+hi preproc		guifg=green		ctermfg=green
+hi type			guifg=orange	ctermfg=lightRed	ctermbg=darkBlue
+hi special		guifg=magenta	ctermfg=lightMagenta	ctermbg=darkBlue
+hi Underlined	guifg=cyan		ctermfg=cyan	gui=underline	cterm=underline
+hi label		guifg=yellow	ctermfg=yellow
+hi operator		guifg=orange	gui=bold	ctermfg=lightRed	ctermbg=darkBlue
+
+hi ErrorMsg		guifg=orange	guibg=darkBlue	ctermfg=lightRed
+hi WarningMsg	guifg=cyan		guibg=darkBlue	ctermfg=cyan	gui=bold
+hi ModeMsg		guifg=yellow	gui=NONE	ctermfg=yellow
+hi MoreMsg		guifg=yellow	gui=NONE	ctermfg=yellow
+hi Error		guifg=red		guibg=darkBlue	gui=underline	ctermfg=red
+
+hi Todo			guifg=black		guibg=orange	ctermfg=black	ctermbg=darkYellow
+hi Cursor		guifg=black		guibg=white		ctermfg=black	ctermbg=white
+hi Search		guifg=black		guibg=orange	ctermfg=black	ctermbg=darkYellow
+hi IncSearch	guifg=black		guibg=yellow	ctermfg=black	ctermbg=darkYellow
+hi LineNr		guifg=cyan		ctermfg=cyan
+hi title		guifg=white	gui=bold	cterm=bold
+
+hi StatusLineNC	gui=NONE	guifg=black guibg=blue	ctermfg=black  ctermbg=blue
+hi StatusLine	gui=bold	guifg=cyan	guibg=blue	ctermfg=cyan   ctermbg=blue
+hi VertSplit	gui=none	guifg=blue	guibg=blue	ctermfg=blue	ctermbg=blue
+
+hi Visual		term=reverse		ctermfg=black	ctermbg=darkCyan	guifg=black		guibg=darkCyan
+
+hi DiffChange	guibg=darkGreen		guifg=black	ctermbg=darkGreen	ctermfg=black
+hi DiffText		guibg=olivedrab		guifg=black		ctermbg=lightGreen	ctermfg=black
+hi DiffAdd		guibg=slateblue		guifg=black		ctermbg=blue		ctermfg=black
+hi DiffDelete   guibg=coral			guifg=black	ctermbg=cyan		ctermfg=black
+
+hi Folded		guibg=orange		guifg=black		ctermbg=yellow		ctermfg=black
+hi FoldColumn	guibg=gray30		guifg=black	ctermbg=gray		ctermfg=black
+hi cIf0			guifg=gray			ctermfg=gray
+

.vim/colors/darkblue.vim

@@ -0,0 +1,66 @@
+" Vim color file
+" Maintainer:	Bohdan Vlasyuk <bohdan@vstu.edu.ua>
+" Last Change:	2008 Jul 18
+
+" darkblue -- for those who prefer dark background
+" [note: looks bit uglier with come terminal palettes,
+" but is fine on default linux console palette.]
+
+set bg=dark
+hi clear
+if exists("syntax_on")
+	syntax reset
+endif
+
+let colors_name = "darkblue"
+
+hi Normal		guifg=#c0c0c0 guibg=#000040						ctermfg=gray ctermbg=black
+hi ErrorMsg		guifg=#ffffff guibg=#287eff						ctermfg=white ctermbg=lightblue
+hi Visual		guifg=#8080ff guibg=fg		gui=reverse				ctermfg=lightblue ctermbg=fg cterm=reverse
+hi VisualNOS	guifg=#8080ff guibg=fg		gui=reverse,underline	ctermfg=lightblue ctermbg=fg cterm=reverse,underline
+hi Todo			guifg=#d14a14 guibg=#1248d1						ctermfg=red	ctermbg=darkblue
+hi Search		guifg=#90fff0 guibg=#2050d0						ctermfg=white ctermbg=darkblue cterm=underline term=underline
+hi IncSearch	guifg=#b0ffff guibg=#2050d0							ctermfg=darkblue ctermbg=gray
+
+hi SpecialKey		guifg=cyan			ctermfg=darkcyan
+hi Directory		guifg=cyan			ctermfg=cyan
+hi Title			guifg=magenta gui=none ctermfg=magenta cterm=bold
+hi WarningMsg		guifg=red			ctermfg=red
+hi WildMenu			guifg=yellow guibg=black ctermfg=yellow ctermbg=black cterm=none term=none
+hi ModeMsg			guifg=#22cce2		ctermfg=lightblue
+hi MoreMsg			ctermfg=darkgreen	ctermfg=darkgreen
+hi Question			guifg=green gui=none ctermfg=green cterm=none
+hi NonText			guifg=#0030ff		ctermfg=darkblue
+
+hi StatusLine	guifg=blue guibg=darkgray gui=none		ctermfg=blue ctermbg=gray term=none cterm=none
+hi StatusLineNC	guifg=black guibg=darkgray gui=none		ctermfg=black ctermbg=gray term=none cterm=none
+hi VertSplit	guifg=black guibg=darkgray gui=none		ctermfg=black ctermbg=gray term=none cterm=none
+
+hi Folded	guifg=#808080 guibg=#000040			ctermfg=darkgrey ctermbg=black cterm=bold term=bold
+hi FoldColumn	guifg=#808080 guibg=#000040			ctermfg=darkgrey ctermbg=black cterm=bold term=bold
+hi LineNr	guifg=#90f020			ctermfg=green cterm=none
+
+hi DiffAdd	guibg=darkblue	ctermbg=darkblue term=none cterm=none
+hi DiffChange	guibg=darkmagenta ctermbg=magenta cterm=none
+hi DiffDelete	ctermfg=blue ctermbg=cyan gui=bold guifg=Blue guibg=DarkCyan
+hi DiffText	cterm=bold ctermbg=red gui=bold guibg=Red
+
+hi Cursor	guifg=black guibg=yellow ctermfg=black ctermbg=yellow
+hi lCursor	guifg=black guibg=white ctermfg=black ctermbg=white
+
+
+hi Comment	guifg=#80a0ff ctermfg=darkred
+hi Constant	ctermfg=magenta guifg=#ffa0a0 cterm=none
+hi Special	ctermfg=brown guifg=Orange cterm=none gui=none
+hi Identifier	ctermfg=cyan guifg=#40ffff cterm=none
+hi Statement	ctermfg=yellow cterm=none guifg=#ffff60 gui=none
+hi PreProc	ctermfg=magenta guifg=#ff80ff gui=none cterm=none
+hi type		ctermfg=green guifg=#60ff60 gui=none cterm=none
+hi Underlined	cterm=underline term=underline
+hi Ignore	guifg=bg ctermfg=bg
+
+" suggested by tigmoid, 2008 Jul 18
+hi Pmenu guifg=#c0c0c0 guibg=#404080
+hi PmenuSel guifg=#c0c0c0 guibg=#2050d0
+hi PmenuSbar guifg=blue guibg=darkgray
+hi PmenuThumb guifg=#c0c0c0

.vim/colors/default.vim

@@ -0,0 +1,23 @@
+" Vim color file
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2001 Jul 23
+
+" This is the default color scheme.  It doesn't define the Normal
+" highlighting, it uses whatever the colors used to be.
+
+" Set 'background' back to the default.  The value can't always be estimated
+" and is then guessed.
+hi clear Normal
+set bg&
+
+" Remove all existing highlighting and set the defaults.
+hi clear
+
+" Load the syntax highlighting defaults, if it's enabled.
+if exists("syntax_on")
+  syntax reset
+endif
+
+let colors_name = "default"
+
+" vim: sw=2

.vim/colors/delek.vim

@@ -0,0 +1,55 @@
+" Vim color file
+" Maintainer:	David Schweikert <david@schweikert.ch>
+" Last Change:	2014 Mar 19
+
+hi clear
+
+let g:colors_name = "delek"
+
+" Normal should come first
+hi Normal     guifg=Black  guibg=White
+hi Cursor     guifg=bg     guibg=fg
+hi lCursor    guifg=NONE   guibg=Cyan
+
+" Note: we never set 'term' because the defaults for B&W terminals are OK
+hi DiffAdd    ctermbg=LightBlue    guibg=LightBlue
+hi DiffChange ctermbg=LightMagenta guibg=LightMagenta
+hi DiffDelete ctermfg=Blue	   ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan
+hi DiffText   ctermbg=Red	   cterm=bold gui=bold guibg=Red
+hi Directory  ctermfg=DarkBlue	   guifg=Blue
+hi ErrorMsg   ctermfg=White	   ctermbg=DarkRed  guibg=Red	    guifg=White
+hi FoldColumn ctermfg=DarkBlue	   ctermbg=Grey     guibg=Grey	    guifg=DarkBlue
+hi Folded     ctermbg=Grey	   ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue
+hi IncSearch  cterm=reverse	   gui=reverse
+hi LineNr     ctermfg=Brown	   guifg=Brown
+hi ModeMsg    cterm=bold	   gui=bold
+hi MoreMsg    ctermfg=DarkGreen    gui=bold guifg=SeaGreen
+hi NonText    ctermfg=Blue	   gui=bold guifg=gray guibg=white
+hi Pmenu      guibg=LightBlue
+hi PmenuSel   ctermfg=White	   ctermbg=DarkBlue  guifg=White  guibg=DarkBlue
+hi Question   ctermfg=DarkGreen    gui=bold guifg=SeaGreen
+if &background == "light"
+    hi Search     ctermfg=NONE	   ctermbg=Yellow guibg=Yellow guifg=NONE
+else
+    hi Search     ctermfg=Black	   ctermbg=Yellow guibg=Yellow guifg=Black
+endif
+hi SpecialKey ctermfg=DarkBlue	   guifg=Blue
+hi StatusLine cterm=bold	   ctermbg=blue ctermfg=yellow guibg=gold guifg=blue
+hi StatusLineNC	cterm=bold	   ctermbg=blue ctermfg=black  guibg=gold guifg=blue
+hi Title      ctermfg=DarkMagenta  gui=bold guifg=Magenta
+hi VertSplit  cterm=reverse	   gui=reverse
+hi Visual     ctermbg=NONE	   cterm=reverse gui=reverse guifg=Grey guibg=fg
+hi VisualNOS  cterm=underline,bold gui=underline,bold
+hi WarningMsg ctermfg=DarkRed	   guifg=Red
+hi WildMenu   ctermfg=Black	   ctermbg=Yellow    guibg=Yellow guifg=Black
+
+" syntax highlighting
+hi Comment    cterm=NONE ctermfg=DarkRed     gui=NONE guifg=red2
+hi Constant   cterm=NONE ctermfg=DarkGreen   gui=NONE guifg=green3
+hi Identifier cterm=NONE ctermfg=DarkCyan    gui=NONE guifg=cyan4
+hi PreProc    cterm=NONE ctermfg=DarkMagenta gui=NONE guifg=magenta3
+hi Special    cterm=NONE ctermfg=LightRed    gui=NONE guifg=deeppink
+hi Statement  cterm=bold ctermfg=Blue	     gui=bold guifg=blue
+hi Type	      cterm=NONE ctermfg=Blue	     gui=bold guifg=blue
+
+" vim: sw=2

.vim/colors/desert.vim

@@ -0,0 +1,108 @@
+" Vim color file
+" Maintainer:	Hans Fugal <hans@fugal.net>
+" Last Change:	$Date: 2004/06/13 19:30:30 $
+" Last Change:	$Date: 2004/06/13 19:30:30 $
+" URL:		http://hans.fugal.net/vim/colors/desert.vim
+" Version:	$Id: desert.vim,v 1.1 2004/06/13 19:30:30 vimboss Exp $
+
+" cool help screens
+" :he group-name
+" :he highlight-groups
+" :he cterm-colors
+
+set background=dark
+if version > 580
+    " no guarantees for version 5.8 and below, but this makes it stop
+    " complaining
+    hi clear
+    if exists("syntax_on")
+	syntax reset
+    endif
+endif
+let g:colors_name="desert"
+
+hi Normal	guifg=White guibg=grey20
+
+" highlight groups
+hi Cursor	guibg=khaki guifg=slategrey
+"hi CursorIM
+"hi Directory
+"hi DiffAdd
+"hi DiffChange
+"hi DiffDelete
+"hi DiffText
+"hi ErrorMsg
+hi VertSplit	guibg=#c2bfa5 guifg=grey50 gui=none
+hi Folded	guibg=grey30 guifg=gold
+hi FoldColumn	guibg=grey30 guifg=tan
+hi IncSearch	guifg=slategrey guibg=khaki
+"hi LineNr
+hi ModeMsg	guifg=goldenrod
+hi MoreMsg	guifg=SeaGreen
+hi NonText	guifg=LightBlue guibg=grey30
+hi Question	guifg=springgreen
+hi Search	guibg=peru guifg=wheat
+hi SpecialKey	guifg=yellowgreen
+hi StatusLine	guibg=#c2bfa5 guifg=black gui=none
+hi StatusLineNC	guibg=#c2bfa5 guifg=grey50 gui=none
+hi Title	guifg=indianred
+hi Visual	gui=none guifg=khaki guibg=olivedrab
+"hi VisualNOS
+hi WarningMsg	guifg=salmon
+"hi WildMenu
+"hi Menu
+"hi Scrollbar
+"hi Tooltip
+
+" syntax highlighting groups
+hi Comment	guifg=SkyBlue
+hi Constant	guifg=#ffa0a0
+hi Identifier	guifg=palegreen
+hi Statement	guifg=khaki
+hi PreProc	guifg=indianred
+hi Type		guifg=darkkhaki
+hi Special	guifg=navajowhite
+"hi Underlined
+hi Ignore	guifg=grey40
+"hi Error
+hi Todo		guifg=orangered guibg=yellow2
+
+" color terminal definitions
+hi SpecialKey	ctermfg=darkgreen
+hi NonText	cterm=bold ctermfg=darkblue
+hi Directory	ctermfg=darkcyan
+hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
+hi IncSearch	cterm=NONE ctermfg=yellow ctermbg=green
+hi Search	cterm=NONE ctermfg=grey ctermbg=blue
+hi MoreMsg	ctermfg=darkgreen
+hi ModeMsg	cterm=NONE ctermfg=brown
+hi LineNr	ctermfg=3
+hi Question	ctermfg=green
+hi StatusLine	cterm=bold,reverse
+hi StatusLineNC cterm=reverse
+hi VertSplit	cterm=reverse
+hi Title	ctermfg=5
+hi Visual	cterm=reverse
+hi VisualNOS	cterm=bold,underline
+hi WarningMsg	ctermfg=1
+hi WildMenu	ctermfg=0 ctermbg=3
+hi Folded	ctermfg=darkgrey ctermbg=NONE
+hi FoldColumn	ctermfg=darkgrey ctermbg=NONE
+hi DiffAdd	ctermbg=4
+hi DiffChange	ctermbg=5
+hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
+hi DiffText	cterm=bold ctermbg=1
+hi Comment	ctermfg=darkcyan
+hi Constant	ctermfg=brown
+hi Special	ctermfg=5
+hi Identifier	ctermfg=6
+hi Statement	ctermfg=3
+hi PreProc	ctermfg=5
+hi Type		ctermfg=2
+hi Underlined	cterm=underline ctermfg=5
+hi Ignore	cterm=bold ctermfg=7
+hi Ignore	ctermfg=darkgrey
+hi Error	cterm=bold ctermfg=7 ctermbg=1
+
+
+"vim: sw=4

.vim/colors/elflord.vim

@@ -0,0 +1,50 @@
+" local syntax file - set colors on a per-machine basis:
+" vim: tw=0 ts=4 sw=4
+" Vim color file
+" Maintainer:	Ron Aaron <ron@ronware.org>
+" Last Change:	2003 May 02
+
+set background=dark
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name = "elflord"
+hi Normal		guifg=cyan			guibg=black
+hi Comment	term=bold		ctermfg=DarkCyan		guifg=#80a0ff
+hi Constant	term=underline	ctermfg=Magenta		guifg=Magenta
+hi Special	term=bold		ctermfg=DarkMagenta	guifg=Red
+hi Identifier term=underline	cterm=bold			ctermfg=Cyan guifg=#40ffff
+hi Statement term=bold		ctermfg=Yellow gui=bold	guifg=#aa4444
+hi PreProc	term=underline	ctermfg=LightBlue	guifg=#ff80ff
+hi Type	term=underline		ctermfg=LightGreen	guifg=#60ff60 gui=bold
+hi Function	term=bold		ctermfg=White guifg=White
+hi Repeat	term=underline	ctermfg=White		guifg=white
+hi Operator				ctermfg=Red			guifg=Red
+hi Ignore				ctermfg=black		guifg=bg
+hi Error	term=reverse ctermbg=Red ctermfg=White guibg=Red guifg=White
+hi Todo	term=standout ctermbg=Yellow ctermfg=Black guifg=Blue guibg=Yellow
+
+" Common groups that link to default highlighting.
+" You can specify other highlighting easily.
+hi link String	Constant
+hi link Character	Constant
+hi link Number	Constant
+hi link Boolean	Constant
+hi link Float		Number
+hi link Conditional	Repeat
+hi link Label		Statement
+hi link Keyword	Statement
+hi link Exception	Statement
+hi link Include	PreProc
+hi link Define	PreProc
+hi link Macro		PreProc
+hi link PreCondit	PreProc
+hi link StorageClass	Type
+hi link Structure	Type
+hi link Typedef	Type
+hi link Tag		Special
+hi link SpecialChar	Special
+hi link Delimiter	Special
+hi link SpecialComment Special
+hi link Debug		Special

.vim/colors/evening.vim

@@ -0,0 +1,56 @@
+" Vim color file
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2016 Oct 10
+
+" This color scheme uses a dark grey background.
+
+" First remove all existing highlighting.
+set background=dark
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+
+let colors_name = "evening"
+
+hi Normal ctermbg=DarkGrey ctermfg=White guifg=White guibg=grey20
+
+" Groups used in the 'highlight' and 'guicursor' options default value.
+hi ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White
+hi IncSearch term=reverse cterm=reverse gui=reverse
+hi ModeMsg term=bold cterm=bold gui=bold
+hi StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold
+hi StatusLineNC term=reverse cterm=reverse gui=reverse
+hi VertSplit term=reverse cterm=reverse gui=reverse
+hi Visual term=reverse ctermbg=black guibg=grey60
+hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
+hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
+hi Cursor guibg=Green guifg=Black
+hi lCursor guibg=Cyan guifg=Black
+hi Directory term=bold ctermfg=LightCyan guifg=Cyan
+hi LineNr term=underline ctermfg=Yellow guifg=Yellow
+hi MoreMsg term=bold ctermfg=LightGreen gui=bold guifg=SeaGreen
+hi NonText term=bold ctermfg=LightBlue gui=bold guifg=LightBlue guibg=grey30
+hi Question term=standout ctermfg=LightGreen gui=bold guifg=Green
+hi Search term=reverse ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
+hi SpecialKey term=bold ctermfg=LightBlue guifg=Cyan
+hi Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta
+hi WarningMsg term=standout ctermfg=LightRed guifg=Red
+hi WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
+hi Folded term=standout ctermbg=LightGrey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue
+hi FoldColumn term=standout ctermbg=LightGrey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue
+hi DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue
+hi DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta
+hi DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan
+hi CursorColumn term=reverse ctermbg=Black guibg=grey40
+hi CursorLine term=underline cterm=underline guibg=grey40
+
+" Groups for syntax highlighting
+hi Constant term=underline ctermfg=Magenta guifg=#ffa0a0
+hi Special term=bold ctermfg=LightRed guifg=Orange
+if &t_Co > 8
+  hi Statement term=bold cterm=bold ctermfg=Yellow guifg=#ffff60 gui=bold
+endif
+hi Ignore ctermfg=DarkGrey guifg=grey20
+
+" vim: sw=2

.vim/colors/industry.vim

@@ -0,0 +1,40 @@
+" Vim color file
+" Maintainer:	Shian Lee 
+" Last Change:	2014 Mar 6 (for vim 7.4)
+" Remark:	"industry" stands for 'industrial' color scheme. In industrial
+"		HMI (Human-Machine-Interface) programming, using a standard color
+"               scheme is mandatory in many cases (in traffic-lights for example): 
+"               LIGHT_RED is	    'Warning' 
+"               LIGHT_YELLOW is	    'Attention' 
+"               LIGHT_GREEN is	    'Normal' 
+"               LIGHT_MAGENTA is    'Warning-Attention' (light RED-YELLOW)
+"               LIGHT_CYAN is	    'Attention-Normal'  (light YELLOW-GREEN).
+"               BLACK is	    Dark-High-Contrast Background for maximum safety.
+"               BLUE is		    Shade of BLACK (not supposed to get attention).
+"
+"               Industrial color scheme is by nature clear, safe and productive. 
+"               Yet, depends on the file type's syntax, it might appear incorrect. 
+
+" Reset to dark background, then reset everything to defaults:
+set background=dark
+highlight clear
+if exists("syntax_on")
+    syntax reset
+endif
+
+let colors_name = "industry"
+
+" First set Normal to regular white on black text colors:
+hi Normal ctermfg=LightGray ctermbg=Black guifg=#dddddd	guibg=Black
+
+" Syntax highlighting (other color-groups using default, see :help group-name):
+hi Comment    cterm=NONE ctermfg=DarkCyan    	gui=NONE guifg=#00aaaa   	 
+hi Constant   cterm=NONE ctermfg=LightCyan   	gui=NONE guifg=#00ffff   	
+hi Identifier cterm=NONE ctermfg=LightMagenta   gui=NONE guifg=#ff00ff   
+hi Function   cterm=NONE ctermfg=LightGreen   	gui=NONE guifg=#00ff00   	
+hi Statement  cterm=NONE ctermfg=White	     	gui=bold guifg=#ffffff	     	
+hi PreProc    cterm=NONE ctermfg=Yellow		gui=NONE guifg=#ffff00 	
+hi Type	      cterm=NONE ctermfg=LightGreen	gui=bold guifg=#00ff00 		
+hi Special    cterm=NONE ctermfg=LightRed    	gui=NONE guifg=#ff0000    	
+hi Delimiter  cterm=NONE ctermfg=Yellow    	gui=NONE guifg=#ffff00    	
+

.vim/colors/koehler.vim

@@ -0,0 +1,73 @@
+" local syntax file - set colors on a per-machine basis:
+" vim: tw=0 ts=4 sw=4
+" Vim color file
+" Maintainer:	Ron Aaron <ron@ronware.org>
+" Last Change:	2016 Sep 04
+
+hi clear
+set background=dark
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name = "koehler"
+hi Normal		  guifg=white  guibg=black
+hi Scrollbar	  guifg=darkcyan guibg=cyan
+hi Menu			  guifg=black guibg=cyan
+hi SpecialKey	  term=bold  cterm=bold  ctermfg=darkred  guifg=#cc0000
+hi NonText		  term=bold  cterm=bold  ctermfg=darkred  gui=bold      guifg=#cc0000
+hi Directory	  term=bold  cterm=bold  ctermfg=brown  guifg=#cc8000
+hi ErrorMsg		  term=standout  cterm=bold  ctermfg=grey  ctermbg=red  guifg=White  guibg=Red
+hi Search		  term=reverse  ctermfg=white  ctermbg=red      guifg=white  guibg=Red
+hi MoreMsg		  term=bold  cterm=bold  ctermfg=darkgreen	gui=bold  guifg=SeaGreen
+hi ModeMsg		  term=bold  cterm=bold  gui=bold  guifg=White	guibg=Blue
+hi LineNr		  term=underline  cterm=bold  ctermfg=darkcyan	guifg=Yellow
+hi Question		  term=standout  cterm=bold  ctermfg=darkgreen	gui=bold  guifg=Green
+hi StatusLine	  term=bold,reverse  cterm=bold ctermfg=lightblue ctermbg=white gui=bold guifg=blue guibg=white
+hi StatusLineNC   term=reverse	ctermfg=white ctermbg=lightblue guifg=white guibg=blue
+hi Title		  term=bold  cterm=bold  ctermfg=darkmagenta  gui=bold	guifg=Magenta
+hi Visual		  term=reverse	cterm=reverse  gui=reverse
+hi WarningMsg	  term=standout  cterm=bold  ctermfg=darkred guifg=Red
+hi Cursor		  guifg=bg	guibg=Green
+hi Comment		  term=bold  cterm=bold ctermfg=cyan  guifg=#80a0ff
+hi Constant		  term=underline  cterm=bold ctermfg=magenta  guifg=#ffa0a0
+hi Special		  term=bold  cterm=bold ctermfg=red  guifg=Orange
+hi Identifier	  term=underline   ctermfg=brown  guifg=#40ffff
+hi Statement	  term=bold  cterm=bold ctermfg=yellow	gui=bold  guifg=#ffff60
+hi PreProc		  term=underline  ctermfg=darkmagenta   guifg=#ff80ff
+hi Type			  term=underline  cterm=bold ctermfg=lightgreen  gui=bold  guifg=#60ff60
+hi Error		  term=reverse	ctermfg=darkcyan  ctermbg=black  guifg=Red	guibg=Black
+hi Todo			  term=standout  ctermfg=black	ctermbg=darkcyan  guifg=Blue  guibg=Yellow
+hi CursorLine	  term=underline  guibg=#555555 cterm=underline
+hi CursorColumn	  term=underline  guibg=#555555 cterm=underline
+hi MatchParen	  term=reverse  ctermfg=blue guibg=Blue
+hi TabLine		  term=bold,reverse  cterm=bold ctermfg=lightblue ctermbg=white gui=bold guifg=blue guibg=white
+hi TabLineFill	  term=bold,reverse  cterm=bold ctermfg=lightblue ctermbg=white gui=bold guifg=blue guibg=white
+hi TabLineSel	  term=reverse	ctermfg=white ctermbg=lightblue guifg=white guibg=blue
+hi Underlined	  term=underline cterm=bold,underline ctermfg=lightblue guifg=lightblue gui=bold,underline
+hi Ignore		  ctermfg=black ctermbg=black guifg=black guibg=black
+hi EndOfBuffer	  term=bold  cterm=bold  ctermfg=darkred guifg=#cc0000 gui=bold
+hi link IncSearch		Visual
+hi link String			Constant
+hi link Character		Constant
+hi link Number			Constant
+hi link Boolean			Constant
+hi link Float			Number
+hi link Function		Identifier
+hi link Conditional		Statement
+hi link Repeat			Statement
+hi link Label			Statement
+hi link Operator		Statement
+hi link Keyword			Statement
+hi link Exception		Statement
+hi link Include			PreProc
+hi link Define			PreProc
+hi link Macro			PreProc
+hi link PreCondit		PreProc
+hi link StorageClass	Type
+hi link Structure		Type
+hi link Typedef			Type
+hi link Tag				Special
+hi link SpecialChar		Special
+hi link Delimiter		Special
+hi link SpecialComment	Special
+hi link Debug			Special

.vim/colors/morning.vim

@@ -0,0 +1,56 @@
+" Vim color file
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2006 Apr 15
+
+" This color scheme uses a light grey background.
+
+" First remove all existing highlighting.
+set background=light
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+
+let colors_name = "morning"
+
+hi Normal ctermfg=Black ctermbg=LightGrey guifg=Black guibg=grey90
+
+" Groups used in the 'highlight' and 'guicursor' options default value.
+hi ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White
+hi IncSearch term=reverse cterm=reverse gui=reverse
+hi ModeMsg term=bold cterm=bold gui=bold
+hi StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold
+hi StatusLineNC term=reverse cterm=reverse gui=reverse
+hi VertSplit term=reverse cterm=reverse gui=reverse
+hi Visual term=reverse ctermbg=grey guibg=grey80
+hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
+hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
+hi Cursor guibg=Green guifg=NONE
+hi lCursor guibg=Cyan guifg=NONE
+hi Directory term=bold ctermfg=DarkBlue guifg=Blue
+hi LineNr term=underline ctermfg=Brown guifg=Brown
+hi MoreMsg term=bold ctermfg=DarkGreen gui=bold guifg=SeaGreen
+hi NonText term=bold ctermfg=Blue gui=bold guifg=Blue guibg=grey80
+hi Question term=standout ctermfg=DarkGreen gui=bold guifg=SeaGreen
+hi Search term=reverse ctermbg=Yellow ctermfg=NONE guibg=Yellow guifg=NONE
+hi SpecialKey term=bold ctermfg=DarkBlue guifg=Blue
+hi Title term=bold ctermfg=DarkMagenta gui=bold guifg=Magenta
+hi WarningMsg term=standout ctermfg=DarkRed guifg=Red
+hi WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
+hi Folded term=standout ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue
+hi FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue
+hi DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue
+hi DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta
+hi DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan
+hi CursorLine term=underline cterm=underline guibg=grey80
+hi CursorColumn term=reverse ctermbg=grey guibg=grey80
+
+" Colors for syntax highlighting
+hi Constant term=underline ctermfg=DarkRed guifg=Magenta guibg=grey95
+hi Special term=bold ctermfg=DarkMagenta guifg=SlateBlue guibg=grey95
+if &t_Co > 8
+  hi Statement term=bold cterm=bold ctermfg=Brown gui=bold guifg=Brown
+endif
+hi Ignore ctermfg=LightGrey guifg=grey90
+
+" vim: sw=2

.vim/colors/murphy.vim

@@ -0,0 +1,41 @@
+" local syntax file - set colors on a per-machine basis:
+" vim: tw=0 ts=4 sw=4
+" Vim color file
+" Maintainer:	Ron Aaron <ron@ronware.org>
+" Last Change:	2003 May 02
+
+hi clear
+set background=dark
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name = "murphy"
+
+hi Normal		ctermbg=Black  ctermfg=lightgreen guibg=Black		 guifg=lightgreen
+hi Comment		term=bold	   ctermfg=LightRed   guifg=Orange
+hi Constant		term=underline ctermfg=LightGreen guifg=White	gui=NONE
+hi Identifier	term=underline ctermfg=LightCyan  guifg=#00ffff
+hi Ignore					   ctermfg=black	  guifg=bg
+hi PreProc		term=underline ctermfg=LightBlue  guifg=Wheat
+hi Search		term=reverse					  guifg=white	guibg=Blue
+hi Special		term=bold	   ctermfg=LightRed   guifg=magenta
+hi Statement	term=bold	   ctermfg=Yellow	  guifg=#ffff00 gui=NONE
+hi Type						   ctermfg=LightGreen guifg=grey	gui=none
+hi Error		term=reverse   ctermbg=Red	  ctermfg=White guibg=Red  guifg=White
+hi Todo			term=standout  ctermbg=Yellow ctermfg=Black guifg=Blue guibg=Yellow
+" From the source:
+hi Cursor										  guifg=Orchid	guibg=fg
+hi Directory	term=bold	   ctermfg=LightCyan  guifg=Cyan
+hi ErrorMsg		term=standout  ctermbg=DarkRed	  ctermfg=White guibg=Red guifg=White
+hi IncSearch	term=reverse   cterm=reverse	  gui=reverse
+hi LineNr		term=underline ctermfg=Yellow					guifg=Yellow
+hi ModeMsg		term=bold	   cterm=bold		  gui=bold
+hi MoreMsg		term=bold	   ctermfg=LightGreen gui=bold		guifg=SeaGreen
+hi NonText		term=bold	   ctermfg=Blue		  gui=bold		guifg=Blue
+hi Question		term=standout  ctermfg=LightGreen gui=bold		guifg=Cyan
+hi SpecialKey	term=bold	   ctermfg=LightBlue  guifg=Cyan
+hi StatusLine	term=reverse,bold cterm=reverse   gui=NONE		guifg=White guibg=darkblue
+hi StatusLineNC term=reverse   cterm=reverse	  gui=NONE		guifg=white guibg=#333333
+hi Title		term=bold	   ctermfg=LightMagenta gui=bold	guifg=Pink
+hi WarningMsg	term=standout  ctermfg=LightRed   guifg=Red
+hi Visual		term=reverse   cterm=reverse	  gui=NONE		guifg=white guibg=darkgreen

.vim/colors/pablo.vim

@@ -0,0 +1,26 @@
+" local syntax file - set colors on a per-machine basis:
+" vim: tw=0 ts=4 sw=4
+" Vim color file
+" Maintainer:	Ron Aaron <ron@ronware.org>
+" Last Change:	2003 May 02
+
+hi clear
+set background=dark
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name = "pablo"
+
+highlight Comment	 ctermfg=8						  guifg=#808080
+highlight Constant	 ctermfg=14			   cterm=none guifg=#00ffff				  gui=none
+highlight Identifier ctermfg=6						  guifg=#00c0c0
+highlight Statement  ctermfg=3			   cterm=bold guifg=#c0c000				  gui=bold
+highlight PreProc	 ctermfg=10						  guifg=#00ff00
+highlight Type		 ctermfg=2						  guifg=#00c000
+highlight Special	 ctermfg=12						  guifg=#0000ff
+highlight Error					ctermbg=9							guibg=#ff0000
+highlight Todo		 ctermfg=4	ctermbg=3			  guifg=#000080 guibg=#c0c000
+highlight Directory  ctermfg=2						  guifg=#00c000
+highlight StatusLine ctermfg=11 ctermbg=12 cterm=none guifg=#ffff00 guibg=#0000ff gui=none
+highlight Normal									  guifg=#ffffff guibg=#000000
+highlight Search				ctermbg=3							guibg=#c0c000

.vim/colors/peachpuff.vim

@@ -0,0 +1,60 @@
+" Vim color file
+" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2003-04-23
+" URL: http://trific.ath.cx/Ftp/vim/colors/peachpuff.vim
+
+" This color scheme uses a peachpuff background (what you've expected when it's
+" called peachpuff?).
+"
+" Note: Only GUI colors differ from default, on terminal it's just `light'.
+
+" First remove all existing highlighting.
+set background=light
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+
+let colors_name = "peachpuff"
+
+hi Normal guibg=PeachPuff guifg=Black
+
+hi SpecialKey term=bold ctermfg=4 guifg=Blue
+hi NonText term=bold cterm=bold ctermfg=4 gui=bold guifg=Blue
+hi Directory term=bold ctermfg=4 guifg=Blue
+hi ErrorMsg term=standout cterm=bold ctermfg=7 ctermbg=1 gui=bold guifg=White guibg=Red
+hi IncSearch term=reverse cterm=reverse gui=reverse
+hi Search term=reverse ctermbg=3 guibg=Gold2
+hi MoreMsg term=bold ctermfg=2 gui=bold guifg=SeaGreen
+hi ModeMsg term=bold cterm=bold gui=bold
+hi LineNr term=underline ctermfg=3 guifg=Red3
+hi Question term=standout ctermfg=2 gui=bold guifg=SeaGreen
+hi StatusLine term=bold,reverse cterm=bold,reverse gui=bold guifg=White guibg=Black
+hi StatusLineNC term=reverse cterm=reverse gui=bold guifg=PeachPuff guibg=Gray45
+hi VertSplit term=reverse cterm=reverse gui=bold guifg=White guibg=Gray45
+hi Title term=bold ctermfg=5 gui=bold guifg=DeepPink3
+hi Visual term=reverse cterm=reverse gui=reverse guifg=Grey80 guibg=fg
+hi VisualNOS term=bold,underline cterm=bold,underline gui=bold,underline
+hi WarningMsg term=standout ctermfg=1 gui=bold guifg=Red
+hi WildMenu term=standout ctermfg=0 ctermbg=3 guifg=Black guibg=Yellow
+hi Folded term=standout ctermfg=4 ctermbg=7 guifg=Black guibg=#e3c1a5
+hi FoldColumn term=standout ctermfg=4 ctermbg=7 guifg=DarkBlue guibg=Gray80
+hi DiffAdd term=bold ctermbg=4 guibg=White
+hi DiffChange term=bold ctermbg=5 guibg=#edb5cd
+hi DiffDelete term=bold cterm=bold ctermfg=4 ctermbg=6 gui=bold guifg=LightBlue guibg=#f6e8d0
+hi DiffText term=reverse cterm=bold ctermbg=1 gui=bold guibg=#ff8060
+hi Cursor guifg=bg guibg=fg
+hi lCursor guifg=bg guibg=fg
+
+" Colors for syntax highlighting
+hi Comment term=bold ctermfg=4 guifg=#406090
+hi Constant term=underline ctermfg=1 guifg=#c00058
+hi Special term=bold ctermfg=5 guifg=SlateBlue
+hi Identifier term=underline ctermfg=6 guifg=DarkCyan
+hi Statement term=bold ctermfg=3 gui=bold guifg=Brown
+hi PreProc term=underline ctermfg=5 guifg=Magenta3
+hi Type term=underline ctermfg=2 gui=bold guifg=SeaGreen
+hi Ignore cterm=bold ctermfg=7 guifg=bg
+hi Error term=reverse cterm=bold ctermfg=7 ctermbg=1 gui=bold guifg=White guibg=Red
+hi Todo term=standout ctermfg=0 ctermbg=3 guifg=Blue guibg=Yellow
+

.vim/colors/ron.vim

@@ -0,0 +1,45 @@
+" local syntax file - set colors on a per-machine basis:
+" vim: tw=0 ts=4 sw=4
+" Vim color file
+" Maintainer:	Ron Aaron <ron@ronware.org>
+" Last Change:	2013 May 24
+
+set background=dark
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name = "ron"
+hi Normal		guifg=cyan	guibg=black
+hi NonText		guifg=yellow guibg=#303030
+hi comment		guifg=green
+hi constant		guifg=cyan	gui=bold
+hi identifier	guifg=cyan	gui=NONE
+hi statement	guifg=lightblue	gui=NONE
+hi preproc		guifg=Pink2
+hi type			guifg=seagreen	gui=bold
+hi special		guifg=yellow
+hi ErrorMsg		guifg=Black	guibg=Red
+hi WarningMsg	guifg=Black	guibg=Green
+hi Error		guibg=Red
+hi Todo			guifg=Black	guibg=orange
+hi Cursor		guibg=#60a060 guifg=#00ff00
+hi Search		guibg=darkgray guifg=black gui=bold 
+hi IncSearch	gui=NONE guibg=steelblue
+hi LineNr		guifg=darkgrey
+hi title		guifg=darkgrey
+hi ShowMarksHL ctermfg=cyan ctermbg=lightblue cterm=bold guifg=yellow guibg=black  gui=bold
+hi StatusLineNC	gui=NONE guifg=lightblue guibg=darkblue
+hi StatusLine	gui=bold	guifg=cyan	guibg=blue
+hi label		guifg=gold2
+hi operator		guifg=orange
+hi clear Visual
+hi Visual		term=reverse cterm=reverse gui=reverse
+hi DiffChange   guibg=darkgreen
+hi DiffText		guibg=olivedrab
+hi DiffAdd		guibg=slateblue
+hi DiffDelete   guibg=coral
+hi Folded		guibg=gray30
+hi FoldColumn	guibg=gray30 guifg=white
+hi cIf0			guifg=gray
+hi diffOnly	guifg=red gui=bold

.vim/colors/shine.vim

@@ -0,0 +1,60 @@
+" Vim color file
+" Maintainer:	Yasuhiro Matsumoto <mattn@mail.goo.ne.jp>
+" Last Change:	2001 May 25
+
+" This look like normal text editor.
+" This color scheme uses a light background.
+
+" First remove all existing highlighting.
+set background=light
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+
+let colors_name = "shine"
+
+hi Normal ctermbg=White ctermfg=Black guifg=Black guibg=White
+
+" Groups used in the 'highlight' and 'guicursor' options default value.
+hi ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White
+hi IncSearch term=reverse cterm=reverse gui=reverse
+hi ModeMsg term=bold cterm=bold gui=bold
+hi StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold
+hi StatusLineNC term=reverse cterm=reverse gui=reverse
+hi VertSplit term=reverse cterm=reverse gui=reverse
+hi Visual term=reverse cterm=reverse gui=reverse guifg=Grey guibg=fg
+hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
+hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
+hi Cursor ctermbg=Green guibg=Green guifg=Black
+hi lCursor guibg=Cyan guifg=Black
+hi Directory term=bold ctermfg=LightRed guifg=Red
+hi LineNr term=underline ctermfg=Yellow guifg=Yellow
+hi MoreMsg term=bold ctermfg=LightGreen gui=bold guifg=SeaGreen
+hi NonText term=bold ctermfg=LightBlue gui=bold guifg=LightBlue guibg=grey90
+hi Question term=standout ctermfg=LightGreen gui=bold guifg=Green
+hi Search term=reverse ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
+hi SpecialKey term=bold ctermfg=LightBlue guifg=Blue
+hi Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta
+hi WarningMsg term=standout ctermfg=LightRed guifg=Red
+hi WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
+hi Folded term=standout ctermbg=LightGrey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue
+hi FoldColumn term=standout ctermbg=LightGrey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue
+hi DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue
+hi DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta
+hi DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan
+
+hi Comment ctermfg=DarkGrey ctermbg=White guifg=DarkGrey gui=bold
+hi SpecialChar ctermfg=DarkGrey ctermbg=White guifg=DarkGrey gui=bold
+hi StorageClass ctermfg=Red ctermbg=White guifg=Red gui=bold
+hi Number ctermfg=LightRed ctermbg=White guifg=LightRed gui=bold
+
+" Groups for syntax highlighting
+hi Constant term=underline ctermfg=Magenta guifg=#a07070 guibg=grey80
+hi Special term=bold ctermfg=LightRed guifg=DarkOrange guibg=grey80
+if &t_Co > 8
+  hi Statement term=bold cterm=bold ctermfg=DarkGreen ctermbg=White guifg=#ffff60 gui=bold
+endif
+hi Ignore ctermfg=LightGrey guifg=grey90
+
+" vim: sw=2

.vim/colors/slate.vim

@@ -0,0 +1,56 @@
+"%% SiSU Vim color file
+" Slate Maintainer: Ralph Amissah <ralph@amissah.com>
+" (originally looked at desert Hans Fugal <hans@fugal.net> http://hans.fugal.net/vim/colors/desert.vim (2003/05/06)
+:set background=dark
+:highlight clear
+if version > 580
+ hi clear
+ if exists("syntax_on")
+ syntax reset
+ endif
+endif
+let colors_name = "slate"
+:hi Normal guifg=White guibg=grey15
+:hi Cursor guibg=khaki guifg=slategrey
+:hi VertSplit guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
+:hi Folded guibg=black guifg=grey40 ctermfg=grey ctermbg=darkgrey
+:hi FoldColumn guibg=black guifg=grey20 ctermfg=4 ctermbg=7
+:hi IncSearch guifg=green guibg=black cterm=none ctermfg=yellow ctermbg=green
+:hi ModeMsg guifg=goldenrod cterm=none ctermfg=brown
+:hi MoreMsg guifg=SeaGreen ctermfg=darkgreen
+:hi NonText guifg=RoyalBlue guibg=grey15 cterm=bold ctermfg=blue
+:hi Question guifg=springgreen ctermfg=green
+:hi Search guibg=peru guifg=wheat cterm=none ctermfg=grey ctermbg=blue
+:hi SpecialKey guifg=yellowgreen ctermfg=darkgreen
+:hi StatusLine guibg=#c2bfa5 guifg=black gui=none cterm=bold,reverse
+:hi StatusLineNC guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
+:hi Title guifg=gold gui=bold cterm=bold ctermfg=yellow
+:hi Statement guifg=CornflowerBlue ctermfg=lightblue
+:hi Visual gui=none guifg=khaki guibg=olivedrab cterm=reverse
+:hi WarningMsg guifg=salmon ctermfg=1
+:hi String guifg=SkyBlue ctermfg=darkcyan
+:hi Comment term=bold ctermfg=11 guifg=grey40
+:hi Constant guifg=#ffa0a0 ctermfg=brown
+:hi Special guifg=darkkhaki ctermfg=brown
+:hi Identifier guifg=salmon ctermfg=red
+:hi Include guifg=red ctermfg=red
+:hi PreProc guifg=red guibg=white ctermfg=red
+:hi Operator guifg=Red ctermfg=Red
+:hi Define guifg=gold gui=bold ctermfg=yellow
+:hi Type guifg=CornflowerBlue ctermfg=2
+:hi Function guifg=navajowhite ctermfg=brown
+:hi Structure guifg=green ctermfg=green
+:hi LineNr guifg=grey50 ctermfg=3
+:hi Ignore guifg=grey40 cterm=bold ctermfg=7
+:hi Todo guifg=orangered guibg=yellow2
+:hi Directory ctermfg=darkcyan
+:hi ErrorMsg cterm=bold guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
+:hi VisualNOS cterm=bold,underline
+:hi WildMenu ctermfg=0 ctermbg=3
+:hi DiffAdd ctermbg=4
+:hi DiffChange ctermbg=5
+:hi DiffDelete cterm=bold ctermfg=4 ctermbg=6
+:hi DiffText cterm=bold ctermbg=1
+:hi Underlined cterm=underline ctermfg=5
+:hi Error guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
+:hi SpellErrors guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1

.vim/colors/solarized.vim

@@ -249,7 +249,8 @@ if g:solarized_termcolors == 256
     let s:base02      = "235"
     let s:base01      = "239"
     let s:base00      = "240"
-    let s:base0       = "244"
+    "let s:base0       = "244"
+    let s:base0       = "254"
     let s:base1       = "245"
     let s:base2       = "187"
     let s:base3       = "230"

.vim/colors/torte.vim

@@ -0,0 +1,50 @@
+" Vim color file
+" Maintainer:	Thorsten Maerz <info@netztorte.de>
+" Last Change:	2006 Dec 07
+" grey on black
+" optimized for TFT panels
+
+set background=dark
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+"colorscheme default
+let g:colors_name = "torte"
+
+" hardcoded colors :
+" GUI Comment : #80a0ff = Light blue
+
+" GUI
+highlight Normal     guifg=Grey80	guibg=Black
+highlight Search     guifg=Black	guibg=Red	gui=bold
+highlight Visual     guifg=#404040			gui=bold
+highlight Cursor     guifg=Black	guibg=Green	gui=bold
+highlight Special    guifg=Orange
+highlight Comment    guifg=#80a0ff
+highlight StatusLine guifg=blue		guibg=white
+highlight Statement  guifg=Yellow			gui=NONE
+highlight Type						gui=NONE
+
+" Console
+highlight Normal     ctermfg=LightGrey	ctermbg=Black
+highlight Search     ctermfg=Black	ctermbg=Red	cterm=NONE
+highlight Visual					cterm=reverse
+highlight Cursor     ctermfg=Black	ctermbg=Green	cterm=bold
+highlight Special    ctermfg=Brown
+highlight Comment    ctermfg=Blue
+highlight StatusLine ctermfg=blue	ctermbg=white
+highlight Statement  ctermfg=Yellow			cterm=NONE
+highlight Type						cterm=NONE
+
+" only for vim 5
+if has("unix")
+  if v:version<600
+    highlight Normal  ctermfg=Grey	ctermbg=Black	cterm=NONE	guifg=Grey80      guibg=Black	gui=NONE
+    highlight Search  ctermfg=Black	ctermbg=Red	cterm=bold	guifg=Black       guibg=Red	gui=bold
+    highlight Visual  ctermfg=Black	ctermbg=yellow	cterm=bold	guifg=#404040			gui=bold
+    highlight Special ctermfg=LightBlue			cterm=NONE	guifg=LightBlue			gui=NONE
+    highlight Comment ctermfg=Cyan			cterm=NONE	guifg=LightBlue			gui=NONE
+  endif
+endif
+

.vim/colors/zellner.vim

@@ -0,0 +1,54 @@
+" local syntax file - set colors on a per-machine basis:
+" vim: tw=0 ts=4 sw=4
+" Vim color file
+" Maintainer:	Ron Aaron <ron@ronware.org>
+" Last Change:	2003 May 02
+
+set background=light
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name = "zellner"
+
+hi Comment term=bold ctermfg=Red guifg=Red
+hi Normal guifg=black guibg=white
+hi Constant term=underline ctermfg=Magenta guifg=Magenta
+hi Special term=bold ctermfg=Magenta guifg=Magenta
+hi Identifier term=underline ctermfg=Blue guifg=Blue
+hi Statement term=bold ctermfg=DarkRed gui=NONE guifg=Brown
+hi PreProc term=underline ctermfg=Magenta guifg=Purple
+hi Type term=underline ctermfg=Blue gui=NONE guifg=Blue
+hi Visual term=reverse ctermfg=Yellow ctermbg=Red gui=NONE guifg=Black guibg=Yellow
+hi Search term=reverse ctermfg=Black ctermbg=Cyan gui=NONE guifg=Black guibg=Cyan
+hi Tag term=bold ctermfg=DarkGreen guifg=DarkGreen
+hi Error term=reverse ctermfg=15 ctermbg=9 guibg=Red guifg=White
+hi Todo term=standout ctermbg=Yellow ctermfg=Black guifg=Blue guibg=Yellow
+hi  StatusLine term=bold,reverse cterm=NONE ctermfg=Yellow ctermbg=DarkGray gui=NONE guifg=Yellow guibg=DarkGray
+hi! link MoreMsg Comment
+hi! link ErrorMsg Visual
+hi! link WarningMsg ErrorMsg
+hi! link Question Comment
+hi link String	Constant
+hi link Character	Constant
+hi link Number	Constant
+hi link Boolean	Constant
+hi link Float		Number
+hi link Function	Identifier
+hi link Conditional	Statement
+hi link Repeat	Statement
+hi link Label		Statement
+hi link Operator	Statement
+hi link Keyword	Statement
+hi link Exception	Statement
+hi link Include	PreProc
+hi link Define	PreProc
+hi link Macro		PreProc
+hi link PreCondit	PreProc
+hi link StorageClass	Type
+hi link Structure	Type
+hi link Typedef	Type
+hi link SpecialChar	Special
+hi link Delimiter	Special
+hi link SpecialComment Special
+hi link Debug		Special

.vimrc

@@ -62,14 +62,15 @@ endfunction
 "" Map twiddle to ~
 "vnoremap ~ y:call setreg('', TwiddleCase(@"), getregtype(''))<CR>gv""Pgv
 " Map twiddle to C-p
+" (You have to have a visual selection first!!!)
+" (This is complete black magic, no idea where this comes from)
 vnoremap <C-p> y:call setreg('', TwiddleCase(@"), getregtype(''))<CR>gv""Pgv
 
 
 
 " ----------------------------------------
 " insert new line without leaving normal mode
-" by typing, literally, backslash o or O
-" \o   \O
+" by literally typing ,o or ,O
 " (this still sucks.)
 " https://vi.stackexchange.com/a/3877
 " ----------------------------------------
@@ -120,7 +121,7 @@ set splitright
 
 " this turns on syntax highlighting
 syntax on
-"set synmaxcol=200 " don't syntax highlight past this many chars
+set synmaxcol=200 " don't syntax highlight past this many chars
 set ic
 " this highlights search items
 set hls
@@ -183,20 +184,24 @@ let g:go_fmt_command = "goimports"
 " don't move comment hashtag to the first column.
 " smartindent is unnecessary for python anyway.
 " http://stackoverflow.com/questions/2063175/vim-insert-mode-comments-go-to-start-of-line
-au! FileType python setl nosmartindent
+au! FileType python setl textwidth=0 nosmartindent
 
 " golang
 " see https://github.com/paulswanson/congo/blob/master/congo.sh
 " ------------------------
-au BufRead,BufNewFile *.go set noexpandtab
+au BufRead,BufNewFile *.go set textwidth=0 noexpandtab
 
 " Makefiles
 " ------------------------
-au BufRead,BufNewFile Makefile*,*.make,*.mk set noexpandtab
+au BufRead,BufNewFile Makefile*,*.make,*.mk set textwidth=0 noexpandtab
 
 " C++
 " ------------------------
-au BufRead,BufNewFile *.cpp,*.cxx,*.cc,*.c,*.h,*.hpp,*.hxx,*.hh set tabstop=4 shiftwidth=4 softtabstop=4 nowrap
+au BufRead,BufNewFile *.cpp,*.cxx,*.cc,*.c,*.h,*.hpp,*.hxx,*.hh set textwidth=0 tabstop=4 shiftwidth=4 softtabstop=4 nowrap
+
+" shell scripts
+" ------------------------
+au BufRead,BufNewFile *.sh set textwidth=0 noexpandtab
 
 " Snakemake files: Snakefile, .rule, .snake, .settings, .smk
 " ------------------------
@@ -216,6 +221,10 @@ function! DisableIndentY()
         set indentexpr&
 endfunction
 
+" Javascript
+" -------------------------
+au BufRead,BufNewFile *.js,*.javascript set textwidth=0 tabstop=2 shiftwidth=2 softtabstop=2 nowrap
+
 
 
 " ------------------------
@@ -234,11 +243,12 @@ set nosmartindent   " die die die
 
 " set the text width at
 " 80 or 88, whatever
-"set textwidth=80
+set textwidth=115
 " IMPORTANT -
 " above directive will auto-wrap
 " your text as you type it, and may
 " end up driving you mad.
+" Set textwidth to 0 or a different number for known (code) filetypes.
 
 " > Bugbear's documentation explains 88 vs 80:
 " > "it's like highway speed limits, we won't bother
@@ -266,6 +276,11 @@ abbreviate recomend recommend
 abbreviate slef self
 abbreviate paramters parameters
 abbreviate exmaple example
+abbreviate improt import
+abbreviate impot import
+abbreviate imrpot import
+abbreviate surpress suppress
+abbreviate supress suppress
 
 
 
@@ -363,6 +378,13 @@ endif
 "  Github Maximum Awesome
 " -----------------------
 "
+" By default, <Leader> is \
+" but that's hard to reach,
+" and no one uses , anyway
+let mapleader = ','
+" now shortcuts are as easy as
+" ,A ,B ,C
+
 " Shift+Tab should de-indent
 " Control + D is de-indent
 inoremap <S-Tab> <C-d>
@@ -374,8 +396,6 @@ set ruler                                                    " show where you ar
 set showcmd
 set smartcase                                                " case-sensitive search if any caps
 set wildignore=log/**,node_modules/**,target/**,tmp/**,*.pyc
-" keyboard shortcuts
-let mapleader = ','
 noremap <C-h> <C-w>h
 noremap <C-j> <C-w>j
 noremap <C-k> <C-w>k
@@ -458,23 +478,13 @@ set title
 " Show the (partial) command as it’s being typed
 set showcmd
 " Use relative line numbers
-if exists("&relativenumber")
-	set relativenumber
-	au BufReadPost * set relativenumber
-endif
+""" if exists("&relativenumber")
+""" 	set relativenumber
+""" 	au BufReadPost * set relativenumber
+""" endif
 " Start scrolling N lines before the horizontal window border
 set scrolloff=5
-" Strip trailing whitespace (,ss)
-function! StripWhitespace()
-	let save_cursor = getpos(".")
-	let old_query = getreg('/')
-	:%s/\s\+$//e
-	call setpos('.', save_cursor)
-	call setreg('/', old_query)
-endfunction
-noremap <leader>ss :call StripWhitespace()<CR>
-" Save a file as root (,W)
-noremap <leader>W :w !sudo tee % > /dev/null<CR>
+
 " Automatic commands
 if has("autocmd")
     " Enable file type detection
@@ -490,55 +500,88 @@ endif
 "set list
 
 
+" ---------------------------
+"  <leader> is set to , above
+"  and gives us a whole namespace
+"  of shortcuts to work with.
+"
+"  Can map things to:
+"  - custom functions
+"  - system comands
+
+" Show leader in bottom right
+set showcmd
+
+" Strip whitespace - trailing whitespace - with (,ss)
+function! StripWhitespace()
+	let save_cursor = getpos(".")
+	let old_query = getreg('/')
+	:%s/\s\+$//e
+	call setpos('.', save_cursor)
+	call setreg('/', old_query)
+endfunction
+noremap <Leader>ss :call StripWhitespace()<cr>
+
+" Strip annoying windows newline characters ^M
+function! StripWinLineBreaks()
+    let save_cursor = getpos(".")
+    let old_query = getreg('/')
+    :%s/
+//g
+    call setpos('.', save_cursor)
+    call setreg('/', old_query)
+endfunction
+noremap <Leader>sn :call StripWinLineBreaks()<cr>
+
+" Save a file as root (,W)
+noremap <Leader>W :w !sudo tee % > /dev/null<cr>
+
+
 
 
 " ----------------------------
 " colorrrzzzzz
 " ----------------------------
-set background=dark
+
+""" set background=dark
+""" 
+""" set t_Co=256
+""" 
+""" function! BgToggle()
+"""   if &background == "light"
+"""     execute ":set background=dark"
+"""   else
+"""     execute ":set background=light"
+"""   endif
+""" endfunction
 """ nnoremap <F5> :call BgToggle()<cr>
-set t_Co=256
 
-function! BgToggle()
-  if &background == "light"
-    execute ":set background=dark"
-  else
-    execute ":set background=light"
-  endif
-endfunction
-nnoremap <F5> :call BgToggle()<cr>
-
-" to install vim-colors-solarized plugin:
-" git clone git://github.com/altercation/vim-colors-solarized.git ~/.vim/bundle/vim-colors-solarized
-"
-let g:solarized_termcolors=256
-
-"" If the following line is commented out,
-"" F5/background toggle will change from
-"" dark to light. If the line is enabled,
-"" the background color will remain the same
-"" dark default terminal backgorund color.
-"let g:solarized_termtrans = 1
-"
-let g:solarized_degrade = 0
-let g:solarized_bold = 1
-let g:solarized_underline = 1
-let g:solarized_italic = 1
-let g:solarized_contrast = "normal"
-let g:solarized_visibility= "normal"
-
-" install solarized by getting the 
-" solarized color scheme in vim format
-" (solarized.vim) from here:
-"
-" https://raw.githubusercontent.com/altercation/vim-colors-solarized/master/colors/solarized.vim
-"
-" put it in ~/.vim/colors/solarized.vim
-colorscheme solarized
+
+" more color schemes:
+"colorscheme blue
+"colorscheme darkblue
+"colorscheme default
+"colorscheme delek
+"colorscheme desert " <-- old standby
+"colorscheme elflord
+"colorscheme evening
+"colorscheme industry
+"colorscheme koehler
+"colorscheme macvim
+"colorscheme morning
+"colorscheme murphy
+"colorscheme pablo
+"colorscheme peachpuff " <-- not bad
+"colorscheme ron
+"colorscheme shine
+"colorscheme slate
+"colorscheme solarized
+"colorscheme torte
 "colorscheme zellner
 
 " ------------------------
 " Move Faster
+" ------------------------
 " (these MUST go at the end)
 "
 " default shift + j (combines lines)
@@ -549,5 +592,20 @@ nnoremap <S-L> :join<CR>
 " move up and down n lines
 map <S-j> 7j
 map <S-k> 7k
-" these have to go at the end
+
+" Bubble text up/down
+" Single line:
+nmap <C-k> ddkP
+nmap <C-j> ddp
+" Multiple lines:
+vmap <C-k> xkP`[V`]
 vmap <C-j> xp`[V`]
+
+" -----------------------------
+" Jedi Autocomplete Plugin
+" -----------------------------
+"let g:jedi#auto_initialization = 0
+
+"" -----------------------
+""  Black shortcut
+"" -----------------------

README.md

@@ -2,8 +2,74 @@
 
 Repository containing dotfiles appropriate for use on Mac laptops.
 
-Step 1: Run pre bootstrap script
+# Quick Start
 
-Step 2: Run vim setup script (TODO: add pathogen installation)
+Before you begin, you should review all of the
+steps in this quick start, so that you understand
+what will happen when you run these scripts.
+Otherwise, you may lose your dotfiles!
+
+## Step 1: Pre-Bootstrap
+
+Step 1: Run pre bootstrap script:
+
+```
+./pre_bootstrap.sh
+```
+
+This script does the following:
+
+* Creates an SSH key
+* Installs scripts to the `~/scripts` directory
+* Installs vim plugins and creates the `~/.vim` directory structure
+* Changes Mac settings and defaults
+* Installs and configures python (we use [pyenv](https://github.com/pyenv/pyenv)
+  to install and manage multiple versions of Python
+  side-by-side)
+* Installs Homebrew (the Mac package manager)
+* Installs useful packages using Homebrew
+* Sets bash as the default shell (happens after
+  the Homebrew version of bash has been installed)
+
+It is recommended you review the settings that will
+be changed on your Mac (`mac_settings.sh`) and the
+software that will be installed (`brew_install.sh`)
+before you run any scripts.
+
+## Step 2: Bootstrap
+
+The bootstrap script will do a diff between your
+dotfiles and the new dotfiles, so you can see
+all the changes that you will lose (in red) and
+all of the new content (in green).
+
+If there are many changes, do the diff manually by
+running the script:
+
+    ./diff_dotfiles.sh
+
+Otherwise, run the bootstrap script, review the 
+changes, and type "y" or "yes":
+
+    ./bootstrap.sh
+
+Again, the bootstrap script will ask you for your
+confirmation before overwriting your files,
+but **you _will_ lose unsaved changes in your
+existing dotfiles**!
+
+# How Does This Repo Work?
+
+This repository contains dotfiles in the top
+level of the repository. These dotfiles are
+installed using the `bootstrap.sh` script.
+That's the main purpose of the repository.
+
+But because there are a lot of supplementary
+things to do when customizing a new or existing
+Mac, we have the `pre_boostrap.sh` script to
+perform those tasks.
+
+We recommend you open the scripts and read them
+to see what they do.
 
-Step 3: Run bootstrap script

bootstrap.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-git pull origin master;
+git pull gh main;
 
 function doIt() {
     rsync \
@@ -9,11 +9,14 @@ function doIt() {
         --exclude ".DS_Store" \
         --exclude "bootstrap.sh" \
         --exclude "brew_install.sh" \
-		--exclude "greenfield_codes.sh" \
+        --exclude "diff_dotfiles.sh" \
+        --exclude "go_install.sh" \
+        --exclude "go_setup.sh" \
         --exclude "mac_settings.sh" \
         --exclude "pre_bootstrap.sh" \
         --exclude "python_install.sh" \
         --exclude "python_setup.sh" \
+        --exclude "scripts_setup.sh" \
         --exclude "set_machine_name.sh" \
         --exclude "vim_setup.sh" \
         --exclude "README.md" \
@@ -25,6 +28,9 @@ function doIt() {
 if [ "$1" == "--force" -o "$1" == "-f" ]; then
     doIt;
 else
+    ./diff_dotfiles.sh
+    echo "The changes in RED will DISAPPEAR FOREVER FROM YOUR DOTFILES."
+    echo "The changes in GREEN will be ADDED TO YOUR DOTFILES."
     read -p "This may overwrite existing files in your home directory. Are you sure? (y/n) " -n 1;
     echo "";
     if [[ $REPLY =~ ^[Yy]$ ]]; then

brew_install.sh

@@ -19,6 +19,10 @@ brew upgrade
 # Don’t forget to add `$(brew --prefix coreutils)/libexec/gnubin` to `$PATH`.
 brew install coreutils
 
+# gettext, envsubst, and other utils
+brew install gettext
+brew link --force gettext
+
 # Install some other useful utilities like `sponge`.
 brew install moreutils
 
@@ -58,6 +62,7 @@ brew install grep
 brew install openssh
 brew install screen
 brew install tmux
+brew install most
 
 # Install openjdk
 brew cask install adoptopenjdk
@@ -119,6 +124,14 @@ brew install tree
 #brew install webkit2png
 #brew install zopfli
 
+# man pages SUUUUCK
+brew install tldr
+brew install cheat
+
+# Install go stuff
+brew install go
+brew install goenv
+
 # Remove outdated versions from the cellar.
 brew cleanup
 

diff_dotfiles.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+## The short version:
+#find . -type f -maxdepth 1 -name ".*" | xargs -t -n1 -I% diff % ~/%
+
+# The (more careful) loop version:
+for file in $(find . -type f -maxdepth 1 -name ".*"); do
+    if [[ -f ~/$file ]]; then
+        echo "------------"
+        echo "$file exists in home directory, calculating diff..."
+        $(which git) diff --no-index --exit-code ~/$file $file && echo "No differences in $file!"
+        # order is important - home file first, shows changes to be deleted in red
+    fi
+done
+

go_install.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+#
+# install go packages

go_setup.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+brew install go
+
+git clone https://github.com/syndbg/goenv.git ~/.goenv
+
+VERSION="1.11.13"
+#VERSION="1.12.9"
+
+goenv install -s $VERSION
+goenv global $VERSION

pre_bootstrap.sh

@@ -1,17 +1,24 @@
 #!/bin/sh
 
+echo "Type the email that you would like to associate with the SSH key, then press [ENTER]:"
+read SSH_EMAIL
+
 echo "About to generate SSH keys"
 sleep 2
 if [ -f "$HOME/.ssh/id_rsa" ]; then
     echo "Keys already exist"
 else
-    yes | ssh-keygen -f $HOME/.ssh/id_rsa -t rsa -N ''
+    yes | ssh-keygen -f $HOME/.ssh/id_rsa -t rsa -C "${SSH_EMAIL}" -N ''
     chmod 700 $HOME/.ssh
     touch $HOME/.ssh/authorized_keys
     chmod 600 $HOME/.ssh/authorized_keys
     echo "Done generating keys"
 fi
 
+echo "About to set up scripts directory."
+sleep 2
+./scripts_setup.sh
+
 echo "About to set up vim."
 sleep 2
 ./vim_setup.sh
@@ -22,8 +29,13 @@ sleep 2
 
 echo "About to install and set up python"
 sleep 2
-./python_install.sh
 ./python_setup.sh
+./python_install.sh
+
+#echo "About to install and set up go"
+#sleep 2
+#./go_setup.sh
+#./go_install.sh
 
 echo "About to run brew installation script"
 sleep 2

python_install.sh

@@ -1,22 +1,17 @@
 #!/bin/bash
+#
+# install python packages
 
 if [ "$(id -u)" == "0" ]; then
     echo "DO NOT RUN THIS AS ROOT" 1>&2
     exit 1;
 fi
 
-pip2 install -U --user numpy scipy pandas
-pip3 install -U --user numpy scipy pandas
+PKG="virtualenv boto3"
+PKG="$PKG numpy scipy pandas"
+PKG="$PKG matplotlib seaborn jupyter ipython"
+PKG="$PKG tornado pyzmq pygments pillow pelican"
+PKG="$PKG flake8 black yapf pep8ify"
 
-pip2 install -U --user matplotlib seaborn
-pip3 install -U --user matplotlib seaborn
-                
-pip2 install -U --user jupyter ipython
-pip3 install -U --user jupyter ipython
-                
-pip2 install -U --user tornado pyzmq pygments
-pip3 install -U --user tornado pyzmq pygments
-                
-pip2 install -U --user pygments pillow pelican
-pip3 install -U --user pygments pillow pelican
+pip3 install ${PKG}
 

python_setup.sh

@@ -1,6 +1,15 @@
 #!/bin/bash
 
-brew install python2 python3
+brew install python3
 
+rm -fr ${HOME}/.pyenv
 curl https://pyenv.run | bash
 
+PYENV_ROOT="$HOME/.pyenv"
+command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
+
+#VERSION="miniconda3-4.3.30"
+VERSION="3.9.13"
+
+pyenv install -s ${VERSION}
+pyenv global ${VERSION}

scripts/devtmux

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+if [ -z "$TMUX" ] && [ ${UID} != 0 ]
+then
+    # Adding -A and -s 'dev' means that
+    # we will try and reconnect to session
+    # named "dev" if it exists, and will
+    # only start a new "dev" session if 
+    # an existing one is not found.
+    tmux new-session -A -s 'dev' \; \
+      send-keys 'vim' C-m \; \
+      \
+      split-window -v -p 20 \; \
+      \
+      select-pane -t 1 \;
+
+    ## Example: ipython (80%) + top (20%)
+    #tmux new-session -A -s 'dev' \; \
+    #  send-keys 'ipython' C-m \; \
+    #  \
+    #  split-window -v -p 20 \; \
+    #  send-keys 'top' C-m \; \
+    #  \
+    #  select-pane -t 1 \;
+fi
+

scripts_setup.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+ln -fs ${PWD}/scripts ${HOME}/scripts

vim_setup.sh

@@ -19,3 +19,13 @@ mkdir -p \
 echo "Installing vim-go ..."
 git clone https://github.com/fatih/vim-go.git ~/.vim/bundle/vim-go || echo "Existing vim-go folder already found, skipping this step ..."
 
+echo "Installing black for vim..."
+mkdir -p \
+    ~/.vim/plugin \
+    && curl -LSso \
+    ~/.vim/plugin/black.vim \
+    https://raw.githubusercontent.com/psf/black/master/plugin/black.vim
+
+echo "Installing jedi autocomplete for vim..."
+git clone --recursive https://github.com/davidhalter/jedi-vim.git ~/.vim/bundle/jedi-vim || echo "Existing jedi-vim folder already found, skipping this step..."
+