diff --git a/fish/files/conf.d/fnm.fish b/fish/files/conf.d/fnm.fish
new file mode 100644
index 0000000..dab58c6
--- /dev/null
+++ b/fish/files/conf.d/fnm.fish
@@ -0,0 +1 @@
+fnm env --use-on-cd --shell fish | source
diff --git a/fish/files/config.fish b/fish/files/config.fish
index 147d599..ea48e05 100644
--- a/fish/files/config.fish
+++ b/fish/files/config.fish
@@ -154,4 +154,15 @@ set --export PATH $BUN_INSTALL/bin $PATH
 # opencode
 fish_add_path /home/thomasgl/.opencode/bin
 
-test -f ~/.safe-chain/scripts/init-fish.fish; and source ~/.safe-chain/scripts/init-fish.fish # Safe-chain Fish initialization script
+if test (uname) = Darwin
+	if test -f ~/.safe-chain/scripts/init-fish.fish
+	 source ~/.safe-chain/scripts/init-fish.fish
+	end
+
+# Google Cloud SDK
+	if test -f /Users/thomasglopes/google-cloud-sdk/path.fish.inc
+	 source /Users/thomasglopes/google-cloud-sdk/path.fish.inc
+	end
+
+	set -gx PATH /Users/thomasglopes/.local/bin /Users/thomasglopes/google-cloud-sdk/bin $PATH
+end