Merge remote-tracking branch 'origin/master'

# Conflicts:
#	home_config/ghostty/config
#	home_root/.zshrc

home_root/.zshrc

@@ -3,9 +3,12 @@ path=(~/bin $path)
 path=(~/.local/bin $path)
 path=(~/.cache/lk-tools/fzf/bin $path)
 
-
-# Init OhMyPosh
-eval "$(oh-my-posh init zsh --config https://333e8677ac54a1845fe68813017ab7e807c87ab2@gitea.phasefinal.com/vh/dotfiles/raw/branch/master/home_config/ohmyposh/lkraven.toml)"
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
 
 # Set ZINIT Home
 ZINIT_HOME="${HOME}/.config/zinit/zinit.git"
@@ -20,6 +23,10 @@ fi
 source "${ZINIT_HOME}/zinit.zsh"
 
 # add zinit
+# Powerlevel10k prompt theme (replaces oh-my-posh; instant prompt = fast startup)
+zinit ice depth=1
+zinit light romkatv/powerlevel10k
+
 zinit light zsh-users/zsh-syntax-highlighting
 zinit light zsh-users/zsh-completions
 zinit light zsh-users/zsh-autosuggestions
@@ -53,6 +60,10 @@ setopt hist_ignore_dups
 setopt hist_find_no_dups
 setopt hist_verify
 
+# allow inline `#` comments at the interactive prompt (paste-friendly;
+# matches non-interactive/script behavior so pasted commands don't fail)
+setopt interactive_comments
+
 # completion styling
 zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
 zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
@@ -62,12 +73,10 @@ zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath'
 zstyle ':fzf-tab:*' fzf-command ftb-tmux-popup
 
 # aliases
-alias ls='eza'
 alias cat='bat'
-alias tree='eza --tree'
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
-# [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
 export FZF_DEFAULT_COMMAND="fd --hidden --strip-cwd-prefix --exclude .git"
@@ -83,13 +92,13 @@ _fzf_compgen_dir() {
 source ~/fzf-git.sh/fzf-git.sh
 
 export FZF_CTRL_T_OPTS="--preview 'bat -n --color=always --line-range :500 {}'"
-export FZF_ALT_C_OPTS="--preview 'eza --tree --color=always {} | head -200'"
+export FZF_ALT_C_OPTS="--preview 'ls -la {} | head -200'"
 
 _fzf_comprun() {
     local command=$1
     shift
      case "$command" in
-        cd)               fzf --preview 'eza --tree --color=always {} | head -200' "$@" ;;
+        cd)               fzf --preview 'ls -la {} | head -200' "$@" ;;
         export|unset)     fzf --preview "eval 'echo \$' {}"   "$@" ;;
         ssh)              fzf --preview 'dig {}'  "$@" ;;
         *)                fzf --preview 'bat -n --color=always --line-range :500 {}' "$@" ;;
@@ -99,19 +108,28 @@ export BAT_THEME=Nord
 eval "$(zoxide init zsh)"
 alias cd='z'
 
-eval $(thefuck --alias)
-eval $(thefuck --alias fk)
-
 zinit light Aloxaf/fzf-tab
 
 
-if [[ $(uname) == "Darwin" ]]; then
-  source $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-elif [[ $(uname) == "Linux" ]]; then
-  source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+# zsh-autosuggestions is already loaded via zinit above; on Linux, also wire
+# the terminfo arrow keys to history search.
+if [[ $(uname) == "Linux" ]]; then
   bindkey "${terminfo[kcuu1]}" history-search-backward
   bindkey "${terminfo[kcud1]}" history-search-forward
 fi
 
 
-export STM32_PRG_PATH=/Applications/STMicroelectronics/STM32Cube/STM32CubeProgrammer/STM32CubeProgrammer.app/Contents/MacOs/bin
+export STM32_PRG_PATH=/Applications/STMicroelectronics/STM32Cube/STM32CubeProgrammer/STM32CubeProgrammer.app/Contents/MacOs/bin
+
+# bun completions
+[ -s "/home/lkraven/.bun/_bun" ] && source "/home/lkraven/.bun/_bun"
+
+# bun
+export BUN_INSTALL="$HOME/.bun"
+export PATH="$BUN_INSTALL/bin:$PATH"
+
+# >>> grok installer >>>
+export PATH="$HOME/.grok/bin:$PATH"
+fpath=(~/.grok/completions/zsh $fpath)
+autoload -Uz compinit && compinit -C
+# <<< grok installer <<<