From 7c3e42202c282f70bee6244b202857cd12b4e1d1 Mon Sep 17 00:00:00 2001
From: Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>
Date: Wed, 30 Nov 2022 12:27:20 +0100
Subject: [PATCH] Fixes for macOS

---
 .config/fish/config.fish    | 7 +++++++
 .config/fish/fish_variables | 4 +++-
 .emacs                      | 4 ++++
 update.sh                   | 9 +++++----
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index c2d92e0..dfad90e 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -96,6 +96,13 @@ if test -d /usr/local/cuda
    set  PATH $PATH /usr/local/cuda/bin
 end
 
+################################################################################
+# RUST
+################################################################################
+
+if test -d $HOME/.cargo/bin
+   set PATH $PATH $HOME/.cargo/bin
+end
 
 ################################################################################
 # Colortest
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index 818a710..9b72322 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -1,6 +1,6 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
-SETUVAR __fish_initialized:3100
+SETUVAR __fish_initialized:3400
 SETUVAR fish_color_autosuggestion:969896
 SETUVAR fish_color_cancel:\x2dr
 SETUVAR fish_color_command:b294bb
@@ -30,3 +30,5 @@ SETUVAR fish_pager_color_completion:normal
 SETUVAR fish_pager_color_description:B3A06D\x1eyellow
 SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR fish_user_paths:/usr/local/opt/curl/bin
diff --git a/.emacs b/.emacs
index fe1ca57..096da78 100644
--- a/.emacs
+++ b/.emacs
@@ -223,6 +223,10 @@
 
 (use-package yaml-mode)
 
+(use-package rustic
+  :hook
+  (rustic-mode . lsp-deferred)
+  )
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; PYTHON
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/update.sh b/update.sh
index e9c3c09..f4f1493 100755
--- a/update.sh
+++ b/update.sh
@@ -89,7 +89,7 @@ files=".config/fish \
 
 
 function this_script_root_dir() {
-	dirname $(realpath ${BASH_SOURCE[0]})
+	dirname ${BASH_SOURCE[0]}
 }
 
 function run() {
@@ -223,17 +223,18 @@ function install_files() {
 
 function update_oh_my_fish() {
 	echo "--- Updating Oh My Fish"
+	FISH=$(which fish)
 	if $VERBOSE
 	then
-	   echo "[/usr/bin/fish -c 'omf install']"
+	   echo "[$FISH -c 'omf install']"
 	fi
 	if ! $DRY
 	then
 		if $VERBOSE
 		then
-			/usr/bin/fish -c 'omf install'
+			$FISH -c 'omf install'
 		else
-			/usr/bin/fish -c 'omf install' 1>/dev/null
+			$FISH -c 'omf install' 1>/dev/null
 		fi
 	fi
 }