From 2bff5edc9eaca220283604a22f6249bde4bb132a Mon Sep 17 00:00:00 2001
From: afonso <afonso@francof.net>
Date: Thu, 18 Apr 2024 01:22:27 +0100
Subject: [PATCH] [zsh] fix java and some other stuff

---
 .config/zsh/main.zsh | 14 +-------------
 .zshenv              | 15 ---------------
 .zshrc               | 24 ++++++++++++++++++------
 3 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/.config/zsh/main.zsh b/.config/zsh/main.zsh
index b1e457a..561d50b 100644
--- a/.config/zsh/main.zsh
+++ b/.config/zsh/main.zsh
@@ -15,22 +15,10 @@ setopt HIST_VERIFY
 export EDITOR=nvim
 export READER=mupdf
 
-
-
-#if [ "$(arch)" = "arm64" ]; then
-eval "$(/opt/homebrew/bin/brew shellenv)"
-#else
-#    eval "$(/usr/local/bin/brew shellenv)"
-#fi
-
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-
-# bun
-export BUN_INSTALL="$HOME/.bun"
-export PATH="$BUN_INSTALL/bin:$PATH"
 enable-fzf-tab
 
 # opam configuration
 source $HOME/.opam/opam-init/init.zsh > /dev/null 2>&1 || true
 
 eval "$(direnv hook zsh)"
+eval "$(/opt/homebrew/bin/brew shellenv)"
diff --git a/.zshenv b/.zshenv
index c582aef..a127c7e 100644
--- a/.zshenv
+++ b/.zshenv
@@ -4,19 +4,4 @@ TRAPUSR1() {
         exec "${SHELL}"
     fi
 }
-
-# Add paths
-export PATH="$HOME/.local/share/nvim/mason/bin:$PATH"
-export PATH="/Users/afonso/.local/bin:$PATH"
-export PATH="/opt/homebrew/bin:$PATH"
-export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
-export PATH="$HOME/go/bin:$PATH"
-export PATH="$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin:$PATH"
-export PATH="$HOME/.cargo/bin:$PATH"
-export PATH="$HOME/.ghcup/bin:$PATH"
-export DYLD_LIBRARY_PATH="/opt/homebrew/lib:$DYLD_LIBRARY_PATH"
 export JAVA_HOME="/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home"
-export PATH="$HOME/.miniforge3/bin:$PATH"
-export PATH="/opt/homebrew/opt/texlive/bin/:$PATH"
-eval "$(/opt/homebrew/bin/brew shellenv)"
-
diff --git a/.zshrc b/.zshrc
index 1dd4c5d..bc6466b 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,5 +1,17 @@
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
+# Add paths
+export PATH="/usr/sbin:/sbin:$PATH"
+export PATH="$HOME/.local/share/nvim/mason/bin:$PATH"
+export PATH="/Users/afonso/.local/bin:$PATH"
+export PATH="/opt/homebrew/bin:$PATH"
+export PATH="$HOME/go/bin:$PATH"
+export PATH="$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin:$PATH"
+export PATH="$HOME/.cargo/bin:$PATH"
+export PATH="$HOME/.ghcup/bin:$PATH"
+export PATH="$HOME/.miniforge3/bin:$PATH"
+export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
+
+export GOPATH=$HOME/.go
+export PATH=$PATH:$GOPATH/bin
 
 # Path to your oh-my-zsh installation.
 export ZSH="$HOME/.oh-my-zsh"
@@ -76,6 +88,7 @@ ZSH_CUSTOM=/Users/afonso/.config/zsh
 source $HOME/.config/zsh/themes/gruvbox_dark.zsh
 source $HOME/.config/zsh/overrides.zsh
 
+zvm_after_init_commands+=('[ -f $HOME/.fzf.zsh ] && source $HOME/.fzf.zsh')
 plugins=(zsh-vi-mode git sudo macos tmux command-not-found web-search zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting fzf-tab)
 
 
@@ -129,11 +142,10 @@ else
     else
         export PATH="/Users/afonso/.miniforge3/bin:$PATH"
     fi
+    if [ -f "/Users/afonso/.miniforge3/etc/profile.d/mamba.sh" ]; then
+        . "/Users/afonso/.miniforge3/etc/profile.d/mamba.sh"
+    fi
 fi
 unset __conda_setup
-
-if [ -f "/Users/afonso/.miniforge3/etc/profile.d/mamba.sh" ]; then
-    . "/Users/afonso/.miniforge3/etc/profile.d/mamba.sh"
-fi
 # <<< conda initialize <<<