From 30a0e4f974b6ed14c62e3c0274c7c79f14d61804 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Mon, 23 Jun 2025 19:14:47 -0400 Subject: [PATCH] fixes --- .config/zsh/asdf.zsh | 36 ++++++++++++++++++++++++++++++++++++ .zshrc | 9 ++++++--- 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 .config/zsh/asdf.zsh diff --git a/.config/zsh/asdf.zsh b/.config/zsh/asdf.zsh new file mode 100644 index 0000000..234c101 --- /dev/null +++ b/.config/zsh/asdf.zsh @@ -0,0 +1,36 @@ +export ASDF_NODEJS_LEGACY_FILE_DYNAMIC_STRATEGY=latest_installed +export ASDF_GOLANG_MOD_VERSION_ENABLED=true +export KERL_BUILD_DOCS="yes" +export KERL_CONFIGURE_OPTIONS="--without-javac --without-wx --without-odbc --enable-threads --enable-kernel-poll --enable-webview --enable-gettimeofday-as-os-system-time" + +asdf-up() { + plugin=$1 + cur_version=`asdf current ${plugin} | tr -s ' ' | cut -d ' ' -f 2` + echo Updating plugin: $plugin version: $cur_version + asdf uninstall ${plugin} ${cur_version} && asdf install ${plugin} ${cur_version} +} + +export KERL_CONFIGURE_OPTIONS="$KERL_CONFIGURE_OPTIONS --enable-darwin-64bit" + +# export CXXFLAGS="-ffat-lto-objects" +# export CFLAGS="-O2 -ffat-lto-objects" +export CFLAGS="" +export LDFLAGS="" + +if which brew > /dev/null; then + blah=`brew --prefix openssl > /dev/null` + if [ $? -eq 0 ]; then + export CFLAGS="$CFLAGS -I$(brew --prefix openssl)/include" + export LDFLAGS="$LDFLAGS -L$(brew --prefix openssl)/lib" + fi +fi + +# uv +export PATH="$HOME/.local/bin:$PATH" + +# Stuff for building erlang on Apple ARM +# if [ -d "/opt/homebrew/opt/openssl@1.1/lib" ]; then +# export LDFLAGS="-L/opt/homebrew/opt/openssl@1.1/lib" +# export CPPFLAGS="-I/opt/homebrew/opt/openssl@1.1/include" +# export KERL_CONFIGURE_OPTIONS="--disable-debug --disable-silent-rules --without-javac --enable-shared-zlib --enable-dynamic-ssl-lib --enable-threads --enable-kernel-poll --enable-wx --enable-webview --enable-darwin-64bit --enable-gettimeofday-as-os-system-time --with-ssl=$(brew --prefix openssl@1.1)" KERL_BUILD_DOCS="yes" +# fi diff --git a/.zshrc b/.zshrc index cd785b2..1e9892c 100644 --- a/.zshrc +++ b/.zshrc @@ -24,10 +24,10 @@ zinit ice wait lucid atload'_zsh_autosuggest_start' zinit light zsh-users/zsh-autosuggestions zinit ice wait lucid blockf -zinit light asdf-vm/asdf +zinit light wintermi/zsh-brew zinit ice wait lucid blockf -zinit light wintermi/zsh-brew +zinit snippet OMZP::asdf/asdf.plugin.zsh zinit ice wait lucid blockf zinit light atuinsh/atuin @@ -41,7 +41,6 @@ zinit light ajeetdsouza/zoxide zinit ice wait lucid blockf zinit light Aloxaf/fzf-tab - # direnv — from GitHub releases zinit from"gh-r" as"program" mv"direnv* -> direnv" \ atclone'./direnv hook zsh > zhook.zsh' atpull'%atclone' \ @@ -58,6 +57,9 @@ zi for \ lucid \ zsh-users/zsh-completions +# uv +export PATH="$HOME/.local/bin:$PATH" + # 9. Load all custom configs from $ZSH_CUSTOM for config_file ("$ZSH_CUSTOM"/*.zsh(N)); do source "$config_file" @@ -68,3 +70,4 @@ unset config_file function timezsh() { for i in {1..5}; do /usr/bin/time -p zsh -i -c exit; done } +### End of Zinit's installer chunk