Commit 6794cb6

Ansari <ping@ansari.wtf>
2025-12-22 18:26:23
refactor .zshrc to source new files and fixed ssh auth
main
1 parent 0e415f5
Changed files (5)
.config
hypr
modules
vars.conf
zsh
aliases.zsh
exports.zsh
init.zsh
.zshrc
.config/hypr/modules/vars.conf
@@ -9,4 +9,5 @@ env = LIBVA_DRIVER_NAME,nvidia
 env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 
 env = PATH,$PATH:$HOME/.wraith/bin
-env = TERMINAL,ghostty
\ No newline at end of file
+env = TERMINAL,ghostty
+env = SSH_AUTH_SOCK,$HOME/.ssh/agent.sock
\ No newline at end of file
.config/zsh/aliases.zsh
@@ -0,0 +1,47 @@
+alias cdd="cd $DEV"
+alias src="source $HOME/.zshrc"
+alias la="ls -a"
+alias ccat="bat --color=always"
+alias vim=nvim
+alias decompress="tar -xzf"
+
+if command -v eza &> /dev/null; then
+  alias ls='eza -lah --group-directories-first --icons=auto --no-user --no-filesize --no-permissions --time-style=long-iso'
+  alias lsa='eza -lah --group-directories-first --icons=auto'
+  alias lt='eza --tree --level=2 --long --icons --git'
+  alias lta='lt -a'
+fi
+
+
+#--------------------------------------------------------------------------------
+# FUNCTIONS
+#--------------------------------------------------------------------------------
+open() {
+  xdg-open "$@" >/dev/null 2>&1 &
+}
+
+sync-config() {
+  DOTFILES_DIR="$HOME/dotfiles"
+
+  echo "⚠️  This will sync all dotfiles from:"
+  echo "    $DOTFILES_DIR --> $HOME"
+  echo
+  read "reply?Proceed with sync? [y/N]: "
+
+  if [[ "$reply" =~ ^[Yy]$ ]]; then
+    echo "🔄 Syncing..."
+    cd "$DOTFILES_DIR" || { echo "❌ Failed to change directory"; return 1; }
+    stow --target="$HOME" .
+    echo "✅ Dotfiles synced."
+  else
+    echo "❌ Sync cancelled."
+  fi
+}
+
+ff() {
+  local files
+  files=$(fzf --layout=reverse --multi --preview="bat --color=always {}" --exit-0) || return
+  [ -n "$files" ] && vim "${(@f)files}"
+}
+
+#--------------------------------------------------------------------------------
.config/zsh/exports.zsh
@@ -0,0 +1,12 @@
+export DEV="$HOME/dev"
+export ZSH="$HOME/.oh-my-zsh"
+export EDITOR='vim'
+export BUN_INSTALL="$HOME/.bun"
+export ANDROID_HOME="$HOME/Android/Sdk"
+export ANDROID_SDK_ROOT="$HOME/Android/Sdk"
+export ANDROID_SWT=/usr/share/java
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
+export NVM_DIR="$HOME/.nvm"
+export FZF_DEFAULT_OPTS="--layout=reverse --height=40%"
+export WRAITH_BIN="$HOME/.wraith/bin"
+export PATH="$PATH:$BUN_INSTALL/bin:$ANDROID_HOME/platform-tools:$JAVA_HOME:$ANDROID_HOME/emulator:$WRAITH_BIN"
\ No newline at end of file
.config/zsh/init.zsh
@@ -0,0 +1,3 @@
+eval "$(zoxide init --cmd cd zsh)"
+
+eval "$(keychain -q --ssh-agent-socket $HOME/.ssh/agent.sock --eval github homelab)"
\ No newline at end of file
.zshrc
@@ -1,105 +1,11 @@
-#--------------------------------------------------------------------------------
-# EXPORTS
-#--------------------------------------------------------------------------------
-
-# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
-export DEV="$HOME/dev"
-export ZSH="$HOME/.oh-my-zsh"
-export EDITOR='vim'
-export BUN_INSTALL="$HOME/.bun"
-export ANDROID_HOME="$HOME/Android/Sdk"
-export ANDROID_SDK_ROOT="$HOME/Android/Sdk"
-export ANDROID_SWT=/usr/share/java
-export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
-export NVM_DIR="$HOME/.nvm"
-export FZF_DEFAULT_OPTS="--layout=reverse --height=40%"
-export WRAITH_BIN="$HOME/.wraith/bin"
-export PATH="$PATH:$BUN_INSTALL/bin:$ANDROID_HOME/platform-tools:$JAVA_HOME:$ANDROID_HOME/emulator:$WRAITH_BIN"
-#--------------------------------------------------------------------------------
-# SOURCING
-#--------------------------------------------------------------------------------
-
+# Oh My Zsh Configuration
 ZSH_THEME="wraith"
