diff --git a/dot_bashrc b/dot_bashrc index 8389601..b691a20 100644 --- a/dot_bashrc +++ b/dot_bashrc @@ -10,6 +10,20 @@ case ":$PATH:" in *":$HOME/.local/bin:"*) ;; *) PATH="$HOME/.local/bin:$PATH" ;; [ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env" [ -d "$HOME/.maestro/bin" ] && PATH="$PATH:$HOME/.maestro/bin" +# Go — GOPATH/GOBIN under ~/.local/share to keep $HOME clean. +# GOROOT is provided by mise (toolchain lives under ~/.local/share/mise). +export GOPATH="$HOME/.local/share/go" +export GOBIN="$GOPATH/bin" +case ":$PATH:" in *":$GOBIN:"*) ;; *) PATH="$GOBIN:$PATH" ;; esac + +# Android SDK — relocated under ~/.local/share/android. +export ANDROID_HOME="$HOME/.local/share/android" +export ANDROID_SDK_ROOT="$ANDROID_HOME" +for _adir in "$ANDROID_HOME/platform-tools" "$ANDROID_HOME/cmdline-tools/latest/bin" "$ANDROID_HOME/emulator"; do + case ":$PATH:" in *":$_adir:"*) ;; *) [ -d "$_adir" ] && PATH="$PATH:$_adir" ;; esac +done +unset _adir + # Shared aliases (same set as fish/zsh; source of truth: .chezmoidata/aliases.yaml) [ -f "$HOME/.config/shell/aliases.sh" ] && . "$HOME/.config/shell/aliases.sh" diff --git a/dot_config/fish/conf.d/00-path.fish b/dot_config/fish/conf.d/00-path.fish index 148bd33..1540202 100644 --- a/dot_config/fish/conf.d/00-path.fish +++ b/dot_config/fish/conf.d/00-path.fish @@ -1,11 +1,16 @@ # PATH — runs for every shell (scripts need these too). # ~/.local/bin and ~/.cargo/bin are handled by inir-path.fish / rustup.fish. fish_add_path $HOME/.bun/bin -fish_add_path $HOME/go/bin +fish_add_path $HOME/.local/share/go/bin fish_add_path $HOME/.maestro/bin fish_add_path $HOME/.grok/bin fish_add_path $HOME/.opencode/bin fish_add_path -a $HOME/.foundry/bin + +# Android SDK (relocated under ~/.local/share/android) +fish_add_path -a $HOME/.local/share/android/platform-tools +fish_add_path -a $HOME/.local/share/android/cmdline-tools/latest/bin +fish_add_path -a $HOME/.local/share/android/emulator fish_add_path -a $HOME/local/share/pnpm # pnpm diff --git a/dot_config/fish/conf.d/10-env.fish b/dot_config/fish/conf.d/10-env.fish index 631219e..3e52508 100644 --- a/dot_config/fish/conf.d/10-env.fish +++ b/dot_config/fish/conf.d/10-env.fish @@ -15,6 +15,14 @@ set -gx HIP_VISIBLE_DEVICES 0 set -gx GHQ_ROOT $HOME/Code set -gx CODE_ROOT $HOME/Code +# Go env (GOPATH/GOBIN) is pinned in ~/.config/mise/config.toml [env] because +# mise's fish hook re-applies env each prompt and would clobber a shell-set +# GOBIN. GOROOT is provided by mise (toolchain under ~/.local/share/mise). + +# Android SDK — relocated under ~/.local/share/android. +set -gx ANDROID_HOME $HOME/.local/share/android +set -gx ANDROID_SDK_ROOT $ANDROID_HOME + # Git hosts (non-secret; tokens are in secrets.fish) set -gx GITEA_LOGIN code.sonr.org set -gx GITLAB_HOST git.sonr.org diff --git a/dot_config/kitty/herdr.conf b/dot_config/kitty/herdr.conf index ed2e16f..c34cc88 100644 --- a/dot_config/kitty/herdr.conf +++ b/dot_config/kitty/herdr.conf @@ -5,7 +5,6 @@ # prefix byte is the shift variant (\x02N == prefix+shift+n). # ── base / appearance ── -font_size 13.5 font_family VictorMono Nerd Font bold_italic_font auto window_padding_width 8 @@ -39,7 +38,7 @@ map ctrl+0 change_font_size current 0 map ctrl+shift+alt+, load_config_file # ── herdr sync: ctrl+shift chords → prefix (\x02 = ctrl+b) bytes ── -map super+enter send_text all \x02N +map ctrl+shift+n send_text all \x02N map super+n send_text all \x02G map super+t send_text all \x02c map ctrl+shift+t send_text all \x02c @@ -51,7 +50,6 @@ map ctrl+shift+f send_text all \x02K map ctrl+shift+g send_text all \x02L map ctrl+shift+e send_text all \x02e map ctrl+shift+o send_text all \x02o -map ctrl+shift+n send_text all \x02G map ctrl+shift+h send_text all \x02p map ctrl+shift+l send_text all \x02n map ctrl+shift+j send_text all \x02j diff --git a/dot_config/kitty/tmux.conf b/dot_config/kitty/tmux.conf index c241c86..67e27b1 100644 --- a/dot_config/kitty/tmux.conf +++ b/dot_config/kitty/tmux.conf @@ -7,7 +7,6 @@ # Launched from the default config with ctrl+shift+t. # ── base / appearance (kitty.conf parity) ── -font_size 11.5 font_family VictorMono Nerd Font bold_italic_font auto window_padding_width 8 diff --git a/dot_config/mise/config.toml b/dot_config/mise/config.toml deleted file mode 100644 index 16e14bf..0000000 --- a/dot_config/mise/config.toml +++ /dev/null @@ -1,13 +0,0 @@ -[tools] -biome = "latest" -bun = "latest" -claude = "latest" -codex = "latest" -crush = "latest" -gh = "latest" -ghq = "latest" -"github:can1357/oh-my-pi" = "latest" -go = "latest" -node = "latest" -pi = "latest" -uv = "latest" diff --git a/dot_zshrc b/dot_zshrc index ac01f07..a46e3ac 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -14,6 +14,20 @@ case ":$PATH:" in *":$HOME/.local/bin:"*) ;; *) PATH="$HOME/.local/bin:$PATH" ;; [ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env" [ -d "$HOME/.maestro/bin" ] && PATH="$PATH:$HOME/.maestro/bin" +# Go — GOPATH/GOBIN under ~/.local/share to keep $HOME clean. +# GOROOT is provided by mise (toolchain lives under ~/.local/share/mise). +export GOPATH="$HOME/.local/share/go" +export GOBIN="$GOPATH/bin" +case ":$PATH:" in *":$GOBIN:"*) ;; *) PATH="$GOBIN:$PATH" ;; esac + +# Android SDK — relocated under ~/.local/share/android. +export ANDROID_HOME="$HOME/.local/share/android" +export ANDROID_SDK_ROOT="$ANDROID_HOME" +for _adir in "$ANDROID_HOME/platform-tools" "$ANDROID_HOME/cmdline-tools/latest/bin" "$ANDROID_HOME/emulator"; do + case ":$PATH:" in *":$_adir:"*) ;; *) [ -d "$_adir" ] && PATH="$PATH:$_adir" ;; esac +done +unset _adir + # Shared aliases (same set as fish/bash; source of truth: .chezmoidata/aliases.yaml) [ -f "$HOME/.config/shell/aliases.sh" ] && . "$HOME/.config/shell/aliases.sh"