ec4852a72664

--- a/bin/mvim	Tue Jul 24 00:29:44 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-PATH=~/.vim/bullshit:$PATH $MVIM_BINARY "$@"

--- a/bin/vim	Tue Jul 24 00:29:44 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-PYTHONPATH="" PATH=~/.vim/bullshit:$PATH exec $VIM_BINARY "$@"

--- a/fish/config.fish	Tue Jul 24 00:29:44 2018 +0000
+++ b/fish/config.fish	Tue Jul 24 00:34:14 2018 +0000
@@ -73,7 +73,6 @@
 prepend_to_path "/usr/bin"
 prepend_to_path "/usr/local/bin"
 prepend_to_path "/usr/local/sbin"
-prepend_to_path "/usr/local/MacGPG2/bin"
 prepend_to_path "$HOME/src/dotfiles/roswell"
 prepend_to_path "$HOME/src/dotfiles/bin"
 prepend_to_path "$HOME/src/hg"
@@ -85,63 +84,22 @@
 set -g -x EDITOR nvim
 set -g -x COMMAND_MODE unix2003
 set -g -x RUBYOPT rubygems
-set -g -x CLASSPATH "$CLASSPATH:/usr/local/Cellar/clojure-contrib/1.2.0/clojure-contrib.jar"
-
 set -g -x PAGER 'less -X'
-
-set -g -x NODE_PATH "/usr/local/lib/node_modules"
-
-set -g -x VIM_BINARY "/usr/local/bin/vim"
-set -g -x MVIM_BINARY "/usr/local/bin/mvim"
-
-set -g -x DRIP_SHUTDOWN 30
-
 set -g -x MAVEN_OPTS "-Xmx2048m -Xss2M -XX:ReservedCodeCacheSize=128m"
 # set -g -x _JAVA_OPTIONS "-Djava.awt.headless=true"
 
 set -g -x GPG_TTY (tty)
 
-set -g -x FZF_DEFAULT_COMMAND 'ffind'
-set -g -x FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND"
-
-function headed_java -d "Put Java into headed mode"
-    echo "Changing _JAVA_OPTIONS"
-    echo "from: $_JAVA_OPTIONS"
-    set -g -e _JAVA_OPTIONS
-    echo "  to: $_JAVA_OPTIONS"
-end
-function headless_java -d "Put Java into headless mode"
-    echo "Changing _JAVA_OPTIONS"
-    echo "from: $_JAVA_OPTIONS"
-    set -g -x _JAVA_OPTIONS "-Djava.awt.headless=true"
-    echo "  to: $_JAVA_OPTIONS"
-end
-
-
-
 # }}}
-# Python variables {{{
+# Python {{{
 
 set -g -x PIP_DOWNLOAD_CACHE "$HOME/.pip/cache"
 set -g -x WORKON_HOME "$HOME/lib/virtualenvs"
-
-prepend_to_path "/usr/local/share/python"
-prepend_to_path "/usr/local/Cellar/PyPi/3.6/bin"
-prepend_to_path "/usr/local/Cellar/python/2.7.1/bin"
-prepend_to_path "/usr/local/Cellar/python/2.7/bin"
-prepend_to_path "/usr/local/Cellar/python/2.6.5/bin"
+# eval (/usr/bin/python -m virtualfish)
 
 set -g -x PYTHONPATH ""
-# set PYTHONPATH "$PYTHONPATH:/usr/local/lib/python2.7.1/site-packages"
-# set PYTHONPATH "$PYTHONPATH:/usr/local/lib/python2.7/site-packages"
-# set PYTHONPATH "$PYTHONPATH:/usr/local/lib/python2.6/site-packages"
-# set PYTHONPATH "$HOME/lib/python/see:$PYTHONPATH"
 set PYTHONPATH "$HOME/lib/hg/hg:$PYTHONPATH"
 
-set -gx WORKON_HOME "$HOME/lib/virtualenvs"
-# eval (/usr/bin/python -m virtualfish)
-
-
 # }}}
 # Z {{{
 
@@ -226,9 +184,10 @@
 end
 
 # }}}
-
+# Local {{{
 if test -f $HOME/.local.fish
     . $HOME/.local.fish
 end
+# }}}
 
 true

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fish/functions/headed_java.fish	Tue Jul 24 00:34:14 2018 +0000
@@ -0,0 +1,6 @@
+function headed_java -d "Put Java into headed mode"
+    echo "Changing _JAVA_OPTIONS"
+    echo "from: $_JAVA_OPTIONS"
+    set -g -e _JAVA_OPTIONS
+    echo "  to: $_JAVA_OPTIONS"
+end

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fish/functions/headless_java.fish	Tue Jul 24 00:34:14 2018 +0000
@@ -0,0 +1,6 @@
+function headless_java -d "Put Java into headless mode"
+    echo "Changing _JAVA_OPTIONS"
+    echo "from: $_JAVA_OPTIONS"
+    set -g -x _JAVA_OPTIONS "-Djava.awt.headless=true"
+    echo "  to: $_JAVA_OPTIONS"
+end