lnk: sync configuration files
parent
b182cd242d
commit
ab8bb27543
|
|
@ -19,3 +19,5 @@ mattmc3/zman
|
||||||
|
|
||||||
# NOTE: syntax highlighting needs to be last
|
# NOTE: syntax highlighting needs to be last
|
||||||
zdharma-continuum/fast-syntax-highlighting
|
zdharma-continuum/fast-syntax-highlighting
|
||||||
|
# jeffreytse/zsh-vi-mode
|
||||||
|
jeffreytse/zsh-vi-mode
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,24 @@
|
||||||
fpath+=( $HOME/.cache/antidote/mattmc3/zephyr/plugins/color )
|
fpath+=( "$HOME/.cache/antidote/mattmc3/zephyr/plugins/color" )
|
||||||
source $HOME/.cache/antidote/mattmc3/zephyr/plugins/color/color.plugin.zsh
|
source "$HOME/.cache/antidote/mattmc3/zephyr/plugins/color/color.plugin.zsh"
|
||||||
fpath+=( $HOME/.cache/antidote/mattmc3/zephyr/plugins/completion )
|
fpath+=( "$HOME/.cache/antidote/mattmc3/zephyr/plugins/completion" )
|
||||||
source $HOME/.cache/antidote/mattmc3/zephyr/plugins/completion/completion.plugin.zsh
|
source "$HOME/.cache/antidote/mattmc3/zephyr/plugins/completion/completion.plugin.zsh"
|
||||||
fpath+=( $HOME/.cache/antidote/mattmc3/zephyr/plugins/editor )
|
fpath+=( "$HOME/.cache/antidote/mattmc3/zephyr/plugins/editor" )
|
||||||
source $HOME/.cache/antidote/mattmc3/zephyr/plugins/editor/editor.plugin.zsh
|
source "$HOME/.cache/antidote/mattmc3/zephyr/plugins/editor/editor.plugin.zsh"
|
||||||
fpath+=( $HOME/.cache/antidote/mattmc3/zephyr/plugins/zfunctions )
|
fpath+=( "$HOME/.cache/antidote/mattmc3/zephyr/plugins/zfunctions" )
|
||||||
source $HOME/.cache/antidote/mattmc3/zephyr/plugins/zfunctions/zfunctions.plugin.zsh
|
source "$HOME/.cache/antidote/mattmc3/zephyr/plugins/zfunctions/zfunctions.plugin.zsh"
|
||||||
fpath+=( $HOME/.cache/antidote/zsh-users/zsh-autosuggestions )
|
fpath+=( "$HOME/.cache/antidote/zsh-users/zsh-autosuggestions" )
|
||||||
source $HOME/.cache/antidote/zsh-users/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh
|
source "$HOME/.cache/antidote/zsh-users/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh"
|
||||||
fpath+=( $HOME/.cache/antidote/zsh-users/zsh-history-substring-search )
|
fpath+=( "$HOME/.cache/antidote/zsh-users/zsh-history-substring-search" )
|
||||||
source $HOME/.cache/antidote/zsh-users/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh
|
source "$HOME/.cache/antidote/zsh-users/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh"
|
||||||
fpath+=( $HOME/.cache/antidote/3v1n0/zsh-bash-completions-fallback )
|
fpath+=( "$HOME/.cache/antidote/3v1n0/zsh-bash-completions-fallback" )
|
||||||
source $HOME/.cache/antidote/3v1n0/zsh-bash-completions-fallback/zsh-bash-completions-fallback.plugin.zsh
|
source "$HOME/.cache/antidote/3v1n0/zsh-bash-completions-fallback/zsh-bash-completions-fallback.plugin.zsh"
|
||||||
fpath+=( $HOME/.cache/antidote/Sam-programs/zsh-calc )
|
fpath+=( "$HOME/.cache/antidote/Sam-programs/zsh-calc" )
|
||||||
source $HOME/.cache/antidote/Sam-programs/zsh-calc/zsh-calc.zsh
|
source "$HOME/.cache/antidote/Sam-programs/zsh-calc/zsh-calc.zsh"
|
||||||
fpath+=( $HOME/.cache/antidote/MichaelAquilina/zsh-you-should-use )
|
fpath+=( "$HOME/.cache/antidote/MichaelAquilina/zsh-you-should-use" )
|
||||||
source $HOME/.cache/antidote/MichaelAquilina/zsh-you-should-use/zsh-you-should-use.plugin.zsh
|
source "$HOME/.cache/antidote/MichaelAquilina/zsh-you-should-use/zsh-you-should-use.plugin.zsh"
|
||||||
fpath+=( $HOME/.cache/antidote/mattmc3/zman )
|
fpath+=( "$HOME/.cache/antidote/mattmc3/zman" )
|
||||||
source $HOME/.cache/antidote/mattmc3/zman/zman.plugin.zsh
|
source "$HOME/.cache/antidote/mattmc3/zman/zman.plugin.zsh"
|
||||||
fpath+=( $HOME/.cache/antidote/zdharma-continuum/fast-syntax-highlighting )
|
fpath+=( "$HOME/.cache/antidote/zdharma-continuum/fast-syntax-highlighting" )
|
||||||
source $HOME/.cache/antidote/zdharma-continuum/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
|
source "$HOME/.cache/antidote/zdharma-continuum/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh"
|
||||||
|
fpath+=( "$HOME/.cache/antidote/jeffreytse/zsh-vi-mode" )
|
||||||
|
source "$HOME/.cache/antidote/jeffreytse/zsh-vi-mode/zsh-vi-mode.plugin.zsh"
|
||||||
|
|
|
||||||
58
.zshrc
58
.zshrc
|
|
@ -11,15 +11,6 @@ antidote load
|
||||||
|
|
||||||
plugins+=(fzf)
|
plugins+=(fzf)
|
||||||
|
|
||||||
export PAGER='ov'
|
|
||||||
export VISUAL='nvim'
|
|
||||||
export EDITOR='nvim'
|
|
||||||
|
|
||||||
export MANPAGER="sh -c 'col -bx | bat -l man -p'"
|
|
||||||
export MANROFFOPT="-c"
|
|
||||||
|
|
||||||
export BAT_PAGER="ov -FX"
|
|
||||||
|
|
||||||
## zoxide stuff - zoxide is a better cd utility
|
## zoxide stuff - zoxide is a better cd utility
|
||||||
eval "$(zoxide init zsh)"
|
eval "$(zoxide init zsh)"
|
||||||
|
|
||||||
|
|
@ -30,40 +21,45 @@ eval "$(starship init zsh)"
|
||||||
[[ -e "$HOME/.fzf-extras/fzf-extras.sh" ]] &&
|
[[ -e "$HOME/.fzf-extras/fzf-extras.sh" ]] &&
|
||||||
source "$HOME/.fzf-extras/fzf-extras.sh"
|
source "$HOME/.fzf-extras/fzf-extras.sh"
|
||||||
|
|
||||||
# set vi mode
|
# This function is automatically called by zsh-vi-mode plugin
|
||||||
bindkey -v
|
# Set keybindings here so that they aren't overridden by zsh-vi-mode
|
||||||
# set ctrl-p and ctrl-n for vi insert mode
|
function zvm_after_init() {
|
||||||
bindkey -v '^P' history-substring-search-up #up-history
|
# set vi mode
|
||||||
bindkey -v '^N' history-substring-search-down #down-history
|
bindkey -v
|
||||||
|
# set ctrl-p and ctrl-n for vi insert mode
|
||||||
|
bindkey -v '^P' history-substring-search-up #up-history
|
||||||
|
bindkey -v '^N' history-substring-search-down #down-history
|
||||||
|
|
||||||
# mattmc3/zephyr path:plugins/editor
|
# mattmc3/zephyr path:plugins/editor
|
||||||
bindkey '^Z' symmetric-ctrl-z
|
bindkey '^Z' symmetric-ctrl-z
|
||||||
bindkey '^S' prepend-sudo
|
bindkey '^S' prepend-sudo
|
||||||
|
|
||||||
# Alt+Enter
|
# Alt+Enter
|
||||||
# To make shift+enter work in zsh we map Shift+Enter to Alt+Enter in kitty.
|
# To make shift+enter work in zsh we map Shift+Enter to Alt+Enter in kitty.
|
||||||
# There are autocommands in Neovim that set a user variable in kitty when we are in Neovim and unsets it when we exit.
|
# There are autocommands in Neovim that set a user variable in kitty when we are in Neovim and unsets it when we exit.
|
||||||
# This allows us to unmap Shift+Enter in kitty when inside Neovim.
|
# This allows us to unmap Shift+Enter in kitty when inside Neovim.
|
||||||
# By doing this we can use Shift+Enter for `forward-word`, which is autosuggest partial accept
|
# By doing this we can use Shift+Enter for `forward-word`, which is autosuggest partial accept
|
||||||
# in the autosuggest plugin in zsh, without interfering with the mapping in nvim.
|
# in the autosuggest plugin in zsh, without interfering with the mapping in nvim.
|
||||||
bindkey '^[^M' forward-word
|
bindkey '^[^M' forward-word
|
||||||
# bindkey '^R' fzf-history-widget
|
# bindkey '^R' fzf-history-widget
|
||||||
|
|
||||||
|
# [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
||||||
|
# Source skim keybindings. Skim repo is cloned into stow directory
|
||||||
|
# so we can use stow to install the man page. The stow binary still has
|
||||||
|
# to be installed seperately.
|
||||||
|
source "$STOW_DIR/skim/shell/key-bindings.zsh"
|
||||||
|
}
|
||||||
|
|
||||||
# Source anything in .zshrc.d.
|
# Source anything in .zshrc.d.
|
||||||
for _rc in ${ZDOTDIR:-$HOME}/.zshrc.d/*.zsh; do
|
for _rc in ${ZDOTDIR:-$HOME}/.zshrc.d/*.zsh; do
|
||||||
# Ignore tilde files.
|
# Ignore tilde files.
|
||||||
|
|
||||||
if [[ $_rc:t != '~'* ]]; then
|
if [[ $_rc:t != '~'* ]]; then
|
||||||
source "$_rc"
|
source "$_rc"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
unset _rc
|
unset _rc
|
||||||
|
|
||||||
# [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
|
||||||
# Source skim keybindings. Skim repo is cloned into stow directory
|
|
||||||
# so we can use stow to install the man page. The stow binary still has
|
|
||||||
# to be installed seperately.
|
|
||||||
source "$STOW_DIR/skim/shell/key-bindings.zsh"
|
|
||||||
|
|
||||||
export NVM_DIR="$HOME/.config/nvm"
|
export NVM_DIR="$HOME/.config/nvm"
|
||||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
||||||
|
|
|
||||||
|
|
@ -30,3 +30,6 @@ alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo
|
||||||
|
|
||||||
## Use main clipbard by default with xclip
|
## Use main clipbard by default with xclip
|
||||||
alias xclip="xclip -selection clipboard"
|
alias xclip="xclip -selection clipboard"
|
||||||
|
|
||||||
|
# Qalc
|
||||||
|
alias q=qalc
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,14 @@
|
||||||
# vim: set filetype=sh nospell:
|
# vim: set filetype=sh nospell:
|
||||||
|
|
||||||
|
export PAGER='ov'
|
||||||
|
export VISUAL='nvim'
|
||||||
|
export EDITOR='nvim'
|
||||||
|
|
||||||
|
export MANPAGER="sh -c 'col -bx | bat -l man -p'"
|
||||||
|
export MANROFFOPT="-c"
|
||||||
|
|
||||||
|
export BAT_PAGER="ov -FX"
|
||||||
|
|
||||||
# Set language.
|
# Set language.
|
||||||
export LANG=${LANG:-en_US.UTF-8}
|
export LANG=${LANG:-en_US.UTF-8}
|
||||||
|
|
||||||
|
|
@ -39,3 +48,12 @@ HISTORY_SUBSTRING_SEARCH_PREFIXED=1 # Match against the start of each history en
|
||||||
|
|
||||||
# for `Sam-programs/zsh-calc` plugin
|
# for `Sam-programs/zsh-calc` plugin
|
||||||
CALC_CMD="qalc -t -c -f <(echo \$BUFFER)"
|
CALC_CMD="qalc -t -c -f <(echo \$BUFFER)"
|
||||||
|
|
||||||
|
# zsh-vi-mode stuff
|
||||||
|
ZVM_VI_HIGHLIGHT_FOREGROUND=black
|
||||||
|
ZVM_VI_HIGHLIGHT_BACKGROUND=green
|
||||||
|
ZVM_NORMAL_MODE_CURSOR=$ZVM_CURSOR_BLINKING_BLOCK
|
||||||
|
ZVM_INSERT_MODE_CURSOR=$ZVM_CURSOR_BLINKING_BEAM
|
||||||
|
ZVM_VISUAL_MODE_CURSOR=$ZVM_CURSOR_BLOCK
|
||||||
|
ZVM_VISUAL_LINE_MODE_CURSOR=$ZVM_CURSOR_BLOCK
|
||||||
|
ZVM_OPPEND_MODE_CURSOR=$ZVM_CURSOR_BLINKING_UNDERLINE
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue