6 files changed, 44 insertions, 35 deletions
diff --git a/fish/.config/fish/by_host/2pac.fish b/fish/.config/fish/by_host/2pac.fish
index 05454e0..71aff72 100644
--- a/fish/.config/fish/by_host/2pac.fish
+++ b/fish/.config/fish/by_host/2pac.fish
@@ -1,9 +1,9 @@
 umask u=rwx,g=rwx,o=rx
 
-set PATH /home/mitarb/simianer/bin:/home/pks/bin:/opt/java/bin:/toolbox/ruby/bin:$PATH
-set GEM_HOME /toolbox/ruby/
-set PYTHONPATH $PYTHONPATH:/toolbox/python/lib/python2.7/site-packages
-set JAVA_HOME /usr/lib/jvm/java-6-sun/ # debian systems w/ sun-java6
+set -x PATH /home/mitarb/simianer/bin:/home/pks/bin:/opt/java/bin:/toolbox/ruby/bin:$PATH
+set -x GEM_HOME /toolbox/ruby/
+set -x PYTHONPATH $PYTHONPATH:/toolbox/python/lib/python2.7/site-packages
+set -x JAVA_HOME /usr/lib/jvm/java-6-sun/ # debian systems w/ sun-java6
 
 alias tmux="tmux -f ~/.tmux.(hostname).conf"
 
diff --git a/fish/.config/fish/by_host/cluster.fish b/fish/.config/fish/by_host/cluster.fish
index 2bad630..0ba3de3 100644
--- a/fish/.config/fish/by_host/cluster.fish
+++ b/fish/.config/fish/by_host/cluster.fish
@@ -1,9 +1,9 @@
 umask u=rwx,g=rwx,o=rx
 
-set PATH /home/mitarb/simianer/bin:/home/pks/bin:/opt/java/bin:/toolbox/ruby/bin:$PATH
-set GEM_HOME /toolbox/ruby/
-set PYTHONPATH $PYTHONPATH:/toolbox/python/lib/python2.7/site-packages
-set JAVA_HOME /usr/lib/jvm/java-6-sun/ # debian systems w/ sun-java6
+set -x PATH /home/mitarb/simianer/bin:/home/pks/bin:/opt/java/bin:/toolbox/ruby/bin:$PATH
+set -x GEM_HOME /toolbox/ruby/
+set -x PYTHONPATH $PYTHONPATH:/toolbox/python/lib/python2.7/site-packages
+set -x JAVA_HOME /usr/lib/jvm/java-6-sun/ # debian systems w/ sun-java6
 
 alias tmux="tmux -f ~/.tmux.(hostname).conf"
 
diff --git a/fish/.config/fish/by_host/donna.fish b/fish/.config/fish/by_host/donna.fish
index a67e315..d3bfa91 100644
--- a/fish/.config/fish/by_host/donna.fish
+++ b/fish/.config/fish/by_host/donna.fish
@@ -1,9 +1,9 @@
 umask u=rwx,g=rwx,o=rx
 
-set PATH /home/mitarb/simianer/bin:/home/pks/bin:/opt/java/bin:/toolbox/ruby/bin:$PATH
-set GEM_HOME /toolbox/ruby/
-set PYTHONPATH $PYTHONPATH:/toolbox/python/lib/python2.7/site-packages
-set JAVA_HOME /usr/lib/jvm/java-6-sun/ # debian systems w/ sun-java6
+set -x PATH /home/mitarb/simianer/bin:/home/pks/bin:/opt/java/bin:/toolbox/ruby/bin:$PATH
+set -x GEM_HOME /toolbox/ruby/
+set -x PYTHONPATH $PYTHONPATH:/toolbox/python/lib/python2.7/site-packages
+set -x JAVA_HOME /usr/lib/jvm/java-6-sun/ # debian systems w/ sun-java6
 
 alias tmux="tmux -f ~/.tmux.(hostname).conf"
 
diff --git a/fish/.config/fish/by_host/local.fish b/fish/.config/fish/by_host/local.fish
index cb42098..78dbdab 100644
--- a/fish/.config/fish/by_host/local.fish
+++ b/fish/.config/fish/by_host/local.fish
@@ -1,13 +1,15 @@
-set PATH /usr/lib/colorgcc/bin:~/src/scripts:~/lib/node/bin:$PATH
+set -x PATH /usr/lib/colorgcc/bin ~/src/scripts ~/lib/node/bin $PATH
 
 function fish_prompt -d "Write out the prompt"
   set me (whoami)
   if [ $me = "root" ]
