Update fish configuration.

fish/config.fish

@@ -1,15 +1,34 @@
 # Fish configuration file
 
 set -x LC_ALL en_US.utf8
-set -x TERM xterm-256color
+set -x PYTHONIOENCODING UTF-8
+
+if test (uname) != "Darwin"
+        set -x TERM xterm-256color
+end
 
 # Aliases
-alias ls='ls --color=auto'
-alias ll='ls -l'
-alias la='ls -A'
-alias l='ls -CF'
 
-alias rm='rm -i --preserve-root'
+if test (uname) != "Darwin"
+        alias ls='ls --color=auto'
+        alias ll='ls -l'
+        alias la='ls -A'
+        alias l='ls -CF'
+
+        alias rm='rm -i --preserve-root'
+else
+        alias rm='rm -i'
+end
+
+if test (uname) = "Darwin"
+        set -xg PATH /usr/local/bin /usr/local/sbin $PATH
+        set -xg PATH /Library/Frameworks/Python.framework/Versions/3.5/bin $PATH
+        set -xg PATH /Users/mcapelle/Applications/GNAT/bin $PATH
+end
+
+if test -e {$HOME}/Dev/python/libs
+        set -xg PYTHONPATH "$HOME/Dev/python/libs:$PYTHONPATH"
+end
 
 if test -z "$MYSOFT_PATH"
 
@@ -17,7 +36,6 @@ if test -z "$MYSOFT_PATH"
 
         if test -e $MYSOFT_PATH
                 set -xg PATH $PATH $MYSOFT_PATH/bin
-        set -xg PYTHONPATH "$MYSOFT_PATH/pythonlibs:$PYTHONPATH"
 
                 # GUROBI
                 if ls $MYSOFT_PATH | grep "gurobi" > /dev/null