-zstyle ':omz:update' mode reminder  # just remind me to update when it's time
-
+zstyle ':omz:update' mode reminder
 plugins=(git zsh-autosuggestions)
 
+# Source additional configuration files
+source $HOME/.config/zsh/exports.zsh
 source $ZSH/oh-my-zsh.sh
 source <(fzf --zsh)
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" 
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-[ -s "/home/robinhood/.bun/_bun" ] && source "/home/robinhood/.bun/_bun"
-
-#--------------------------------------------------------------------------------
-# MISC 
-#--------------------------------------------------------------------------------
-
-# Zoxide
-eval "$(zoxide init --cmd cd zsh)"
-
-# SSH Configs
-[ -f ~/.ssh/github ] && eval "$(keychain -q --eval github)"
-
-#Obsidian Hack - not working with rofi
-# if [[ -n "$SSH_AUTH_SOCK" ]]; then
-#   sed -i "s|Exec=.*SSH_AUTH_SOCK=[^ ]\\+ /usr/bin/obsidian %U|Exec=SSH_AUTH_SOCK=$SSH_AUTH_SOCK /usr/bin/obsidian %U|" ~/.local/share/applications/obsidian.desktop
-# fi
-
-#--------------------------------------------------------------------------------
-# ALIAS
-#--------------------------------------------------------------------------------
-
-alias cdd="cd $DEV"
-alias src="source $HOME/.zshrc"
-alias la="ls -a"
-alias ccat="bat --color=always"
-alias vim=nvim
-#--------------------------------------------------------------------------------
-# FUNCTIONS
-#--------------------------------------------------------------------------------
-
-sync-config() {
-  DOTFILES_DIR="$HOME/dotfiles"
-
-  echo "⚠️  This will sync all dotfiles from:"
-  echo "    $DOTFILES_DIR --> $HOME"
-  echo
-  read "reply?Proceed with sync? [y/N]: "
-
-  if [[ "$reply" =~ ^[Yy]$ ]]; then
-    echo "🔄 Syncing..."
-    cd "$DOTFILES_DIR" || { echo "❌ Failed to change directory"; return 1; }
-    stow --target="$HOME" .
-    echo "✅ Dotfiles synced."
-  else
-    echo "❌ Sync cancelled."
-  fi
-}
-
-#--------------------------------------------------------------------------------
-
-unalias ls 2>/dev/null
-
-ls() {
-  setopt localoptions nullglob
-
-  if [ "$#" -eq 0 ]; then
-    command ls -lah --color=always --time-style="+%b %d %H:%M" -d .* * 2>/dev/null \
-      | awk '{ printf "%6s %4s %2s %5s  %s\n", $5, $6, $7, $8, substr($0, index($0, $9)) }'
-  # elif [ "$#" -eq 1 ] && [ "${1:0:1}" != "-" ] && [ -d "$1" ]; then
-  #   command ls -lah -/home/robinhood/.cache/yay/zen-browser/src/pnpm-store-color=always --time-style="+%b %d %H:%M" -d "$1"/.* "$1"/* 2>/dev/null \
-  #     | awk '{ printf "%6s %4s %2s %5s  %s\n", $5, $6, $7, $8, substr($0, index($0, $9)) }'
-  else
-    command ls --color=tty "$@"
-  fi
-}
-
-#--------------------------------------------------------------------------------
-
-ff() {
-  local files
-  files=$(fzf --layout=reverse --multi --preview="bat --color=always {}" --exit-0) || return
-  [ -n "$files" ] && vim "${(@f)files}"
-}
-
-#--------------------------------------------------------------------------------
+source $HOME/.config/zsh/init.zsh
+source $HOME/.config/zsh/aliases.zsh 
\ No newline at end of file