-    printf '(set_color red)# '
+    printf '%s%s#%s ' \
+    (set_color red) \
+    (prompt_pwd) \
+    (set_color normal)
   else
-    printf '%s@%s%s%s%s> ' \
-      $me (set_color magenta) \
-      (hostname | cut -d . -f 1) \
+    printf '%s%s>%s ' \
+      (set_color magenta) \
       (prompt_pwd) \
       (set_color normal)
   end
diff --git a/fish/.config/fish/by_host/vicious.fish b/fish/.config/fish/by_host/vicious.fish
index bd09c8d..019b346 100644
--- a/fish/.config/fish/by_host/vicious.fish
+++ b/fish/.config/fish/by_host/vicious.fish
@@ -1,9 +1,9 @@
 umask u=rwx,g=rwx,o=rx
 
-set PATH /home/mitarb/simianer/bin:/home/pks/bin:/opt/java/bin:/toolbox/ruby/bin:$PATH
-set GEM_HOME /toolbox/ruby/
-set PYTHONPATH $PYTHONPATH:/toolbox/python/lib/python2.7/site-packages
-set JAVA_HOME /usr/lib/jvm/java-6-sun/ # debian systems w/ sun-java6
+set -x PATH /home/mitarb/simianer/bin:/home/pks/bin:/opt/java/bin:/toolbox/ruby/bin:$PATH
+set -x GEM_HOME /toolbox/ruby/
+set -x PYTHONPATH $PYTHONPATH:/toolbox/python/lib/python2.7/site-packages
+set -x JAVA_HOME /usr/lib/jvm/java-6-sun/ # debian systems w/ sun-java6
 
 alias tmux="tmux -f ~/.tmux.(hostname).conf"
 
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index aded3be..945da6e 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -1,17 +1,22 @@
 umask 0077
-set -x PATH=~/bin:/home/pks/bin:~/scripts:~/lib/ruby/bin:~/lib/python/site-packages:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH
-set -x RUBYOPT=-Ku
-set -x CCACHE_PATH=/usr/bin
-set -x TEXMFHOME='~/.texmf'
-set -x EDITOR='vim -p'
-set -x LC_ALL=en_US.UTF-8
-set -x LANG=en_US.UTF-8
-set -x LANGUAGE=en_US.UTF-8
-set -x GEM_HOME=$HOME/lib/ruby/
-set -x GEM_PATH=$HOME/lib/ruby/:$GEM_PATH
-set -x PYTHONPATH=$PYTHONPATH:~/lib/python/site-packages
-set -x CFLAGS="-march=native -mtune=native"
-set -x CXXFLAGS="$CFLAGS"
+set -x PATH ~/bin /home/pks/bin ~/scripts ~/lib/ruby/bin ~/lib/python/site-packages /usr/sbin /usr/local/bin /usr/local/sbin $PATH
+set -x RUBYOPT -Ku
+set -x CCACHE_PATH /usr/bin
+set -x TEXMFHOME '~/.texmf'
+set -x EDITOR 'vim -p'
+set -x LC_ALL en_US.UTF-8
+set -x LANG en_US.UTF-8
+set -x LANGUAGE en_US.UTF-8
+set -x GEM_HOME $HOME/lib/ruby/
+set -x GEM_PATH $HOME/lib/ruby/ $GEM_PATH
+set -x PYTHONPATH $PYTHONPATH ~/lib/python/site-packages
+set -x CFLAGS "-march=native -mtune=native"
+set -x CXXFLAGS "$CFLAGS"
+set --erase fish_greeting
+
+if [ $TERM = "rxvt" ]
+  set -x TERM xterm-256color
+end
 
 set machine (hostname)
 set color white
@@ -88,7 +93,7 @@ alias npm_install='npm install -g --prefix ./lib/node'
 alias ssh_legacy='ssh -oKexAlgorithms=+diffie-hellman-group1-sha1'
 
 function demoterm
-  urxvt -fn 'xft:Tamsyn:pixelsize=18' -fg #000000 -bg #ffffff;
+  urxvt -fn 'xft:Tamsyn:pixelsize=18' -fg '#000000' -bg '#ffffff';
 end
 function watch_d
   while true; clear; ps ax | grep -P "\sD\+?\s"; sleep 5; end
@@ -117,3 +122,5 @@ function youtube
   mpv -xy 0.5 (youtube-dl -g "$args")
 end
 
+complete -x -A --no-files --command net_profile --arguments '(for i in (ls -1 ~/.net_profiles/*.conf); basename $i .conf; end)'
+