From d6267317368c31c4292137d2b6da90df3a60a784 Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Mon, 24 Mar 2025 15:49:23 +0200
Subject: [PATCH] chore(config): fish and goenv configs

Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
---
 config/fish/config.fish  |  6 ++++++
 config/fish/exports.fish | 25 +++++++++++++++++--------
 config/goenv/goenvrc     |  3 +++
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 config/goenv/goenvrc

diff --git a/config/fish/config.fish b/config/fish/config.fish
index b95c062..19ebf0c 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -17,3 +17,9 @@ end
 
 # Added by LM Studio CLI (lms)
 set -gx PATH $PATH $HOME/.lmstudio/bin
+
+type -q rbenv; and source (rbenv init -|psub)
+type -q pyenv; and source (pyenv init -|psub)
+type -q goenv; and source (goenv init -|psub)
+type -q fnm; and source (fnm env|psub)
+
diff --git a/config/fish/exports.fish b/config/fish/exports.fish
index 2e18021..3539e53 100644
--- a/config/fish/exports.fish
+++ b/config/fish/exports.fish
@@ -23,10 +23,14 @@ fish_add_path "$XDG_BIN_HOME"
 fish_add_path "$XDG_SHARE_HOME/cargo/bin"
 
 # Set Aqua configuration
-set -q AQUA_BIN; or set -x AQUA_BIN "$XDG_DATA_HOME/aquaproj-aqua/bin"
-set -q AQUA_CONFIG; or set -x AQUA_CONFIG "$XDG_CONFIG_HOME/aqua/aqua.yaml"
+set -q AQUA_BIN; or set -gx AQUA_BIN "$XDG_DATA_HOME/aquaproj-aqua/bin"
+set -q AQUA_CONFIG; or set -gx AQUA_CONFIG "$XDG_CONFIG_HOME/aqua/aqua.yaml"
 set -gx PATH $AQUA_BIN $PATH
 
+# NPM/NVM configuration
+set -q NVM_DIR; or set -x NVM_DIR "$XDG_DATA_HOME/nvm"
+fish_add_path "$NVM_DIR/bin"
+fish_add_path "$XDG_CONFIG_HOME/nvm"
 
 # Yarn configuration
 set -q YARN_GLOBAL_FOLDER; or set -x YARN_GLOBAL_FOLDER "$XDG_DATA_HOME/yarn"
@@ -87,6 +91,14 @@ x-dc "$DOCKER_CONFIG"
 set -q DOCKER_HIDE_LEGACY_COMMANDS; or set -x DOCKER_HIDE_LEGACY_COMMANDS true
 set -q DOCKER_SCAN_SUGGEST; or set -x DOCKER_SCAN_SUGGEST false
 
+# FNM / Node.js configuration
+set -q FNM_DIR; or set -x FNM_DIR "$XDG_DATA_HOME/fnm"
+fish_add_path "$FNM_DIR"
+set -q FNM_VERSION_FILE_STRATEGY; or set -x FNM_VERSION_FILE_STRATEGY recursive
+set -q FNM_USE_ON_CD; or set -x FNM_USE_ON_CD true
+set -q FNM_COREPACK_ENABLED; or set -x FNM_COREPACK_ENABLED true
+set -q FNM_RESOLVE_ENGINES; or set -x FNM_RESOLVE_ENGINES true
+
 # fzf configuration
 set -q FZF_BASE; or set -x FZF_BASE "$XDG_CONFIG_HOME/fzf"
 set -q FZF_DEFAULT_OPTS; or set -x FZF_DEFAULT_OPTS '--height 40% --tmux bottom,40% --layout reverse --border top'
@@ -95,15 +107,12 @@ set -q FZF_DEFAULT_OPTS; or set -x FZF_DEFAULT_OPTS '--height 40% --tmux bottom,
 set -q GNUPGHOME; or set -x GNUPGHOME "$XDG_DATA_HOME/gnupg"
 
 # Go configuration
-set -q GOPATH; or set -x GOPATH "$XDG_DATA_HOME/go"
+# set -q GOPATH; or set -x GOPATH "$XDG_DATA_HOME/go"
 set -q GOBIN; or set -x GOBIN "$XDG_BIN_HOME"
 fish_add_path "$GOBIN"
 
-# NPM: Add npm packages to path
-if x-have node;
-  set -x NVM_NODE_BIN_DIR (dirname (which node))
-  fish_add_path "$NVM_NODE_BIN_DIR"
-end
+set -q GOENV_ROOT; or set -x GOENV_ROOT "$XDG_DATA_HOME/goenv"
+set -q GOENV_RC_FILE; or set -x GOENV_RC_FILE "$XDG_CONFIG_HOME/goenv/goenvrc"
 
 # 1Password configuration
 set -q OP_CACHE; or set -x OP_CACHE "$XDG_STATE_HOME/1password"
diff --git a/config/goenv/goenvrc b/config/goenv/goenvrc
new file mode 100644
index 0000000..c5d67c1
--- /dev/null
+++ b/config/goenv/goenvrc
@@ -0,0 +1,3 @@
+GOENV_PATH_ORDER=front
+GOENV_PREPEND_GOPATH=true
+GOENV_AUTO_INSTALL=true