X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.zshrc;h=9d9ed49591ffadadabdd852e7fe508b3a048259e;hb=HEAD;hp=16045ff6eb4bc583b74d6ab4986d192f54d6f7d2;hpb=d96eb1503cc2da99de468109d8dbf14f5a796469;p=user%2Fhenk%2Fvcsh%2Fzsh.git diff --git a/.zshrc b/.zshrc index 16045ff..9d9ed49 100644 --- a/.zshrc +++ b/.zshrc @@ -2,60 +2,48 @@ # zmodload zsh/zprof -# exports are usually independent and standalone -# so they can stay at the top +# settings for the zsh don’t get exported # where to write history -export HISTFILE=~/.zsh_history -export HISTSIZE=1000000000 -export SAVEHIST=1000000000 - -export ANSIBLE_NOCOWS=1 -export ANSIBLE_STRATEGY=mitogen_linear +HISTFILE=~/.zsh_history +HISTSIZE=1000000000 +SAVEHIST=1000000000 -# what is that for exactly? maybe taskwarrior? or timewarrior? +# print time needed for execution when it takes longer than this value REPORTTIME=10 + ## define word characters (for stuff like backward-word, forward-word, backward-kill-word,..) ## these are NOT separators but chars considered part of a word -#WORDCHARS='*?_-.[]~=/&;!#$%^(){}<>' # the default - -# zsh you-should-use -export YSU_MODE=ALL - -# I want sbin executables available -export PATH=${PATH}:/usr/local/sbin:/sbin:/usr/sbin -export PATH=${PATH}:~/bin +## these are NOT respected by e.g. vi-backward-kill-word, it seems +# WORDCHARS='*?_-.[]~=/&;!#$%^(){}<>' # the default +## see below how to solve this with select-word-style module -# colors for newt/whiptail (for debconf, needrestart, etc.) -# works better with selenized colorscheme -export NEWT_COLORS='checkbox=yellow,;roottext=yellow,' # where zsh looks for functions + +# add my own functions fpath=(~/.zsh_functions $fpath) # hashed directories are usually independent and standalone # so they can stay at the top -hash -d diary=~/Data/henksfiles/workinprogress/Dokumente/diary -hash -d lifedocs=~/Data/henksfiles/workinprogress/Dokumente/Leben +hash -d diary=~/Data/personal/henk/workinprogress/Dokumente/diary +hash -d lifedocs=~/Data/personal/henk/workinprogress/Dokumente/Leben hash -d bewerbung=~/Data/personal/henk/workinprogress/Dokumente/Arbeit/bewerbung -hash -d rezepte=~/Data/henksfiles/workinprogress/Dokumente/rezepte/cuisine -hash -d templates=~/Data/henksfiles/workinprogress/templates +hash -d rezepte=~/Data/personal/henk/workinprogress/Dokumente/rezepte/cuisine +hash -d templates=~/Data/personal/henk/workinprogress/templates hash -d gitignore=~/Data/public/software/gitignore hash -d doc=/usr/share/doc -hash -d TODO=~/Data/henksfiles/TODO/ -hash -d fortunes=~/Data/henksfiles/workinprogress/Dokumente/fortunes/ +hash -d TODO=~/Data/personal/henk/TODO/ +hash -d fortunes=~/Data/personal/henk/workinprogress/Dokumente/fortunes/ # aliases are usually independent and standalone source ~/.zsh_aliases -# TODO break this up or make functions or get rid? -source ~/.zsh_qemu # load plugin manager after all 'static' stuff is done -# source ~/Data/public/software/zinit/zinit.zsh source "${HOME}/.zgenom/zgenom.zsh" # Check for plugin and zgenom updates every 7 days # This does not increase the startup time. @@ -63,8 +51,6 @@ zgenom autoupdate # mostly static stuff, env vars -# zinit load 'https://github.com/joel-porquet/zsh-dircolors-solarized' -# zinit load "https://github.com/greymd/tmux-xpanes" zgenom load 'https://github.com/joel-porquet/zsh-dircolors-solarized' zgenom load "https://github.com/greymd/tmux-xpanes" @@ -74,19 +60,29 @@ zgenom load "https://github.com/greymd/tmux-xpanes" setopt AUTO_CD setopt CHASE_LINKS +# switch +/- when referring to the dirstack +setopt PUSHD_MINUS + +# Make cd push the old directory onto the directory stack +setopt AUTO_PUSHD + setopt AUTO_NAME_DIRS -setopt BRACE_CCL -#setopt EXTENDED_GLOB +# this should not be needed ever +# unclear why it is even implemented +# all relevant functionality should be possible without this anyway +# see #zsh@libera on 2024-04-14 +# setopt BRACE_CCL +setopt EXTENDED_GLOB setopt MARK_DIRS setopt NUMERIC_GLOB_SORT setopt RC_EXPAND_PARAM #setopt WARN_CREATE_GLOBAL setopt GLOB_DOTS -# remove previous entries from history -setopt HIST_IGNORE_ALL_DUPS -# do not write lines starting with a space to history file +# Ignore a duplicate of the previous command +setopt HIST_IGNORE_DUPS +# Do not save commands starting with a space to history setopt HIST_IGNORE_SPACE # Remove superfluous blanks setopt HIST_REDUCE_BLANKS @@ -97,6 +93,10 @@ setopt EXTENDED_HISTORY # write line to history file when finished, not when started, to have correct runtime setopt INC_APPEND_HISTORY_TIME +# Recognize comments on the command line +setopt INTERACTIVE_COMMENTS + +# Error on a redirections which would overwrite an existing file setopt NO_CLOBBER setopt CORRECT setopt CORRECT_ALL @@ -122,7 +122,6 @@ setopt NO_SH_WORD_SPLIT # load before completion system initialization -# zinit load 'https://github.com/zsh-users/zsh-completions' zgenom load 'https://github.com/zsh-users/zsh-completions' # initialize completion system before loading plugins and external configs @@ -142,9 +141,18 @@ autoload ~/.zsh_functions/[^_]*(-.:t) autoload -Uz vcs_info -autoload -Uz zcalc -autoload -Uz zargs +zstyle ':vcs_info:*' enable git + +# similar to xargs +autoload -U zargs +# similar to rename or mmv +autoload -U zmv +autoload -U zln +autoload -U zcp + + +# zle customization # spawn editor on current command line autoload -Uz edit-command-line @@ -152,13 +160,16 @@ zle -N edit-command-line bindkey -M vicmd '^X^E' edit-command-line bindkey -M viins '^X^E' edit-command-line +# show globbing results live +autoload insert-files +zle -N insert-files +bindkey '^Xf' insert-files + #this mainly sets vars, binds keys, does zle stuff -# zinit load 'https://github.com/laurenkt/zsh-vimto' -zgenom load 'https://github.com/laurenkt/zsh-vimto' +# zgenom load 'https://github.com/laurenkt/zsh-vimto' # functions and an autoload, should be fine here -# zinit load 'https://github.com/MichaelAquilina/zsh-you-should-use' zgenom load 'https://github.com/MichaelAquilina/zsh-you-should-use' @@ -168,14 +179,11 @@ zgenom load 'https://github.com/MichaelAquilina/zsh-you-should-use' # source ~/.zsh_functions_taskwarrior -# TODO break this up -source ~/.zsh_local - -# TODO break this up -source ~/.env_* - +for f in ~/.zsh_local*(N) +do + source $f +done -typeset -U path #zle -N zle-line-init #zle -N zle-keymap-select @@ -184,9 +192,24 @@ typeset -U path # keybindings might have been changed by plugins, etc. # so they go more to the bottom +# the vi bindings for these do not respect WORDCHARS and are not replaced by the select-word-style functions +bindkey -M vicmd 'w' forward-word +bindkey -M vicmd 'b' backward-word +bindkey -M viins '^W' backward-kill-word + +# default vi history search is strange +bindkey -M viins '^R' history-incremental-search-backward + + +# better word matching +autoload -U select-word-style +select-word-style normal +# these characters do _not_ separate words but are part of words +zstyle ':zle:*' word-chars '*?[]~;!#$%^(){}<>' + +LP_ENABLE_TIME=1 # should probably be closer to the bottom than the top? -# zinit load 'https://github.com/nojhan/liquidprompt' zgenom load 'https://github.com/nojhan/liquidprompt' @@ -194,6 +217,26 @@ zgenom load 'https://github.com/nojhan/liquidprompt' # see https://github.com/zsh-users/zsh-syntax-highlighting source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +eval "$(zoxide init zsh)" + +FZF_TMUX=1 +FZF_CTRL_T_COMMAND='command fdfind --hidden' +FZF_ALT_C_COMMAND='command fdfind --hidden --type d' +source /usr/share/doc/fzf/examples/key-bindings.zsh +source /usr/share/doc/fzf/examples/completion.zsh + +# Use fd (https://github.com/sharkdp/fd) instead of the default find +# command for listing path candidates. +# - The first argument to the function ($1) is the base path to start traversal +# - See the source code (completion.{bash,zsh}) for the details. +_fzf_compgen_path() { + fdfind --hidden --follow --exclude ".git" . "$1" +} + +# Use fd to generate the list for directory completion +_fzf_compgen_dir() { + fdfind --type d --hidden --follow --exclude ".git" . "$1" +} # commands to run after initialization is complete #task awaiting