added atuin, changes in kanata, added wezterm
This commit is contained in:
liph
+12
-6
@@ -114,12 +114,18 @@ alias ripp='rip search tidal album'
|
||||
alias ripc='nvim ~/.config/streamrip/config.toml'
|
||||
|
||||
# paru
|
||||
alias ys='$AUR_HELPER -S' # install packoz
|
||||
alias yr='$AUR_HELPER -Rn' # remove package
|
||||
alias yy='$AUR_HELPER -Ss' # paru search for package
|
||||
alias yay='$AUR_HELPER'
|
||||
alias yi='$AUR_HELPER -Si' # aur info
|
||||
alias which-aur="echo 'Currently using: $AUR_HELPER'"
|
||||
alias ys='paru -S' # install packoz
|
||||
alias yr='paru -Rn' # remove package
|
||||
alias yy='paru -Ss' # paru search for package
|
||||
alias yay='paru'
|
||||
alias yi='paru -Si' # aur info
|
||||
# alias which-aur="echo 'Currently using: paru'"
|
||||
# alias ys='$AUR_HELPER -S' # install packoz
|
||||
# alias yr='$AUR_HELPER -Rn' # remove package
|
||||
# alias yy='$AUR_HELPER -Ss' # paru search for package
|
||||
# alias yay='$AUR_HELPER'
|
||||
# alias yi='$AUR_HELPER -Si' # aur info
|
||||
# alias which-aur="echo 'Currently using: $AUR_HELPER'"
|
||||
|
||||
# trash-cli
|
||||
alias te='trash-empty'
|
||||
|
||||
+6
-3
@@ -2,17 +2,20 @@
|
||||
#zinit ice depth=1; zinit light romkatv/powerlevel10k
|
||||
|
||||
# Add in plugins
|
||||
zinit light zsh-users/zsh-syntax-highlighting
|
||||
# zinit light zdharma-continuum/fast-syntax-highlighting
|
||||
# zinit light zsh-users/zsh-syntax-highlighting
|
||||
zinit light Aloxaf/fzf-tab
|
||||
zinit light zdharma-continuum/fast-syntax-highlighting
|
||||
zinit light zsh-users/zsh-completions
|
||||
zinit light zsh-users/zsh-autosuggestions
|
||||
zinit light Aloxaf/fzf-tab
|
||||
zinit light hlissner/zsh-autopair
|
||||
zinit light ajeetdsouza/zoxide
|
||||
zinit ice lucid wait as"completion"
|
||||
zinit snippet https://github.com/eza-community/eza/blob/main/completions/zsh/_eza
|
||||
zinit light MichaelAquilina/zsh-you-should-use
|
||||
zinit light wfxr/forgit
|
||||
zinit load atuinsh/atuin
|
||||
zinit load 'zsh-users/zsh-history-substring-search'
|
||||
|
||||
# zinit light trapd00r/zsh-syntax-highlighting-filetypes
|
||||
|
||||
# Add in snippets from "OhMyZsh“
|
||||
|
||||
+32
-73
@@ -1,99 +1,56 @@
|
||||
# set the directory we want to store zinit and plugins
|
||||
# Set the directory to store zinit and plugins
|
||||
ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.locale/share}/zinit/zinit.git"
|
||||
|
||||
# Download Zinit
|
||||
# Download Zinit if not present
|
||||
if [ ! -d "$ZINIT_HOME" ]; then
|
||||
mkdir -p "$(dirname $ZINIT_HOME)"
|
||||
git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME"
|
||||
fi
|
||||
|
||||
# Initialization settings for zsh-vi-mode
|
||||
ZVM_INIT_MODE=sourcing
|
||||
# Fix zsh-vi-mode conflicts with fzf
|
||||
|
||||
# CONSOLIDATED FUNCTION: All zsh-vi-mode logic must be in one place [2]
|
||||
function zvm_after_init() {
|
||||
# Fix fzf interaction
|
||||
source <(fzf --zsh)
|
||||
|
||||
# Bind Atuin search for both Insert and Normal modes [9]
|
||||
zvm_bindkey viins '^R' atuin-search
|
||||
zvm_bindkey vicmd '^R' atuin-search
|
||||
|
||||
# Re-bind autosuggest-accept
|
||||
bindkey '^@' autosuggest-accept
|
||||
}
|
||||
|
||||
# Source zsh, alias
|
||||
source "${ZINIT_HOME}/zinit.zsh"
|
||||
source ~/.aliases.zsh
|
||||
source ~/.plugins.zsh
|
||||
source ~/.export.zsh
|
||||
# https://github.com/jungunn/fzf-git.sh
|
||||
# source ~/scripts/fzf-git.sh
|
||||
# you should unse
|
||||
# source /usr/share/zsh/plugins/zsh-you-should-use/you-should-use.plugin.zsh
|
||||
# Set up fzf key bindings and fuzzy completion
|
||||
## hydroxide
|
||||
#source ~/scripts/hydroxide.sh
|
||||
|
||||
# env aur helper
|
||||
if command -v paru &> /dev/null; then
|
||||
export AUR_HELPER="paru"
|
||||
elif command -v yay &> /dev/null; then
|
||||
export AUR_HELPER="yay"
|
||||
else
|
||||
export AUR_HELPER="pacman" # Fallback to pacman
|
||||
fi
|
||||
#export AUR_HELPER="paru"
|
||||
|
||||
# Load completions
|
||||
autoload -U compinit && compinit
|
||||
|
||||
## zinit cdreplay -q
|
||||
# Oh My Posh initialization
|
||||
eval "$(oh-my-posh init zsh --config $HOME/.config/ohmyposh/zen.toml)"
|
||||
|
||||
#eval "$(ssh-agent -s)"
|
||||
#if ! pgrep -u "$USER" ssh-agent > /dev/null; then
|
||||
# ssh-agent > ~/.ssh-agent.env
|
||||
#fi
|
||||
#if [[ -z "$SSH_AUTH_SOCK" ]]; then
|
||||
# source ~/.ssh-agent.env > /dev/null
|
||||
#fi
|
||||
|
||||
# pyenv
|
||||
# Pyenv setup
|
||||
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
|
||||
|
||||
# Bindkey
|
||||
# bindkey -e
|
||||
# bindkey '^p' history-search-backward
|
||||
# bindkey '^n' history-search-forward
|
||||
# Custom Keybinds
|
||||
bindkey -s '^T' ' tea^M ^M'
|
||||
|
||||
# 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
|
||||
|
||||
# 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'
|
||||
|
||||
# Shell integration
|
||||
# Tool initializations
|
||||
eval "$(fzf --zsh)"
|
||||
eval "$(zoxide init --cmd cd zsh)"
|
||||
eval "$(thefuck --alias)"
|
||||
eval "$(navi widget zsh)"
|
||||
# pyenv https://github.com/pyenv/pyenv-virtualenv
|
||||
# eval "$(pyenv init --path)"
|
||||
eval "$(pyenv init -)"
|
||||
# eval "$(pyenv virtualenv-init -)"
|
||||
# starship
|
||||
# eval "$(starship init zsh)"
|
||||
|
||||
# FZF Run command customizations
|
||||
_fzf_comprun() {
|
||||
local command=$1
|
||||
shift
|
||||
|
||||
case "$command" in
|
||||
cd) fzf --preview 'eza --tree --color=always {} | head -200' "$@" ;;
|
||||
export|unset) fzf --preview "eval 'echo \$' {}" "$@" ;;
|
||||
@@ -102,6 +59,7 @@ _fzf_comprun() {
|
||||
esac
|
||||
}
|
||||
|
||||
# Yazi function
|
||||
function y() {
|
||||
local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
|
||||
yazi "$@" --cwd-file="$tmp"
|
||||
@@ -111,23 +69,24 @@ function y() {
|
||||
rm -f -- "$tmp"
|
||||
}
|
||||
|
||||
# Load a few important annexes, without Turbo
|
||||
# (this is currently required for annexes)
|
||||
# Zinit Annexes
|
||||
zinit light-mode for \
|
||||
zdharma-continuum/zinit-annex-as-monitor \
|
||||
zdharma-continuum/zinit-annex-bin-gem-node \
|
||||
zdharma-continuum/zinit-annex-patch-dl \
|
||||
zdharma-continuum/zinit-annex-rust
|
||||
|
||||
### End of Zinit's installer chunk
|
||||
|
||||
# . "$HOME/.local/bin/env"
|
||||
# In .zshrc, after zinit loads
|
||||
function zvm_after_init() {
|
||||
# Re-bind ctrl+space for autosuggestions if needed
|
||||
bindkey '^@' autosuggest-accept
|
||||
}
|
||||
# Path exports
|
||||
export PATH="$HOME/.local/bin:$PATH"
|
||||
|
||||
# opencode
|
||||
export PATH=/home/liph/.opencode/bin:$PATH
|
||||
|
||||
# Source Zinit and your other configuration files
|
||||
source "${ZINIT_HOME}/zinit.zsh"
|
||||
source ~/.aliases.zsh
|
||||
source ~/.plugins.zsh
|
||||
source ~/.export.zsh
|
||||
|
||||
# Atuin Initialization [10]
|
||||
# Must be at the very end to ensure hooks are applied correctly [1]
|
||||
. "$HOME/.atuin/bin/env"
|
||||
eval "$(atuin init zsh)"
|
||||
|
||||
Reference in New Issue
Block a user