From 5279bfa91ca9c591ceec9b210cb6dc2fde98c0af Mon Sep 17 00:00:00 2001
From: Mikael Capelle <capelle.mikael@gmail.com>
Date: Wed, 20 Dec 2017 11:02:56 +0100
Subject: [PATCH] Update fish configuration.

---
 fish/config.fish | 54 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/fish/config.fish b/fish/config.fish
index 3e2835a..bca1783 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,33 +1,51 @@
 # 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"
 
-    set -xg MYSOFT_PATH {$HOME}/.softwares
+        set -xg MYSOFT_PATH {$HOME}/.softwares
 
-    if test -e $MYSOFT_PATH
-        set -xg PATH $PATH $MYSOFT_PATH/bin
-        set -xg PYTHONPATH "$MYSOFT_PATH/pythonlibs:$PYTHONPATH"
+        if test -e $MYSOFT_PATH
+                set -xg PATH $PATH $MYSOFT_PATH/bin
 
-        # GUROBI
-        if ls $MYSOFT_PATH | grep "gurobi" > /dev/null
-            set -xg GUROBI_PATH (ls -d $MYSOFT_PATH/gurobi*/linux64 | tail -1)
-            set -xg LD_LIBRARY_PATH "$LD_LIBRARY_PATH:$GUROBI_PATH/lib"
-            set -xg GRB_LICENSE_FILE $GUROBI_PATH/gurobi.lic
-            set -xg PATH $GUROBI_PATH/bin $PATH
-            #set -x PYTHONPATH $GUROBI_PATH/lib/python3.4_utf32:$PYTHONPATH
+                # GUROBI
+                if ls $MYSOFT_PATH | grep "gurobi" > /dev/null
+                        set -xg GUROBI_PATH (ls -d $MYSOFT_PATH/gurobi*/linux64 | tail -1)
+                        set -xg LD_LIBRARY_PATH "$LD_LIBRARY_PATH:$GUROBI_PATH/lib"
+                        set -xg GRB_LICENSE_FILE $GUROBI_PATH/gurobi.lic
+                        set -xg PATH $GUROBI_PATH/bin $PATH
+                        #set -x PYTHONPATH $GUROBI_PATH/lib/python3.4_utf32:$PYTHONPATH
+                end
         end
-    end
 
 end