vh
bf179ef0b1
Fold macinstaller + install-apt-pkgs + install-tools + install-zellij into a single host-aware lk-installers/install-apps (macOS->Homebrew, bootstrapping Homebrew if absent; Linux->apt + upstream installers). Installs the tools the configs assume (bat, fd, fzf, zoxide, zellij, nvim, btop, htop, tldr) plus the fzf-git.sh helper and fzf shell integration; idempotent. link-dotfiles gains --apps to install then link in one shot. .zshrc drops the redundant brew/system zsh-autosuggestions source (zinit already loads it), fixing the missing-file error on a fresh box. README documents the new flow.
117 lines
3.4 KiB
Bash
117 lines
3.4 KiB
Bash
#extend path
|
|
path=(~/bin $path)
|
|
path=(~/.local/bin $path)
|
|
path=(~/.cache/lk-tools/fzf/bin $path)
|
|
|
|
# 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"
|
|
|
|
# Download ZINIT
|
|
if [ ! -f "${ZINIT_HOME}/zinit.zsh" ]; then
|
|
mkdir -p "$(dirname $ZINIT_HOME)"
|
|
git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME"
|
|
fi
|
|
|
|
# Load Zinit
|
|
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
|
|
zinit ice depth=1
|
|
zinit light jeffreytse/zsh-vi-mode
|
|
|
|
# Load completions
|
|
autoload -U compinit && compinit
|
|
zinit cdreplay -q
|
|
|
|
# keybindings
|
|
bindkey -e
|
|
bindkey '^p' history-search-backward
|
|
bindkey '^n' history-search-forward
|
|
bindkey '^[[A' history-beginning-search-backward
|
|
bindkey '^[[B' history-beginning-search-forward
|
|
bindkey '\e[A' history-beginning-search-backward
|
|
bindkey '\e[B' history-beginning-search-forward
|
|
|
|
# History
|
|
HISTSIZE=5000
|
|
HISTFILE=~/.zsh_history
|
|
SAVEHIST=$HISTSIZE
|
|
HISTDUP=erase
|
|
setopt appendhistory
|
|
setopt sharehistory
|
|
setopt hist_ignore_space
|
|
setopt hist_ignore_all_dups
|
|
setopt hist_save_no_dups
|
|
setopt hist_ignore_dups
|
|
setopt hist_find_no_dups
|
|
setopt hist_verify
|
|
|
|
# completion styling
|
|
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
|
|
zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
|
|
zstyle ':completion:*' menu no
|
|
zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath'
|
|
zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath'
|
|
zstyle ':fzf-tab:*' fzf-command ftb-tmux-popup
|
|
|
|
# aliases
|
|
alias cat='bat'
|
|
|
|
# To customize prompt, run `p10k configure` or edit ~/.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"
|
|
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
|
|
_fzf_compgen_path() {
|
|
fd --hidden --exclude .git . "$1"
|
|
}
|
|
|
|
_fzf_compgen_dir() {
|
|
fd --type=d --hidden --exclude .git . "$1"
|
|
}
|
|
|
|
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 'ls -la {} | head -200'"
|
|
|
|
_fzf_comprun() {
|
|
local command=$1
|
|
shift
|
|
case "$command" in
|
|
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 {}' "$@" ;;
|
|
esac
|
|
}
|
|
export BAT_THEME=Nord
|
|
eval "$(zoxide init zsh)"
|
|
alias cd='z'
|
|
|
|
zinit light Aloxaf/fzf-tab
|
|
|
|
|
|
# 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
|
|
|