Replace zim with zinit and remove zim
This commit is contained in:
parent
e463a12423
commit
eb94a7478d
3
.gitignore
vendored
3
.gitignore
vendored
@ -3,8 +3,9 @@
|
||||
|
||||
# Except
|
||||
!.gitignore
|
||||
!.zimrc
|
||||
!.zinit.zsh
|
||||
!.zshrc
|
||||
!.zstyle.zsh
|
||||
!.config/hypr
|
||||
!.config/nvim/init.lua
|
||||
!.config/nvim/lua/*
|
||||
|
||||
56
.zimrc
56
.zimrc
@ -1,56 +0,0 @@
|
||||
# Start configuration added by Zim install {{{
|
||||
#
|
||||
# This is not sourced during shell startup, and it's only used to configure the
|
||||
# zimfw plugin manager.
|
||||
#
|
||||
|
||||
#
|
||||
# Modules
|
||||
#
|
||||
|
||||
# Sets sane Zsh built-in environment options.
|
||||
zmodule environment
|
||||
# Provides handy git aliases and functions.
|
||||
zmodule git
|
||||
# Applies correct bindkeys for input events.
|
||||
zmodule input
|
||||
# Sets a custom terminal title.
|
||||
zmodule termtitle
|
||||
# Utility aliases and functions. Adds colour to ls, grep and less.
|
||||
zmodule utility
|
||||
|
||||
#
|
||||
# Prompt
|
||||
#
|
||||
|
||||
# Exposes to prompts how long the last command took to execute, used by asciiship.
|
||||
zmodule duration-info
|
||||
# Exposes git repository status information to prompts, used by asciiship.
|
||||
zmodule git-info
|
||||
# A heavily reduced, ASCII-only version of the Spaceship and Starship prompts.
|
||||
zmodule asciiship
|
||||
|
||||
#
|
||||
# Completion
|
||||
#
|
||||
|
||||
# Additional completion definitions for Zsh.
|
||||
zmodule zsh-users/zsh-completions --fpath src
|
||||
# Enables and configures smart and extensive tab completion.
|
||||
# completion must be sourced after all modules that add completion definitions.
|
||||
zmodule completion
|
||||
|
||||
#
|
||||
# Modules that must be initialized last
|
||||
#
|
||||
|
||||
# Fish-like syntax highlighting for Zsh.
|
||||
# zsh-users/zsh-syntax-highlighting must be sourced after completion
|
||||
zmodule zsh-users/zsh-syntax-highlighting
|
||||
# Fish-like history search (up arrow) for Zsh.
|
||||
# zsh-users/zsh-history-substring-search must be sourced after zsh-users/zsh-syntax-highlighting
|
||||
zmodule zsh-users/zsh-history-substring-search
|
||||
# Fish-like autosuggestions for Zsh.
|
||||
zmodule zsh-users/zsh-autosuggestions
|
||||
# }}} End configuration added by Zim install
|
||||
|
||||
67
.zinit.zsh
Normal file
67
.zinit.zsh
Normal file
@ -0,0 +1,67 @@
|
||||
#####################
|
||||
### INSTALL ZINIT ###
|
||||
#####################
|
||||
|
||||
if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then
|
||||
print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f"
|
||||
command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit"
|
||||
command git clone https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \
|
||||
print -P "%F{33} %F{34}Installation successful.%f%b" || \
|
||||
print -P "%F{160} The clone has failed.%f%b"
|
||||
fi
|
||||
|
||||
###################
|
||||
### START ZINIT ###
|
||||
###################
|
||||
|
||||
source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
|
||||
autoload -Uz _zinit
|
||||
(( ${+_comps} )) && _comps[zinit]=_zinit
|
||||
|
||||
#############
|
||||
### THEME ###
|
||||
#############
|
||||
|
||||
zinit ice depth=1; zinit light romkatv/powerlevel10k
|
||||
|
||||
###############
|
||||
### PLUGINS ###
|
||||
###############
|
||||
|
||||
# FZF
|
||||
zinit ice from="gh-r" as="command" bpick="*linux_amd64*"
|
||||
zinit light junegunn/fzf
|
||||
|
||||
# FZF BYNARY AND TMUX HELPER SCRIPT
|
||||
zinit ice lucid wait'0c' as="command" id-as="junegunn/fzf-tmux" pick="bin/fzf-tmux"
|
||||
zinit light junegunn/fzf
|
||||
|
||||
# BIND MULTIPLE WIDGETS USING FZF
|
||||
zinit ice lucid wait'0c' multisrc"shell/{completion,key-bindings}.zsh" id-as="junegunn/fzf_completions" pick="/dev/null"
|
||||
zinit light junegunn/fzf
|
||||
|
||||
# FZF-TAB
|
||||
zinit ice wait="1" lucid
|
||||
zinit light Aloxaf/fzf-tab
|
||||
|
||||
# AUTOSUGGESTIONS, TRIGGER PRECMD HOOK UPON LOAD
|
||||
ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20
|
||||
zinit ice wait="0a" lucid atload="_zsh_autosuggest_start"
|
||||
zinit light zsh-users/zsh-autosuggestions
|
||||
|
||||
# ENHANCD
|
||||
zinit ice wait="0b" lucid
|
||||
zinit light b4b4r07/enhancd
|
||||
export ENHANCD_FILTER=fzf:fzy:peco
|
||||
|
||||
# ZOXIDE
|
||||
zinit ice wait="0" lucid from="gh-r" as="program" pick="zoxide-*/zoxide -> zoxide" cp="zoxide-*/completions/_zoxide -> _zoxide" atclone="./zoxide init zsh > init.zsh" atpull="%atclone" src="init.zsh"
|
||||
zinit light ajeetdsouza/zoxide
|
||||
|
||||
# TAB COMPLETIONS
|
||||
zinit ice wait="0b" lucid blockf
|
||||
zinit light zsh-users/zsh-completions
|
||||
|
||||
# SYNTAX HIGHLIGHTING
|
||||
zinit ice wait="0c" lucid atinit="zpcompinit;zpcdreplay"
|
||||
zinit light zdharma-continuum/fast-syntax-highlighting
|
||||
187
.zshrc
187
.zshrc
@ -1,188 +1,49 @@
|
||||
# Start configuration added by Zim install {{{
|
||||
#
|
||||
# User configuration sourced by interactive shells
|
||||
#
|
||||
|
||||
# -----------------
|
||||
# Zsh configuration
|
||||
# -----------------
|
||||
|
||||
#
|
||||
# History
|
||||
#
|
||||
|
||||
# Remove older command from the history if a duplicate is to be added.
|
||||
setopt HIST_IGNORE_ALL_DUPS
|
||||
|
||||
#
|
||||
# Input/output
|
||||
#
|
||||
|
||||
# Set editor default keymap to emacs (`-e`) or vi (`-v`)
|
||||
bindkey -e
|
||||
|
||||
# Prompt for spelling correction of commands.
|
||||
#setopt CORRECT
|
||||
|
||||
# Customize spelling correction prompt.
|
||||
#SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
|
||||
|
||||
# Remove path separator from WORDCHARS.
|
||||
WORDCHARS=${WORDCHARS//[\/]}
|
||||
|
||||
# -----------------
|
||||
# Zim configuration
|
||||
# -----------------
|
||||
|
||||
# Use degit instead of git as the default tool to install and update modules.
|
||||
#zstyle ':zim:zmodule' use 'degit'
|
||||
|
||||
# --------------------
|
||||
# Module configuration
|
||||
# --------------------
|
||||
|
||||
#
|
||||
# git
|
||||
#
|
||||
|
||||
# Set a custom prefix for the generated aliases. The default prefix is 'G'.
|
||||
#zstyle ':zim:git' aliases-prefix 'g'
|
||||
|
||||
#
|
||||
# input
|
||||
#
|
||||
|
||||
# Append `../` to your input for each `.` you type after an initial `..`
|
||||
#zstyle ':zim:input' double-dot-expand yes
|
||||
|
||||
#
|
||||
# termtitle
|
||||
#
|
||||
|
||||
# Set a custom terminal title format using prompt expansion escape sequences.
|
||||
# See http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Simple-Prompt-Escapes
|
||||
# If none is provided, the default '%n@%m: %~' is used.
|
||||
#zstyle ':zim:termtitle' format '%1~'
|
||||
|
||||
#
|
||||
# zsh-autosuggestions
|
||||
#
|
||||
|
||||
# Disable automatic widget re-binding on each precmd. This can be set when
|
||||
# zsh-users/zsh-autosuggestions is the last module in your ~/.zimrc.
|
||||
ZSH_AUTOSUGGEST_MANUAL_REBIND=1
|
||||
|
||||
# Customize the style that the suggestions are shown with.
|
||||
# See https://github.com/zsh-users/zsh-autosuggestions/blob/master/README.md#suggestion-highlight-style
|
||||
#ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=242'
|
||||
|
||||
#
|
||||
# zsh-syntax-highlighting
|
||||
#
|
||||
|
||||
# Set what highlighters will be used.
|
||||
# See https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
|
||||
ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
|
||||
|
||||
# Customize the main highlighter styles.
|
||||
# See https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md#how-to-tweak-it
|
||||
#typeset -A ZSH_HIGHLIGHT_STYLES
|
||||
#ZSH_HIGHLIGHT_STYLES[comment]='fg=242'
|
||||
|
||||
# ------------------
|
||||
# Initialize modules
|
||||
# ------------------
|
||||
|
||||
ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim
|
||||
# Download zimfw plugin manager if missing.
|
||||
if [[ ! -e ${ZIM_HOME}/zimfw.zsh ]]; then
|
||||
if (( ${+commands[curl]} )); then
|
||||
curl -fsSL --create-dirs -o ${ZIM_HOME}/zimfw.zsh \
|
||||
https://github.com/zimfw/zimfw/releases/latest/download/zimfw.zsh
|
||||
else
|
||||
mkdir -p ${ZIM_HOME} && wget -nv -O ${ZIM_HOME}/zimfw.zsh \
|
||||
https://github.com/zimfw/zimfw/releases/latest/download/zimfw.zsh
|
||||
fi
|
||||
if [[ ! $(tmux ls) ]] 2> /dev/null; then
|
||||
tmux new -s λ
|
||||
fi
|
||||
# Install missing modules, and update ${ZIM_HOME}/init.zsh if missing or outdated.
|
||||
if [[ ! ${ZIM_HOME}/init.zsh -nt ${ZIM_CONFIG_FILE:-${ZDOTDIR:-${HOME}}/.zimrc} ]]; then
|
||||
source ${ZIM_HOME}/zimfw.zsh init
|
||||
fi
|
||||
# Initialize modules.
|
||||
source ${ZIM_HOME}/init.zsh
|
||||
|
||||
# ------------------------------
|
||||
# Post-init module configuration
|
||||
# ------------------------------
|
||||
############
|
||||
### P10K ###
|
||||
############
|
||||
|
||||
#
|
||||
# zsh-history-substring-search
|
||||
#
|
||||
|
||||
zmodload -F zsh/terminfo +p:terminfo
|
||||
# Bind ^[[A/^[[B manually so up/down works both before and after zle-line-init
|
||||
for key ('^[[A' '^P' ${terminfo[kcuu1]}) bindkey ${key} history-substring-search-up
|
||||
for key ('^[[B' '^N' ${terminfo[kcud1]}) bindkey ${key} history-substring-search-down
|
||||
for key ('k') bindkey -M vicmd ${key} history-substring-search-up
|
||||
for key ('j') bindkey -M vicmd ${key} history-substring-search-down
|
||||
unset key
|
||||
# }}} End configuration added by Zim install
|
||||
|
||||
# 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
|
||||
|
||||
# Created by newuser for 5.9
|
||||
source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme
|
||||
|
||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
||||
### Added by Zinit's installer
|
||||
if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then
|
||||
print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f"
|
||||
command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit"
|
||||
command git clone https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \
|
||||
print -P "%F{33} %F{34}Installation successful.%f%b" || \
|
||||
print -P "%F{160} The clone has failed.%f%b"
|
||||
fi
|
||||
#############
|
||||
### ZINIT ###
|
||||
#############
|
||||
|
||||
source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
|
||||
autoload -Uz _zinit
|
||||
(( ${+_comps} )) && _comps[zinit]=_zinit
|
||||
source ~/.zinit.zsh
|
||||
source ~/.zstyle.zsh
|
||||
|
||||
# Load a few important annexes, without Turbo
|
||||
# (this is currently required for 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
|
||||
#############
|
||||
### PATHS ###
|
||||
#############
|
||||
|
||||
### End of Zinit's installer chunk
|
||||
|
||||
|
||||
###### TODO - Organize ######
|
||||
|
||||
### Begin PATHS
|
||||
|
||||
# N
|
||||
# n
|
||||
export N_PREFIX=$HOME/.n
|
||||
export PATH=$N_PREFIX/bin:$PATH
|
||||
|
||||
### End PATHS
|
||||
#####################
|
||||
### ENV VARIABLES ###
|
||||
#####################
|
||||
|
||||
export WAYLAND_DISPLAY=wayland-1
|
||||
export SUDO_EDITOR="nvim"
|
||||
export EDITOR="nvim"
|
||||
export VISUAL="nvim"
|
||||
export TERM="kitty"
|
||||
export BROWSER="firefox"
|
||||
|
||||
### Aliases
|
||||
HISTSIZE=1000
|
||||
SAVEHIST=50000
|
||||
HISTFILE=${XDG_STATE_HOME:-$HOME/.local/state}/.zsh_history
|
||||
|
||||
###############
|
||||
### ALIASES ###
|
||||
###############
|
||||
|
||||
alias svim="sudo -E -s nvim"
|
||||
alias config='/usr/bin/git --git-dir=$HOME/.git/ --work-tree=$HOME'
|
||||
|
||||
61
.zstyle.zsh
Normal file
61
.zstyle.zsh
Normal file
@ -0,0 +1,61 @@
|
||||
###################
|
||||
### COMPLETIONS ###
|
||||
###################
|
||||
|
||||
# Specify the order of completers to use:
|
||||
# - `_expand`: Expand variables and globs.
|
||||
# - `_complete`: Standard completion.
|
||||
# - `_ignored`: Ignore certain completions.
|
||||
# - `_approximate`: Approximate matching for fuzzy completions.
|
||||
zstyle ':completion:*' completer _expand _complete _ignored _approximate
|
||||
|
||||
# Enable case-insensitive matching
|
||||
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
|
||||
|
||||
# Disable the menu selection feature (automatically select the first match)
|
||||
zstyle ':completion:*' menu no
|
||||
|
||||
# Customize the prompt shown when scrolling through completions
|
||||
# - `%SScrolling active: current selection at %p%s`: Shows a message indicating that scrolling is active and the current selection.
|
||||
zstyle ':completion:*' select-prompt '%SScrolling active: current selection at %p%s'
|
||||
|
||||
# Format descriptions in completion lists
|
||||
# - `[%d]`: Wrap descriptions in square brackets.
|
||||
zstyle ':completion:*:descriptions' format '[%d]'
|
||||
|
||||
# Specify the command to use for completing process names
|
||||
# - `ps -au$USER`: List processes for the current user.
|
||||
zstyle ':completion:*:processes' command 'ps -au$USER'
|
||||
|
||||
# Specify the command to use for completing process names with fzf-tab
|
||||
# - `ps -u $USER -o pid,user,comm,cmd -w -w`: List processes with detailed information.
|
||||
zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm,cmd -w -w"
|
||||
|
||||
# Disable sorting of completion options
|
||||
zstyle ':completion:complete:*:options' sort false
|
||||
|
||||
# Disable sorting of git checkout completions
|
||||
zstyle ":completion:*:git-checkout:*" sort false
|
||||
|
||||
# Apply LS_COLORS to completion lists for colored output
|
||||
zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
|
||||
|
||||
# Configure fzf-tab behavior
|
||||
|
||||
# Use the input string as the query string for _zlua completions
|
||||
zstyle ':fzf-tab:complete:_zlua:*' query-string input
|
||||
|
||||
# Customize the kill command completion with fzf-tab
|
||||
# - `extra-opts`: Additional options for fzf, including a preview window showing the command of the selected process.
|
||||
zstyle ':fzf-tab:complete:kill:argument-rest' extra-opts --preview=$extract'ps --pid=$in[(w)1] -o cmd --no-headers -w -w' --preview-window=down:3:wrap
|
||||
|
||||
# Customize the cd command completion with fzf-tab
|
||||
# - `fzf-preview`: Show a preview of directories using `eza` (a modern replacement for `ls`).
|
||||
zstyle ':fzf-tab:complete:cd:*' fzf-preview 'eza -1 --color=always $realpath'
|
||||
|
||||
# Customize the z command completion with fzf-tab
|
||||
# - `fzf-preview`: Show a preview of directories using `eza`.
|
||||
zstyle ':fzf-tab:complete:z:*' fzf-preview 'eza -1 --color=always $realpath'
|
||||
|
||||
# Use default fzf options for fzf-tab
|
||||
zstyle ':fzf-tab:*' use-fzf-default-opts yes
|
||||
Loading…
x
Reference in New Issue
Block a user