diff --git a/fish/config.fish b/fish/config.fish
new file mode 100644
index 0000000..c8f8218
--- /dev/null
+++ b/fish/config.fish
@@ -0,0 +1,35 @@
+# Fish configuration file
+
+alias ls='ls --color=auto'
+alias ll='ls -l'
+alias la='ls -A'
+alias l='ls -CF'
+
+alias rm='rm -i --preserve-root'
+alias gcc='gcc-5'
+alias g++='g++-5'
+alias python='python3'
+
+alias json='python -m json.tool'
+
+set GUROBI_PATH $HOME/.softwares/gurobi651/linux64
+
+set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /usr/local/lib $GUROBI_PATH/lib
+set -x PATH ~/.softwares/bin $PATH $GUROBI_PATH/bin
+
+set PYTHONPATH $PYTHONPATH $HOME/Dev/python/libs /local/lib/python3.4
+set -x PYTHONPATH $PYTHONPATH /usr/local/lib/python3.4 $GUROBI_PATH/lib/python3.4_utf32
+
+set -x DATA_FOLDER /net/cetus/data/ogsn
+set -x ACCESS_FOLDER {$DATA_FOLDER}/access
+set -x DATASETS_FOLDER {$DATA_FOLDER}/datasets
+set -x INSTANCES_FOLDER {$DATA_FOLDER}/instances
+set -x RESULTS_FOLDER {$DATA_FOLDER}/results
+
+set -x GRB_LICENSE_FILE $GUROBI_PATH/gurobi.lic
+
+umask 022
+
+
+set -x LC_ALL en_US.utf8
+set -x TERM xterm-256color
diff --git a/fish/functions/fish_greeting.fish b/fish/functions/fish_greeting.fish
new file mode 100644
index 0000000..018520b
--- /dev/null
+++ b/fish/functions/fish_greeting.fish
@@ -0,0 +1,2 @@
+function fish_greeting
+end
diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish
new file mode 100644
index 0000000..9c5e563
--- /dev/null
+++ b/fish/functions/fish_prompt.fish
@@ -0,0 +1,78 @@
+function fish_prompt --description 'Write out the prompt'
+
+    set -l last_status $status
+
+    # Just calculate these once, to save a few cycles when displaying the prompt
+    if not set -q __fish_prompt_hostname
+        set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
+    end
+
+    if not set -q __fish_prompt_normal
+        set -g __fish_prompt_normal (set_color normal)
+    end
+
+    if not set -q -g __fish_classic_git_functions_defined
+        set -g __fish_classic_git_functions_defined
+
+        function __fish_repaint_user --on-variable fish_color_user --description "Event handler, repaint when fish_color_user changes"
+            if status --is-interactive
+                set -e __fish_prompt_user
+                commandline -f repaint ^/dev/null
+            end
+        end
+
+        function __fish_repaint_host --on-variable fish_color_host --description "Event handler, repaint when fish_color_host changes"
+            if status --is-interactive
+                set -e __fish_prompt_host
+                commandline -f repaint ^/dev/null
+            end
+        end
+
+        function __fish_repaint_status --on-variable fish_color_status --description "Event handler; repaint when fish_color_status changes"
+            if status --is-interactive
+                set -e __fish_prompt_status
+                commandline -f repaint ^/dev/null
+            end
+        end
+    end
+
+    set -l delim '>'
+
+    switch $USER
+
+    case root
+
+        if not set -q __fish_prompt_cwd
+            if set -q fish_color_cwd_root
+                set -g __fish_prompt_cwd (set_color $fish_color_cwd_root)
+            else
+                set -g __fish_prompt_cwd (set_color $fish_color_cwd)
+            end
+        end
+
+    case '*'
+
+        if not set -q __fish_prompt_cwd
+            set -g __fish_prompt_cwd (set_color $fish_color_cwd)
+        end
+
+    end
+
+    set -l prompt_status
+    if test $last_status -ne 0
+        if not set -q __fish_prompt_status
+            set -g __fish_prompt_status (set_color $fish_color_status)
+        end
+        set prompt_status "$__fish_prompt_status [$last_status]$__fish_prompt_normal"
+    end
+
+    if not set -q __fish_prompt_user
+        set -g __fish_prompt_user (set_color $fish_color_user)
+    end
+    if not set -q __fish_prompt_host
+        set -g __fish_prompt_host (set_color $fish_color_host)
+    end
+
+    echo -n -s "$__fish_prompt_user" "$USER" "$__fish_prompt_normal" "$__fish_prompt_host" @ "$__fish_prompt_hostname" "$__fish_prompt_normal" ' ' "$__fish_prompt_cwd" (prompt_pwd) (__fish_git_prompt) "$__fish_prompt_normal" "$prompt_status" "$delim" ' '
+
+end