zsh: improve fzf config

Author: mainframev

.config/zsh/aliases.zsh

@@ -41,5 +41,3 @@ alias tskst='task stats'
 alias tskts='task timesheet'
 alias vi="nvim"
 alias y="yarn"
-alias faliases='alias | fzf --prompt="alias> " \
-  --preview '\''echo {} | sed "s/^[^=]*=//" | sed "s/^'\'''\''//; s/'\'''\''$//" | bat --language=bash --style=plain --color=always'\'''

.config/zsh/fzf/aliases.zsh

@@ -0,0 +1,6 @@
+#!/bin/env zsh
+
+alias fa='alias | fzf --prompt="alias> " \
+  --preview '\''echo {} | sed "s/^[^=]*=//" | sed "s/^'\'''\''//; s/'\'''\''$//" | bat --language=bash --style=plain --color=always'\'''
+
+alias ff='nvim $(fzf --preview="bat --color=always {}")'

.config/zsh/brew.zsh .config/zsh/fzf/brew.zsh.config/zsh/brew.zsh renamed to .config/zsh/fzf/brew.zsh

@@ -4,8 +4,7 @@
 # FZF Configuration
 
 
-# FZF scripts
-source $DOTFILES_ZSH/scripts-fzf.zsh
+
 
 export FZF_BASE="/opt/homebrew/opt/fzf"
 export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git'

.config/zsh/fzf.zsh .config/zsh/fzf/config.zsh.config/zsh/fzf.zsh renamed to .config/zsh/fzf/config.zsh

@@ -18,4 +18,25 @@ fifa() {
         && print -z "./$file" || return 1;
 }
 
+# fzf and zoxide QOL functions
+zz() {
+  local dir
+  dir=$(zoxide query -l | fzf) && z "$dir"
+}
+
+# with tree preview
+zfp() {
+  local dir
+  dir=$(zoxide query -l | fzf --preview 'tree -CL 2 {}')
+  [ -n "$dir" ] && z "$dir" && ls -la
+ }
+
+# recent dirs
+zr() {
+  local dir
+  dir=$(zoxide query -l | sort -k2 -rn | fzf)
+  [ -n "$dir" ] && z "$dir"
+ }
+
+
 

.config/zsh/scripts-fzf.zsh .config/zsh/fzf/scripts.zsh.config/zsh/scripts-fzf.zsh renamed to .config/zsh/fzf/scripts.zsh

@@ -33,7 +33,14 @@ for plugin in $github_plugins; do
     mkdir -p ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins
     git clone --depth 1 --recursive https://github.com/$plugin.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/$plugin_name
   fi
-  # load the plugin
+done
+
+# Load oh-my-zsh FIRST (it runs compinit internally)
+source $ZSH/oh-my-zsh.sh
+
+# Load custom github plugins AFTER oh-my-zsh
+for plugin in $github_plugins; do
+  plugin_name=${plugin#*/}
   for initscript in ${plugin_name}.zsh ${plugin_name}.plugin.zsh ${plugin_name}.sh; do
     if [[ -f ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/$plugin_name/$initscript ]]; then
       source ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/$plugin_name/$initscript
@@ -42,8 +49,6 @@ for plugin in $github_plugins; do
   done
 done
 
-source $ZSH/oh-my-zsh.sh
-
 unset github_plugins
 unset plugin
 unset initscript

.config/zsh/oh-my-zsh.zsh

@@ -37,12 +37,9 @@ source $DOTFILES_ZSH/oh-my-zsh.zsh
 
 # | FZF |
 if [ $(command -v "fzf") ]; then
-  source $DOTFILES_ZSH/fzf.zsh
-fi
-
-# | BREW |
-if [ $(command -v "brew") ]; then
-  source $DOTFILES_ZSH/brew.zsh
+  for file in $DOTFILES_ZSH/fzf/*.zsh; do
+    source "$file"
+  done
 fi
 
 # | ALIASES |