From 2dc08e5e513c0d44c0bdebcee52cb4fd3a8038c4 Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Fri, 9 Aug 2024 19:31:25 +0300
Subject: [PATCH] chore(shell): cleanup zshenv and zshrc

---
 base/zshenv |  6 ------
 base/zshrc  | 24 ++++++++----------------
 2 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 base/zshenv

diff --git a/base/zshenv b/base/zshenv
deleted file mode 100644
index 67bf6ee..0000000
--- a/base/zshenv
+++ /dev/null
@@ -1,6 +0,0 @@
-# shellcheck shell=bash
-# vim: filetype=zsh
-
-export DOTFILES="$HOME/.dotfiles"
-export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$PATH"
-export SHARED_SCRIPTS_SOURCED=0
diff --git a/base/zshrc b/base/zshrc
index 1e9fdf0..b787b08 100755
--- a/base/zshrc
+++ b/base/zshrc
@@ -5,16 +5,11 @@
 # export DEBUG=1
 
 export DOTFILES="$HOME/.dotfiles"
+export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$HOME/.local/share/bob/nvim-bin:$HOME/.local/share/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
+export SHARED_SCRIPTS_SOURCED=0
 
 source "$DOTFILES/config/shared.sh"
 
-x-path-prepend "/usr/local/bin"
-x-path-prepend "/opt/homebrew/bin"
-x-path-prepend "$HOME/.local/share/cargo/bin"
-x-path-prepend "$HOME/.local/share/bob/nvim-bin"
-x-path-prepend "$HOME/.local/bin"
-x-path-prepend "$DOTFILES/local/bin"
-
 eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")"
 
 # Load asdf
@@ -43,19 +38,23 @@ load_antigen()
     export ZSH_TMUX_AUTOQUIT=false
     export ZSH_TMUX_DEFAULT_SESSION_NAME=main
 
+    zstyle :omz:plugins:ssh-agent quiet yes
+    zstyle :omz:plugins:ssh-agent lazy yes
+
     # z, the zsh version
     export ZSHZ_DATA="$XDG_STATE_HOME/z"
     antigen bundle z
 
+    x-have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
+
     # these should be always available
     antigen bundle brew
     antigen bundle tmux
     antigen bundle colored-man-pages
-    antigen bundle ssh-agent
+    # antigen bundle ssh-agent
     antigen bundle jreese/zsh-titles
     antigen bundle zsh-users/zsh-completions
 
-    x-have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
 
     # this needs to be the last item
     antigen bundle zsh-users/zsh-syntax-highlighting
@@ -125,10 +124,3 @@ main()
 
 main "$@"
 
-# Herd checks for a few environment variables to inject PHP binaries and configurations.
-# Herd injected PHP binary.
-# export PATH="/Users/ivuorinen/Library/Application\ Support/Herd/bin/":$PATH
-# Herd injected PHP 8.3 configuration.
-# export HERD_PHP_83_INI_SCAN_DIR="/Users/ivuorinen/Library/Application\ Support/Herd/config/php/83/"
-# Herd injected PHP 7.4 configuration.
-# export HERD_PHP_74_INI_SCAN_DIR="/Users/ivuorinen/Library/Application\ Support/Herd/config/php/74/"