From 92bc3d7f212447e12bfc52a3c09e236e308af87e Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 13 Dec 2022 16:45:40 +0100 Subject: [PATCH 01/60] Add shome shortcuts --- aliases/functions | 2 ++ dirs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/aliases/functions b/aliases/functions index 9b434b2..b45f081 100644 --- a/aliases/functions +++ b/aliases/functions @@ -258,6 +258,8 @@ alias -g T="| tail" alias -g XS='$(xclip -o -selection primary)' alias -g XC='$(xclip -o -selection clipboard)' +alias -g GITROOT='$(git rev-parse --show-toplevel)' + alias -s log=vimpager #}}} diff --git a/dirs b/dirs index 7816c9b..97e62f7 100755 --- a/dirs +++ b/dirs @@ -1 +1,3 @@ m=/run/media/$USER/ +j=${XDG_DATA_HOME}/jails +rc=${j}/webapp-rocketchat/Downloads From 45678c7037a3c1f297fc0295aa72b0549fd058b8 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 13 Dec 2022 17:43:38 +0100 Subject: [PATCH 02/60] Migrate from zplug to zim --- .zimrc | 15 +++++++++++++++ bindings.zsh | 19 +++++++++++++++++++ .../highlight-config.plugin.zsh | 2 ++ zshrc | 16 +++++++++++++++- 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 .zimrc diff --git a/.zimrc b/.zimrc new file mode 100644 index 0000000..c10e6d7 --- /dev/null +++ b/.zimrc @@ -0,0 +1,15 @@ +zmodule jreese/zsh-titles + +zmodule crater2150-zsh/fzf-widgets +zmodule crater2150-zsh/conf +zmodule crater2150-zsh/chroma-z + +zmodule $ZDOTDIR/plugins/tmpsrc +zmodule $ZDOTDIR/plugins/pyenv + +zmodule $ZDOTDIR/plugins/highlight-config +zmodule zsh-users/zsh-syntax-highlighting + +zmodule ohmyzsh/ohmyzsh --root plugins/ng + +zmodule urbainvaes/fzf-marks diff --git a/bindings.zsh b/bindings.zsh index 441fd6c..5e7bdee 100644 --- a/bindings.zsh +++ b/bindings.zsh @@ -92,3 +92,22 @@ fi zle-venv() { zle push-line; BUFFER="venv"; zle accept-line } zle -N zle-venv bindkey "\ev" zle-venv + +# Map widgets to key +bindkey "\ec" fzf-change-directory +bindkey "^r" fzf-insert-history +bindkey "^xf" fzf-insert-files +bindkey "^xd" fzf-insert-directory +bindkey "^xn" fzf-insert-named-directory + +# Start fzf in a tmux pane +FZF_WIDGET_TMUX=1 + +# use fd for finding directories and files +FZF_CHANGE_DIR_FIND_COMMAND="fd -t d" +FZF_INSERT_DIR_COMMAND="fd -t d" +FZF_INSERT_FILES_COMMAND="fd -t f" +FZF_EDIT_FILES_COMMAND="fd -t f" + +# modify history command to remove duplicates +FZF_HISTORY_COMMAND="fc -l 1 | sed s/ *[0-9]* //g | awk !seen[\$0]++" diff --git a/plugins/highlight-config/highlight-config.plugin.zsh b/plugins/highlight-config/highlight-config.plugin.zsh index de7bf31..dec3ff9 100644 --- a/plugins/highlight-config/highlight-config.plugin.zsh +++ b/plugins/highlight-config/highlight-config.plugin.zsh @@ -1,3 +1,5 @@ +typeset -gA ZSH_HIGHLIGHT_STYLES + ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern) if [[ "`tput colors`" == "256" ]] || [[ "`tput colors`" == "88" ]] ; then diff --git a/zshrc b/zshrc index 93832b6..f7b0042 100644 --- a/zshrc +++ b/zshrc @@ -1,3 +1,5 @@ +typeset -U path + HISTFILE=~/.histfile HISTSIZE=100000 SAVEHIST=100000 @@ -57,7 +59,19 @@ function(){ . $(zdotfile completion.zsh) -source $(zdotfile zplug.zsh) + +ZIM_HOME=${XDG_CACHE_HOME:-$HOME/.cache}/zim +if [[ ! -e ${ZIM_HOME}/zimfw.zsh ]]; then + curl -fsSL --create-dirs -o ${ZIM_HOME}/zimfw.zsh \ + https://github.com/zimfw/zimfw/releases/latest/download/zimfw.zsh +fi +if [[ ! ${ZIM_HOME}/init.zsh -nt ${ZDOTDIR:-${HOME}}/.zimrc ]]; then + source ${ZIM_HOME}/zimfw.zsh init -q +fi +source ${ZIM_HOME}/init.zsh + + +#source $(zdotfile zplug.zsh) . $(zdotfile bindings.zsh) From 887ffcf5988f0d48446e357bc7b1fa4f28fb9a33 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 12 Jan 2023 11:49:56 +0100 Subject: [PATCH 03/60] add dir alias --- aliases/functions | 2 +- dirs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/aliases/functions b/aliases/functions index 9b434b2..8dbf365 100644 --- a/aliases/functions +++ b/aliases/functions @@ -80,7 +80,7 @@ E() { # edit and refresh aliases aliases() { $EDITOR $(zdotfile aliases/${1:-functions}) - . $(zdotfile aliases)/* + source $(zdotfile aliases)/* } # per directory configuration diff --git a/dirs b/dirs index 7816c9b..3bf6aac 100755 --- a/dirs +++ b/dirs @@ -1 +1,2 @@ m=/run/media/$USER/ +rc=$HOME/.local/share/jails/webapp-rocketchat/ From b8a9b904473f18a0c49059ada111385ca8218bf2 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 13 Dec 2022 16:45:40 +0100 Subject: [PATCH 04/60] Add some shortcuts --- aliases/functions | 2 ++ dirs | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/aliases/functions b/aliases/functions index 8dbf365..33ef3a8 100644 --- a/aliases/functions +++ b/aliases/functions @@ -258,6 +258,8 @@ alias -g T="| tail" alias -g XS='$(xclip -o -selection primary)' alias -g XC='$(xclip -o -selection clipboard)' +alias -g GITROOT='$(git rev-parse --show-toplevel)' + alias -s log=vimpager #}}} diff --git a/dirs b/dirs index 3bf6aac..97e62f7 100755 --- a/dirs +++ b/dirs @@ -1,2 +1,3 @@ m=/run/media/$USER/ -rc=$HOME/.local/share/jails/webapp-rocketchat/ +j=${XDG_DATA_HOME}/jails +rc=${j}/webapp-rocketchat/Downloads From bae17dfdc5d3f2f09464fe673eebe5c01776b395 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 13 Dec 2022 17:43:38 +0100 Subject: [PATCH 05/60] Migrate from zplug to zim --- .zimrc | 15 +++++++++++++++ bindings.zsh | 19 +++++++++++++++++++ .../highlight-config.plugin.zsh | 2 ++ zshrc | 16 +++++++++++++++- 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 .zimrc diff --git a/.zimrc b/.zimrc new file mode 100644 index 0000000..c10e6d7 --- /dev/null +++ b/.zimrc @@ -0,0 +1,15 @@ +zmodule jreese/zsh-titles + +zmodule crater2150-zsh/fzf-widgets +zmodule crater2150-zsh/conf +zmodule crater2150-zsh/chroma-z + +zmodule $ZDOTDIR/plugins/tmpsrc +zmodule $ZDOTDIR/plugins/pyenv + +zmodule $ZDOTDIR/plugins/highlight-config +zmodule zsh-users/zsh-syntax-highlighting + +zmodule ohmyzsh/ohmyzsh --root plugins/ng + +zmodule urbainvaes/fzf-marks diff --git a/bindings.zsh b/bindings.zsh index 441fd6c..5e7bdee 100644 --- a/bindings.zsh +++ b/bindings.zsh @@ -92,3 +92,22 @@ fi zle-venv() { zle push-line; BUFFER="venv"; zle accept-line } zle -N zle-venv bindkey "\ev" zle-venv + +# Map widgets to key +bindkey "\ec" fzf-change-directory +bindkey "^r" fzf-insert-history +bindkey "^xf" fzf-insert-files +bindkey "^xd" fzf-insert-directory +bindkey "^xn" fzf-insert-named-directory + +# Start fzf in a tmux pane +FZF_WIDGET_TMUX=1 + +# use fd for finding directories and files +FZF_CHANGE_DIR_FIND_COMMAND="fd -t d" +FZF_INSERT_DIR_COMMAND="fd -t d" +FZF_INSERT_FILES_COMMAND="fd -t f" +FZF_EDIT_FILES_COMMAND="fd -t f" + +# modify history command to remove duplicates +FZF_HISTORY_COMMAND="fc -l 1 | sed s/ *[0-9]* //g | awk !seen[\$0]++" diff --git a/plugins/highlight-config/highlight-config.plugin.zsh b/plugins/highlight-config/highlight-config.plugin.zsh index de7bf31..dec3ff9 100644 --- a/plugins/highlight-config/highlight-config.plugin.zsh +++ b/plugins/highlight-config/highlight-config.plugin.zsh @@ -1,3 +1,5 @@ +typeset -gA ZSH_HIGHLIGHT_STYLES + ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern) if [[ "`tput colors`" == "256" ]] || [[ "`tput colors`" == "88" ]] ; then diff --git a/zshrc b/zshrc index 93832b6..f7b0042 100644 --- a/zshrc +++ b/zshrc @@ -1,3 +1,5 @@ +typeset -U path + HISTFILE=~/.histfile HISTSIZE=100000 SAVEHIST=100000 @@ -57,7 +59,19 @@ function(){ . $(zdotfile completion.zsh) -source $(zdotfile zplug.zsh) + +ZIM_HOME=${XDG_CACHE_HOME:-$HOME/.cache}/zim +if [[ ! -e ${ZIM_HOME}/zimfw.zsh ]]; then + curl -fsSL --create-dirs -o ${ZIM_HOME}/zimfw.zsh \ + https://github.com/zimfw/zimfw/releases/latest/download/zimfw.zsh +fi +if [[ ! ${ZIM_HOME}/init.zsh -nt ${ZDOTDIR:-${HOME}}/.zimrc ]]; then + source ${ZIM_HOME}/zimfw.zsh init -q +fi +source ${ZIM_HOME}/init.zsh + + +#source $(zdotfile zplug.zsh) . $(zdotfile bindings.zsh) From e18474d56b42ae1220bebe928243cba56109d2f1 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Fri, 13 Jan 2023 11:38:12 +0100 Subject: [PATCH 06/60] Fix quoting in fzf-widget settings, switch to active fork --- .zimrc | 2 +- bindings.zsh | 6 +----- zplug | 1 - zshrc | 3 +-- 4 files changed, 3 insertions(+), 9 deletions(-) delete mode 160000 zplug diff --git a/.zimrc b/.zimrc index c10e6d7..f2db05f 100644 --- a/.zimrc +++ b/.zimrc @@ -1,6 +1,6 @@ zmodule jreese/zsh-titles -zmodule crater2150-zsh/fzf-widgets +zmodule SmartFinn/fzf-widgets zmodule crater2150-zsh/conf zmodule crater2150-zsh/chroma-z diff --git a/bindings.zsh b/bindings.zsh index 5e7bdee..aea5cd8 100644 --- a/bindings.zsh +++ b/bindings.zsh @@ -100,14 +100,10 @@ bindkey "^xf" fzf-insert-files bindkey "^xd" fzf-insert-directory bindkey "^xn" fzf-insert-named-directory -# Start fzf in a tmux pane -FZF_WIDGET_TMUX=1 - -# use fd for finding directories and files FZF_CHANGE_DIR_FIND_COMMAND="fd -t d" FZF_INSERT_DIR_COMMAND="fd -t d" FZF_INSERT_FILES_COMMAND="fd -t f" FZF_EDIT_FILES_COMMAND="fd -t f" # modify history command to remove duplicates -FZF_HISTORY_COMMAND="fc -l 1 | sed s/ *[0-9]* //g | awk !seen[\$0]++" +FZF_HISTORY_COMMAND="fc -l 1 | sed 's/ *[0-9]* //g' | awk '!seen[\$0]++'" diff --git a/zplug b/zplug deleted file mode 160000 index 18cfcd4..0000000 --- a/zplug +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 18cfcd4f761eceaf2ca63a291d11782d0f8b590e diff --git a/zshrc b/zshrc index f7b0042..7fdbe9a 100644 --- a/zshrc +++ b/zshrc @@ -57,8 +57,6 @@ function(){ try-source $(zdotfile dirs) } -. $(zdotfile completion.zsh) - ZIM_HOME=${XDG_CACHE_HOME:-$HOME/.cache}/zim if [[ ! -e ${ZIM_HOME}/zimfw.zsh ]]; then @@ -71,6 +69,7 @@ fi source ${ZIM_HOME}/init.zsh +. $(zdotfile completion.zsh) #source $(zdotfile zplug.zsh) . $(zdotfile bindings.zsh) From 29829e9c3685f3eaf084bfdc90c9b64b2543d913 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Fri, 13 Jan 2023 11:38:12 +0100 Subject: [PATCH 07/60] Fix quoting in fzf-widget settings, switch to active fork --- .zimrc | 2 +- bindings.zsh | 6 +----- zplug | 1 - zshrc | 3 +-- 4 files changed, 3 insertions(+), 9 deletions(-) delete mode 160000 zplug diff --git a/.zimrc b/.zimrc index c10e6d7..f2db05f 100644 --- a/.zimrc +++ b/.zimrc @@ -1,6 +1,6 @@ zmodule jreese/zsh-titles -zmodule crater2150-zsh/fzf-widgets +zmodule SmartFinn/fzf-widgets zmodule crater2150-zsh/conf zmodule crater2150-zsh/chroma-z diff --git a/bindings.zsh b/bindings.zsh index 5e7bdee..aea5cd8 100644 --- a/bindings.zsh +++ b/bindings.zsh @@ -100,14 +100,10 @@ bindkey "^xf" fzf-insert-files bindkey "^xd" fzf-insert-directory bindkey "^xn" fzf-insert-named-directory -# Start fzf in a tmux pane -FZF_WIDGET_TMUX=1 - -# use fd for finding directories and files FZF_CHANGE_DIR_FIND_COMMAND="fd -t d" FZF_INSERT_DIR_COMMAND="fd -t d" FZF_INSERT_FILES_COMMAND="fd -t f" FZF_EDIT_FILES_COMMAND="fd -t f" # modify history command to remove duplicates -FZF_HISTORY_COMMAND="fc -l 1 | sed s/ *[0-9]* //g | awk !seen[\$0]++" +FZF_HISTORY_COMMAND="fc -l 1 | sed 's/ *[0-9]* //g' | awk '!seen[\$0]++'" diff --git a/zplug b/zplug deleted file mode 160000 index 18cfcd4..0000000 --- a/zplug +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 18cfcd4f761eceaf2ca63a291d11782d0f8b590e diff --git a/zshrc b/zshrc index f7b0042..7fdbe9a 100644 --- a/zshrc +++ b/zshrc @@ -57,8 +57,6 @@ function(){ try-source $(zdotfile dirs) } -. $(zdotfile completion.zsh) - ZIM_HOME=${XDG_CACHE_HOME:-$HOME/.cache}/zim if [[ ! -e ${ZIM_HOME}/zimfw.zsh ]]; then @@ -71,6 +69,7 @@ fi source ${ZIM_HOME}/init.zsh +. $(zdotfile completion.zsh) #source $(zdotfile zplug.zsh) . $(zdotfile bindings.zsh) From e181014465e553cf53b2ac213415e0b01de276e7 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sat, 22 May 2021 17:39:39 +0000 Subject: [PATCH 08/60] Remove autoforking aliases --- aliases/fork_by_default | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100755 aliases/fork_by_default diff --git a/aliases/fork_by_default b/aliases/fork_by_default deleted file mode 100755 index 66bb39b..0000000 --- a/aliases/fork_by_default +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/zsh - -local forkprogs=( - geeqie - feh -) - -for i in $forkprogs; do - alias $i="fork $i" -done From f50b7bf2774ba45eeb81e96237eb19e99e1933fd Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sat, 5 Jun 2021 16:55:27 +0000 Subject: [PATCH 09/60] Use $PAGER instead of hardcoded less --- aliases/functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aliases/functions b/aliases/functions index 33ef3a8..8ba9051 100644 --- a/aliases/functions +++ b/aliases/functions @@ -251,7 +251,8 @@ btrfs-subvolume-force-delete() { # lazy shortcuts alias -g G="| grep" -alias -g L="| less" +alias -g L="| ${PAGER:-less}" +alias -g LE="2>&1 | ${PAGER:-less}" alias -g T="| tail" # xclipboard From 2ae1f05e829954ad16234faa1ab9155c31861c4e Mon Sep 17 00:00:00 2001 From: crater2150 Date: Fri, 20 Jan 2023 15:11:01 +0100 Subject: [PATCH 10/60] Update _sv and _sv-manage completion --- compdef/_sv | 10 ++++++---- compdef/_sv-manage | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/compdef/_sv b/compdef/_sv index 673a671..d56981e 100644 --- a/compdef/_sv +++ b/compdef/_sv @@ -1,7 +1,7 @@ #compdef sv # completion for runit sv(1) -# Christian Neukirchen +# Leah Neukirchen # runit 2.1.1, services in /var/service are completed by default local ret=1 services @@ -35,10 +35,12 @@ cmds) check ret=0;; args) - if [[ $BUFFER == sudo* ]] then - services=( /var/service/*(-/N:t) ) + if [[ $BUFFER == "sudo "* + || $BUFFER == "doas "* + || $BUFFER == "su "*-c* ]] then + services=( /var/service/*(-/N:t) ) else - services=( ${SVDIR:-/var/service}/*(-/N:t) ) + services=( ${SVDIR:-/var/service}/*(-/N:t) ) fi (( $#services )) && _values services $services && ret=0 [[ $words[CURRENT] = */* ]] && _directories && ret=0 diff --git a/compdef/_sv-manage b/compdef/_sv-manage index c7ae698..c886896 100644 --- a/compdef/_sv-manage +++ b/compdef/_sv-manage @@ -5,4 +5,4 @@ local context state line _arguments \ "1:Action:(add rm remove)"\ - "*:service:_files -W /etc/sv" + "*:service:_files -W ${SVDIR_TEMPLATES:-/etc/sv}" From 77214e5f5eaefcd5b4a871483629f9c327b1c047 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 23 Jan 2023 15:31:22 +0100 Subject: [PATCH 11/60] Add env vars --- env/20_services.zsh | 1 + env/50_nodejs.zsh | 1 + 2 files changed, 2 insertions(+) diff --git a/env/20_services.zsh b/env/20_services.zsh index b6e358c..414be03 100644 --- a/env/20_services.zsh +++ b/env/20_services.zsh @@ -1,3 +1,4 @@ if [[ $DISPLAY && $UID != 0 ]]; then export SVDIR="$HOME/.local/session_service" + export SVDIR_TEMPLATES="$HOME/.service-available" fi diff --git a/env/50_nodejs.zsh b/env/50_nodejs.zsh index 507f907..9196f29 100644 --- a/env/50_nodejs.zsh +++ b/env/50_nodejs.zsh @@ -1,3 +1,4 @@ export NPM_PACKAGES="${XDG_DATA_HOME}/npm-packages" export NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH" export PATH="$PATH:$NPM_PACKAGES/bin" +export MANPATH="${MANPATH}:$NPM_PACKAGES/share/man" From d86ef1c7b9a33f893f35ffae3d2ba1b16b95e9d1 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 2 Feb 2023 13:03:53 +0100 Subject: [PATCH 12/60] Update config, among other things improve batstat --- aliases/functions | 43 +++++++++++++++++++++++++++++++++++++++++++ aliases/void | 4 ++-- zplug.zsh | 5 +++-- zprofile | 9 +++++++++ zshrc | 4 ++++ 5 files changed, 61 insertions(+), 4 deletions(-) diff --git a/aliases/functions b/aliases/functions index 8ba9051..1f32177 100644 --- a/aliases/functions +++ b/aliases/functions @@ -311,6 +311,49 @@ alias luarocks="luarocks --local" alias icat="kitty +kitten icat" +local function hour-float-to-time() { + printf "%d:%02dh" $1 $(( $1 * 60 % 60 )) +} + +batstat() { + for bat in /sys/class/power_supply/BAT*; do + local energy_full=$(<$bat/energy_full) + local energy_now=$(<$bat/energy_now) + local power_now=$(<$bat/power_now) + local bat_status=$(<$bat/status) + local remain_text + local remain + case $bat_status in + Charging) + remain=$(((energy_full - energy_now) / power_now)) + remain_text=", $(hour-float-to-time $remain) until full" + ;; + Discharging) + remain=$((energy_now / power_now)) + remain_text=", $(hour-float-to-time $remain) left" + ;; + *) + remain_text="" + ;; + esac + + printf "%s: %.1f %%, %s%s\n" \ + ${bat:t} \ + $(( energy_now * 100.0 / energy_full )) \ + $bat_status \ + $remain_text + done +} + +if [[ $DISPLAY ]] && xinput | grep -q Wacom && xrandr | grep -q eDP1; then + xrandr() { + command xrandr $@ + for dev in $(xinput | grep Wacom | grep -oP '(?<=id=)\d*'); do + xinput map-to-output $dev eDP1 + done + } +fi + # vim: foldmethod=marker function lastdl() { diff --git a/aliases/void b/aliases/void index 53cfbce..52e91d0 100644 --- a/aliases/void +++ b/aliases/void @@ -62,12 +62,12 @@ sv-manage() { case "$action" in add) for service in "$@"; do - ln -s /etc/sv/${service:s#/##} /var/service + ln -s ${SVDIR_TEMPLATES:-/etc/sv}/${service:s#/##} ${SVDIR:-/var/service} done ;; remove|rm) for service in "$@"; do - rm /var/service/${service:s#/##} + rm ${SVDIR:-/var/service}/${service:s#/##} done ;; esac diff --git a/zplug.zsh b/zplug.zsh index 69eef15..b17b63c 100644 --- a/zplug.zsh +++ b/zplug.zsh @@ -3,7 +3,7 @@ source $(zdotfile zplug/init.zsh) zplug 'zplug/zplug', hook-build:'zplug --self-manage' -zplug "MichaelAquilina/zsh-you-should-use" +#zplug "MichaelAquilina/zsh-you-should-use" zplug 'jreese/zsh-titles' zplug 'crater2150-zsh/fzf-widgets' @@ -40,6 +40,7 @@ if zplug check 'crater2150-zsh/fzf-widgets'; then bindkey '\ec' fzf-change-directory bindkey '^r' fzf-insert-history bindkey '^xf' fzf-insert-files + bindkey '^xF' fzf-insert-files-global bindkey '^xd' fzf-insert-directory bindkey '^xn' fzf-insert-named-directory @@ -49,7 +50,7 @@ if zplug check 'crater2150-zsh/fzf-widgets'; then # use fd for finding directories and files FZF_CHANGE_DIR_FIND_COMMAND="fd -t d" FZF_INSERT_DIR_COMMAND="fd -t d" - FZF_INSERT_FILES_COMMAND="fd -t f" + FZF_INSERT_FILE_COMMAND="fd -t f . $HOME" FZF_EDIT_FILES_COMMAND="fd -t f" # modify history command to remove duplicates diff --git a/zprofile b/zprofile index 05fe3aa..22109b2 100644 --- a/zprofile +++ b/zprofile @@ -1,6 +1,15 @@ # /etc/zsh/zprofile # $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile-1,v 1.1 2010/08/15 12:21:56 tove Exp $ +append_path () { + case ":$PATH:" in + *:"$1":*) + ;; + *) + PATH="${PATH:+$PATH:}$1" + esac +} + # Load environment settings from profile.env, which is created by # env-update from the files in /etc/env.d if [ -e /etc/profile.env ] ; then diff --git a/zshrc b/zshrc index 7fdbe9a..9dccfcb 100644 --- a/zshrc +++ b/zshrc @@ -102,3 +102,7 @@ if [[ -e $HOME/.calendars ]]; then } __chromaz_extra_left+=_prompt_todos fi +# >>> scala-cli completions >>> +fpath=("/home/crater2150/.local/share/scalacli/completions/zsh" $fpath) +compinit +# <<< scala-cli completions <<< From 2f45a347ac75db308d96db93c2b4aaeed09502d7 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 2 Mar 2023 16:07:52 +0100 Subject: [PATCH 13/60] Add mails from cron to prompt --- aliases/functions | 2 ++ completion.zsh | 1 + zshrc | 12 ++++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/aliases/functions b/aliases/functions index 1f32177..0b62299 100644 --- a/aliases/functions +++ b/aliases/functions @@ -13,6 +13,8 @@ alias :q="exit" alias rget="rsync -rP --append-verify --inplace" alias 7zu="7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on" +alias cronmail="mutt -f $MAIL" + if ! command -v fd >/dev/null; then fd() { if [[ "$1" =~ "-*" ]]; then diff --git a/completion.zsh b/completion.zsh index 14b3509..0f4a3b2 100644 --- a/completion.zsh +++ b/completion.zsh @@ -1,5 +1,6 @@ # autoload completions fpath=( "${ZDOTDIR:+$ZDOTDIR/compdef}" "/etc/zsh/compdef" $fpath ) +fpath=("$XDG_DATA_HOME/scalacli/completions/zsh" $fpath) [[ -n $(echo /etc/zsh/compdef/*(N:t)) ]] && autoload -U /etc/zsh/compdef/*(N:t) [[ -n $(echo $ZDOTDIR/compdef/*(N:t)) ]] && autoload -U $ZDOTDIR/compdef/*(N:t) diff --git a/zshrc b/zshrc index 9dccfcb..5c6d2f2 100644 --- a/zshrc +++ b/zshrc @@ -102,7 +102,11 @@ if [[ -e $HOME/.calendars ]]; then } __chromaz_extra_left+=_prompt_todos fi -# >>> scala-cli completions >>> -fpath=("/home/crater2150/.local/share/scalacli/completions/zsh" $fpath) -compinit -# <<< scala-cli completions <<< + +if exists mail; then + _prompt_cron_mails() { + local newmails=$(mail -Hf $MAIL | grep -c '^.N') + [[ $newmails -gt 0 ]] && echo "Cron Notifications: $newmails" + } + __chromaz_extra_left+=_prompt_cron_mails +fi From 0cae13e4c167ed5844c69e7ca5855a4c29124141 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 2 Mar 2023 16:11:04 +0100 Subject: [PATCH 14/60] pyenv: install plugins --- plugins/pyenv/pyenv.plugin.zsh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh index d79d4e6..c6f5dda 100644 --- a/plugins/pyenv/pyenv.plugin.zsh +++ b/plugins/pyenv/pyenv.plugin.zsh @@ -18,6 +18,11 @@ else pyenv() { echo -n "pyenv is not installed. Install now? [yn] "; read -q || return git clone https://github.com/pyenv/pyenv.git $PYENV_ROOT + git clone https://github.com/pyenv/pyenv-update.git $PYENV_ROOT/plugins/pyenv-update + git clone https://github.com/pyenv/pyenv-virtualenv.git $PYENV_ROOT/plugins/pyenv-virtualenv + git clone https://github.com/jawshooah/pyenv-default-packages.git $PYENV_ROOT/plugins/pyenv-default-packages + git clone https://github.com/fizista/pyenv-choice.git $PYENV_ROOT/plugins/pyenv-choice + echo ptpython > $PYENV_ROOT/default-packages _init_pyenv } fi From 986347debf7b81fa2f1640b2ee9c08602a8731b6 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 8 Mar 2023 17:36:58 +0100 Subject: [PATCH 15/60] Small fixes --- aliases/void | 1 + zshrc | 1 + 2 files changed, 2 insertions(+) diff --git a/aliases/void b/aliases/void index 52e91d0..30cecf5 100644 --- a/aliases/void +++ b/aliases/void @@ -39,6 +39,7 @@ xupdate() { fi else xbps-install -SA "$@" + xcheckupdates fi } diff --git a/zshrc b/zshrc index 5c6d2f2..f091513 100644 --- a/zshrc +++ b/zshrc @@ -105,6 +105,7 @@ fi if exists mail; then _prompt_cron_mails() { + [[ ! -e $MAIL ]] && return local newmails=$(mail -Hf $MAIL | grep -c '^.N') [[ $newmails -gt 0 ]] && echo "Cron Notifications: $newmails" } From 615ff845fae1ea822602d6c4cdaad4bdcf12978c Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 2 Mar 2023 16:21:23 +0100 Subject: [PATCH 16/60] Updates --- .zimrc | 4 ++-- confs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.zimrc b/.zimrc index f2db05f..b2f5991 100644 --- a/.zimrc +++ b/.zimrc @@ -1,4 +1,4 @@ -zmodule jreese/zsh-titles +zmodule jreese/zsh-titles -n titles zmodule SmartFinn/fzf-widgets zmodule crater2150-zsh/conf @@ -10,6 +10,6 @@ zmodule $ZDOTDIR/plugins/pyenv zmodule $ZDOTDIR/plugins/highlight-config zmodule zsh-users/zsh-syntax-highlighting -zmodule ohmyzsh/ohmyzsh --root plugins/ng +zmodule ohmyzsh/ohmyzsh --root plugins/ng --fpath ./ zmodule urbainvaes/fzf-marks diff --git a/confs b/confs index 7004245..a6c81a0 100755 --- a/confs +++ b/confs @@ -11,7 +11,7 @@ nvim-plug $XDG_CONFIG_HOME/nvim/packages.vim offlineimap $XDG_CONFIG_HOME/offlineimap/config qutebrowser $XDG_CONFIG_HOME/qutebrowser/ qutebrowser-scripts $XDG_DATA_HOME/qutebrowser/userscripts -ssh $HOME/.ssh/config +ssh $HOME/.ssh/ vdirsyncer $XDG_CONFIG_HOME/vdirsyncer/config vim $XDG_CONFIG_HOME/vim xd $XDG_CONFIG_HOME/xd.conf From b6f49344f3fac736a0e6b67390cf8e7604ac5bbd Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 2 Mar 2023 16:21:35 +0100 Subject: [PATCH 17/60] Override VCS_INFO_bydir_detect because of problems with NFS --- functions/VCS_INFO_bydir_detect | 41 +++++++++++++++++++++++++++++++++ zshrc | 3 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 functions/VCS_INFO_bydir_detect diff --git a/functions/VCS_INFO_bydir_detect b/functions/VCS_INFO_bydir_detect new file mode 100644 index 0000000..0d313b2 --- /dev/null +++ b/functions/VCS_INFO_bydir_detect @@ -0,0 +1,41 @@ +## vim:ft=zsh +## Written by Frank Terbeck +## Distributed under the same BSD-ish license as zsh itself. + +# Helper function for VCS_INFO_detect_* +# +# Usage: +# vcs_comm[detect_need_file]=FILENAMES VCS_INFO_bydir_detect DIRNAME +# where DIRNAME is a directory name and FILENAMES is a space-separated list +# of filenames. +# +# If any parent directory of the current working directory, other than the root +# directory, contains a subdirectory named DIRNAME that contains a file whose name +# is in FILENAMES, set vcs_comm[basedir] to the path of that parent directory and +# return true. Otherwise, return false. + +setopt localoptions NO_shwordsplit +local dirname=$1 +local basedir="." file + +basedir=$(realpath ${basedir}) +while [[ ${basedir} != '/' ]]; do + [[ -r ${basedir} ]] || return 1 + if [[ -n ${vcs_comm[detect_need_file]} ]] ; then + [[ -d ${basedir}/${dirname} ]] && { + for file in ${(s: :)${vcs_comm[detect_need_file]}}; do + [[ -e ${basedir}/${dirname}/${file} ]] && break 2 + done + } + else + [[ -d ${basedir}/${dirname} ]] && break + fi + + basedir=${basedir:h} +done + +[[ ${basedir} == "/" ]] && return 1 +vcs_comm[basedir]=${basedir} +# TODO: Would the following be correct? --- +# rrn=${vcs_comm[basedir]:t} +return 0 diff --git a/zshrc b/zshrc index f091513..b488dd1 100644 --- a/zshrc +++ b/zshrc @@ -12,13 +12,14 @@ setopt hist_ignore_space share_history #setopt hist_ignore_all_dups setopt no_auto_remove_slash auto_param_slash setopt completeinword -setopt chase_links +#setopt chase_links setopt short_loops setopt cdable_vars WORDCHARS=${WORDCHARS//\/} cdpath+=$HOME export ZDOTDIR=${ZDOTDIR:-$HOME/.zsh} +fpath=($ZDOTDIR/functions $fpath) function exists { command -v "$@" >/dev/null } From f51a7136e694f509984e0d55735d4ade8c66735c Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 2 Mar 2023 16:22:15 +0100 Subject: [PATCH 18/60] Add completions for cs and scala-cli --- compdef/_cs | 6 ++++++ compdef/_scala-cli | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 compdef/_cs create mode 100644 compdef/_scala-cli diff --git a/compdef/_cs b/compdef/_cs new file mode 100644 index 0000000..12e3d29 --- /dev/null +++ b/compdef/_cs @@ -0,0 +1,6 @@ +#compdef _cs cs + +function _cs { + eval "$(cs complete zsh-v1 $CURRENT $words[@])" +} + diff --git a/compdef/_scala-cli b/compdef/_scala-cli new file mode 100644 index 0000000..1f2efe0 --- /dev/null +++ b/compdef/_scala-cli @@ -0,0 +1,6 @@ +#compdef _scala-cli scala-cli +typeset -A opt_args + +function _scala-cli { + eval "$(scala-cli complete zsh-v1 $CURRENT $words[@])" +} From c87430681f0c95252e0eb9b9b22ef5d021ec9750 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 2 Mar 2023 16:23:50 +0100 Subject: [PATCH 19/60] env --- env/15_basic.zsh | 13 +++++++++++++ env/50_scala.zsh | 1 + 2 files changed, 14 insertions(+) create mode 100644 env/15_basic.zsh create mode 100644 env/50_scala.zsh diff --git a/env/15_basic.zsh b/env/15_basic.zsh new file mode 100644 index 0000000..0f899d0 --- /dev/null +++ b/env/15_basic.zsh @@ -0,0 +1,13 @@ +local function first-command() { + while [[ -n $1 ]]; do + if command -v $1 > /dev/null; then + echo $1 + return 0 + fi + shift + done + return 1 +} + +export PAGER=${PAGER:-$(first-command nvimpager vimpager less)} +export MANPAGER=${PAGER} diff --git a/env/50_scala.zsh b/env/50_scala.zsh new file mode 100644 index 0000000..33e3636 --- /dev/null +++ b/env/50_scala.zsh @@ -0,0 +1 @@ +export SBT_OPTS="-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=10G -Xmx10G" From 8a7dc568b8ebaa3908dd9ecf10da0f21c417f079 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 2 Mar 2023 16:24:40 +0100 Subject: [PATCH 20/60] remove zplug.zsh --- zplug.zsh | 58 ------------------------------------------------------- zshrc | 2 -- 2 files changed, 60 deletions(-) delete mode 100644 zplug.zsh diff --git a/zplug.zsh b/zplug.zsh deleted file mode 100644 index b17b63c..0000000 --- a/zplug.zsh +++ /dev/null @@ -1,58 +0,0 @@ -export ZPLUG_HOME=$ZDOTDIR/zplug -source $(zdotfile zplug/init.zsh) - -zplug 'zplug/zplug', hook-build:'zplug --self-manage' - -#zplug "MichaelAquilina/zsh-you-should-use" -zplug 'jreese/zsh-titles' - -zplug 'crater2150-zsh/fzf-widgets' -zplug 'crater2150-zsh/conf' -zplug 'crater2150-zsh/chroma-z', as:theme - -zplug $ZDOTDIR/plugins/highlight-config, from:local, defer:3 -#zplug $ZDOTDIR/plugins/bundled-compdefs, from:local -zplug $ZDOTDIR/plugins/tmpsrc, from:local -zplug $ZDOTDIR/plugins/pyenv, from:local - -zplug 'molovo/revolver', \ - as:command, \ - use:revolver -zplug 'zunit-zsh/zunit', \ - as:command, \ - use:zunit, \ - hook-build:'./build.zsh' - -zplug "zsh-users/zsh-syntax-highlighting", defer:2 - -zplug "plugins/ng", from:oh-my-zsh - -zplug "zpm-zsh/colors" - -zplug "urbainvaes/fzf-marks" - -zplug "crater2150-zsh/tmsu-fzf", as:plugin - -zplug load - -if zplug check 'crater2150-zsh/fzf-widgets'; then - # Map widgets to key - bindkey '\ec' fzf-change-directory - bindkey '^r' fzf-insert-history - bindkey '^xf' fzf-insert-files - bindkey '^xF' fzf-insert-files-global - bindkey '^xd' fzf-insert-directory - bindkey '^xn' fzf-insert-named-directory - - # Start fzf in a tmux pane - FZF_WIDGET_TMUX=1 - - # use fd for finding directories and files - FZF_CHANGE_DIR_FIND_COMMAND="fd -t d" - FZF_INSERT_DIR_COMMAND="fd -t d" - FZF_INSERT_FILE_COMMAND="fd -t f . $HOME" - FZF_EDIT_FILES_COMMAND="fd -t f" - - # modify history command to remove duplicates - FZF_HISTORY_COMMAND="fc -l 1 | sed 's/ *[0-9]* //g' | awk '!seen[\$0]++'" -fi diff --git a/zshrc b/zshrc index b488dd1..1d7d912 100644 --- a/zshrc +++ b/zshrc @@ -71,8 +71,6 @@ source ${ZIM_HOME}/init.zsh . $(zdotfile completion.zsh) -#source $(zdotfile zplug.zsh) - . $(zdotfile bindings.zsh) stty -ixon From 0663ffc9af56274a5ac1a914162a3bccf05d0557 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 20 Mar 2023 12:54:12 +0100 Subject: [PATCH 21/60] add mpd-host switcher --- aliases/mpd | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/aliases/mpd b/aliases/mpd index 61296ed..1ce257e 100755 --- a/aliases/mpd +++ b/aliases/mpd @@ -1,5 +1,23 @@ #!/bin/zsh +mpd-host() { + case "$1" in + set) + echo "MPD_HOST='$2';MPD_PORT='$3'" > ~/.cache/mpd-host.zsh + ;; + get) + if [ ! -f ~/.cache/mpd-host.zsh ]; then + echo "MPD_HOST='localhost';MPD_PORT='6600'" > ~/.cache/mpd-host.zsh + fi + cat ~/.cache/mpd-host.zsh + ;; + *) + echo "Usage: mpd-host set HOST PORT" + echo " mpd-host get" + ;; + esac +} + mpc() { eval $(mpd-host get) export MPD_HOST From c9aaa445610cdf4d08a2c1640c058f466ed7fabf Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sat, 22 Apr 2023 09:39:04 +0200 Subject: [PATCH 22/60] gls: remove slashes at end --- aliases/git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/git b/aliases/git index c056341..e6f9a14 100644 --- a/aliases/git +++ b/aliases/git @@ -47,7 +47,7 @@ gls() { for i in $gitignore $globalgitignore; do if [[ -e $i ]]; then for ignore in "${(f)mapfile[$i]}"; do - ignores+="--ignore=$ignore" + ignores+="--ignore=${ignore%/}" done fi done From b3758b0c8ebaea58b50ac225bd53618cc067f73c Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 30 May 2023 10:50:02 +0200 Subject: [PATCH 23/60] Fix return value of xbps-install wrapper --- aliases/void | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aliases/void b/aliases/void index 30cecf5..2447450 100644 --- a/aliases/void +++ b/aliases/void @@ -27,7 +27,9 @@ xbps-install() { | tee /dev/stderr \ | grep -oP ".*(?=: post-install message)" \ | ifne xargs -L 1 xbps-query -p install-msg + ret=$? hash -r + return $ret } xupdate() { From 205558b999d5deb921cea41bc8ab4eb7dc736d5e Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 30 May 2023 10:50:45 +0200 Subject: [PATCH 24/60] Replace tmux split editing with kitty split --- bindings.zsh | 3 ++- .../{edit-command-line-tmux => edit-command-line-split} | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) rename widgets/{edit-command-line-tmux => edit-command-line-split} (54%) diff --git a/bindings.zsh b/bindings.zsh index aea5cd8..c3a76ef 100644 --- a/bindings.zsh +++ b/bindings.zsh @@ -1,4 +1,5 @@ #!/bin/zsh +fpath=( "${ZDOTDIR:+$ZDOTDIR/widgets}" $fpath ) bindkey -v @@ -31,7 +32,7 @@ bindkey " " magic-space # Do history expansion on space. bindkey $'\177' backward-delete-char # backspace bindkey $'\10' backward-delete-word # C-backspace -bindkey -M vicmd ! edit-command-line-tmux +bindkey -M vicmd ! edit-command-line-split #unicode input autoload -U insert-unicode-char diff --git a/widgets/edit-command-line-tmux b/widgets/edit-command-line-split similarity index 54% rename from widgets/edit-command-line-tmux rename to widgets/edit-command-line-split index bd8652a..7ef82e1 100644 --- a/widgets/edit-command-line-tmux +++ b/widgets/edit-command-line-split @@ -1,13 +1,11 @@ -ECLHEIGHT=${ECLHEIGHT:-5} edit-command-line-tmux() { local tmpfile=${TMPPREFIX:-/tmp/zsh}ecl$$ print -R - "$PREBUFFER$BUFFER" >$tmpfile exec Date: Sat, 19 Aug 2023 15:22:39 +0200 Subject: [PATCH 25/60] Fix return codes for some void wrapper functions --- aliases/void | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/aliases/void b/aliases/void index 2447450..81a3fb5 100644 --- a/aliases/void +++ b/aliases/void @@ -23,11 +23,11 @@ xqn() { alias xfiles="xbps-query -f" xbps-install() { - sudo script --return --quiet -c "/usr/bin/xbps-install $*" /dev/null \ - | tee /dev/stderr \ - | grep -oP ".*(?=: post-install message)" \ + local logfile=$(mktemp) + sudo script --return --quiet -c "/usr/bin/xbps-install $*" $logfile + local ret=$? + grep -oP ".*(?=: post-install message)" < $logfile \ | ifne xargs -L 1 xbps-query -p install-msg - ret=$? hash -r return $ret } @@ -52,11 +52,13 @@ xowner() { sv() { command sv "$@" + ret=$? if [[ "$1" == "up" ]]; then shift sleep 0.5 command sv check "$@" fi + return $ret } sv-manage() { From 0937e73ed9aa716ce8d84be566a71fc6f1522927 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sat, 19 Aug 2023 15:23:37 +0200 Subject: [PATCH 26/60] Use rifle instead of xdg-open if available --- aliases/functions | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/aliases/functions b/aliases/functions index 0b62299..9886897 100644 --- a/aliases/functions +++ b/aliases/functions @@ -29,11 +29,15 @@ alias sudo="sudo " alias S='sudo $(history -n -1)' alias rm="rm -I" -function v() { - for file in $@; do - xdg-open $file &| - done -} +if exists rifle; then + alias v=rifle +else + function v() { + for file in $@; do + xdg-open $file &| + done + } +fi alias vmemcache="vmtouch -l -m 12G -v" From cc847b5c3203f037c6b9fe631c20aa58a2baabd1 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 21 Aug 2023 11:46:14 +0200 Subject: [PATCH 27/60] Add uncommitted stuff from flipper --- aliases/yank-paste | 70 ++++++++++++++++++++++++++++++++++++++++++++++ compdef/_conf | 10 ++++++- compdef/_scala-cli | 1 - env/00_xdg.zsh | 3 ++ env/90_pass.zsh | 1 + zshenv | 1 - 6 files changed, 83 insertions(+), 3 deletions(-) create mode 100755 aliases/yank-paste create mode 100644 env/00_xdg.zsh create mode 100644 env/90_pass.zsh diff --git a/aliases/yank-paste b/aliases/yank-paste new file mode 100755 index 0000000..d2795e5 --- /dev/null +++ b/aliases/yank-paste @@ -0,0 +1,70 @@ +typeset -a __yank_buffer __cut_buffer +fyank() { + __yank_buffer=() + for i in "$@"; do + __yank_buffer+=("${i:a}") + done +} + +fcut() { + __cut_buffer=() + for i in "$@"; do + __cut_buffer+=("${i:a}") + done +} + +fyankadd() { + for i in "$@"; do + __yank_buffer+=("${i:a}") + done +} + +fcutadd() { + for i in "$@"; do + __cut_buffer+=("${i:a}") + done +} + +fpasteclear() { + __yank_buffer=() + __cut_buffer=() +} + +fpastelist() { + if [[ -n $__yank_buffer ]]; then + echo "Copying ${#__yank_buffer[@]} files:" + printf " %s\n" ${__yank_buffer[@]} + fi + if [[ -n $__cut_buffer ]]; then + echo "Moving ${#__cut_buffer[@]} files" + printf " %s\n" ${__cut_buffer[@]} + fi +} + +fpaste() { + if [[ -n $__yank_buffer ]]; then + echo "Copying ${#__yank_buffer[@]} files" + fi + if [[ -n $__cut_buffer ]]; then + echo "Moving ${#__cut_buffer[@]} files" + fi + if [[ -n $__cut_buffer || -n $__yank_buffer ]]; then + echo -n "Continue? [y/N] " + read -q || return + else + echo "Error: No files to paste. Use fyank or fcut first" + return 1 + fi + + local target=${1:-$PWD} + for file in "${__yank_buffer[@]}"; do + cp -r "$file" "$target" + done + for file in "${__cut_buffer[@]}"; do + mv "$file" "$target" + done + + fpasteclear +} + +# vim: set ft=zsh: diff --git a/compdef/_conf b/compdef/_conf index 7aba86b..7c769cf 100644 --- a/compdef/_conf +++ b/compdef/_conf @@ -1,3 +1,11 @@ #compdef conf -_arguments "1:Commands:(${(k)conf_locations})" + +_conf_locations() { + _alternative \ + "configs:Configs:(${(k)conf_locations})" \ + "dirs:XDG configs:_files -/ -W ${XDG_CONFIG_HOME:-$HOME/.config}/ -S '' -F '*/*'" +} + + +_conf_locations diff --git a/compdef/_scala-cli b/compdef/_scala-cli index 1f2efe0..85adfb4 100644 --- a/compdef/_scala-cli +++ b/compdef/_scala-cli @@ -1,5 +1,4 @@ #compdef _scala-cli scala-cli -typeset -A opt_args function _scala-cli { eval "$(scala-cli complete zsh-v1 $CURRENT $words[@])" diff --git a/env/00_xdg.zsh b/env/00_xdg.zsh new file mode 100644 index 0000000..38e3967 --- /dev/null +++ b/env/00_xdg.zsh @@ -0,0 +1,3 @@ +XDG_CACHE_HOME=${XDG_CACHE_HOME:-${HOME}/.cache} +XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-${HOME}/.config} +XDG_DATA_HOME=${XDG_DATA_HOME:-${HOME}/.local/share} diff --git a/env/90_pass.zsh b/env/90_pass.zsh new file mode 100644 index 0000000..a1f77c2 --- /dev/null +++ b/env/90_pass.zsh @@ -0,0 +1 @@ +export PASSWORD_STORE_ENABLE_EXTENSIONS=true diff --git a/zshenv b/zshenv index 2242cd1..95bbe34 100755 --- a/zshenv +++ b/zshenv @@ -7,4 +7,3 @@ function(){ . $i done } - From 85ec31479eb0d466edf5059ada73a25e93d61ea2 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 21 Aug 2023 11:52:05 +0200 Subject: [PATCH 28/60] env: set rust paths --- env/50_rust.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/env/50_rust.zsh b/env/50_rust.zsh index 18201a6..ddb51a8 100644 --- a/env/50_rust.zsh +++ b/env/50_rust.zsh @@ -1,3 +1,6 @@ +export RUSTUP_HOME="${XDG_DATA_HOME}/rustup" +export CARGO_HOME="${XDG_DATA_HOME}/cargo" +export PATH="${CARGO_HOME}/bin:${PATH}" if which rustup &>/dev/null && [[ -n $(rustup show active-toolchain) ]]; then export RUST_SRC_PATH=$(rustup run stable rustc --print sysroot)/lib/rustlib/src/rust/src fi From b5deb6e21f1e8be44d3f241728fed4ef901ee98a Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 21 Aug 2023 11:53:57 +0200 Subject: [PATCH 29/60] Fix edit-command-line-split --- bindings.zsh | 4 +++- completion.zsh | 8 ++++---- widgets/edit-command-line-split | 28 ++++++++++++++-------------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/bindings.zsh b/bindings.zsh index c3a76ef..2726458 100644 --- a/bindings.zsh +++ b/bindings.zsh @@ -32,6 +32,8 @@ bindkey " " magic-space # Do history expansion on space. bindkey $'\177' backward-delete-char # backspace bindkey $'\10' backward-delete-word # C-backspace +autoload -U edit-command-line-split +zle -N edit-command-line-split bindkey -M vicmd ! edit-command-line-split #unicode input @@ -55,7 +57,7 @@ local function zle-line-finish () { echoti rmkx 2> /dev/null } zle -N zle-line-init -zle -N zle-line-finish +zle -N zle-line-finish insert_sudo () { LBUFFER="sudo ${LBUFFER}" } zle -N insert-sudo insert_sudo diff --git a/completion.zsh b/completion.zsh index 0f4a3b2..9aa001c 100644 --- a/completion.zsh +++ b/completion.zsh @@ -1,5 +1,5 @@ # autoload completions -fpath=( "${ZDOTDIR:+$ZDOTDIR/compdef}" "/etc/zsh/compdef" $fpath ) +fpath=( "${XDG_DATA_HOME:-$HOME/.local/share}/zsh/site-functions" "${ZDOTDIR:+$ZDOTDIR/compdef}" "/etc/zsh/compdef" $fpath ) fpath=("$XDG_DATA_HOME/scalacli/completions/zsh" $fpath) [[ -n $(echo /etc/zsh/compdef/*(N:t)) ]] && autoload -U /etc/zsh/compdef/*(N:t) @@ -21,13 +21,13 @@ autoload -U +X bashcompinit && bashcompinit zstyle ':completion:*:descriptions' format ‘%B%d%b’ zstyle ':completion:*:messages' format ‘%d’ zstyle ':completion:*:warnings' format ‘No matches for: %d’ -zstyle ':completion:*' use-cache on +zstyle ':completion:*' use-cache on zstyle ':completion:*' cache-path ~/.cache/zsh -zstyle ':completion:*' completer _complete _ignored _match _approximate _correct +zstyle ':completion:*' completer _complete _ignored _match _approximate _correct zstyle ':completion:*:match:*' original only zstyle ':completion:*:approximate:*' max-errors 'reply=($((($#PREFIX+$#SUFFIX)/3))numeric)' zstyle ':completion:*:functions' ignored-patterns '_*' -zstyle ':completion:*' squeeze-slashes true +zstyle ':completion:*' squeeze-slashes true zstyle ':completion:*' expand prefix suffix zstyle ':completion:*' group-name '' zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} diff --git a/widgets/edit-command-line-split b/widgets/edit-command-line-split index 7ef82e1..43c8a85 100644 --- a/widgets/edit-command-line-split +++ b/widgets/edit-command-line-split @@ -1,16 +1,16 @@ -edit-command-line-tmux() { - local tmpfile=${TMPPREFIX:-/tmp/zsh}ecl$$ +local tmpfile=${TMPPREFIX:-/tmp/zsh}ecl$$ - print -R - "$PREBUFFER$BUFFER" >$tmpfile - exec $tmpfile +exec /dev/null +else + ${=${VISUAL:-${EDITOR:-vi}}} $tmpfile +fi +print -Rz - "$(<$tmpfile)" - command rm -f $tmpfile - zle send-break # Force reload from the buffer stack -} +command rm -f $tmpfile +zle send-break # Force reload from the buffer stack + +# vim:ft=zsh From 224d877fbb4a7980b13d7d398b366c91908b51c3 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 21 Aug 2023 11:54:19 +0200 Subject: [PATCH 30/60] add pre-commit config to prevent trailing whitespace --- .pre-commit-config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..5e41925 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,6 @@ +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.4.0 + hooks: + - id: end-of-file-fixer + - id: trailing-whitespace From b578fc04d98d3b27bc2dd66c77f5a6ae94b3971b Mon Sep 17 00:00:00 2001 From: crater2150 Date: Fri, 15 Sep 2023 18:18:32 +0200 Subject: [PATCH 31/60] Set terminal tab size to 4 --- zshrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zshrc b/zshrc index 1d7d912..c0908dd 100644 --- a/zshrc +++ b/zshrc @@ -8,7 +8,7 @@ unsetopt histsavenodups setopt autocd extendedglob notify correct autonamedirs setopt list_ambiguous autopushd pushd_ignore_dups -setopt hist_ignore_space share_history +setopt hist_ignore_space share_history #setopt hist_ignore_all_dups setopt no_auto_remove_slash auto_param_slash setopt completeinword @@ -110,3 +110,4 @@ if exists mail; then } __chromaz_extra_left+=_prompt_cron_mails fi +tabs -4 From 16e5256542da69654c1c6494c88c7835c8147158 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 14 Dec 2023 16:56:10 +0100 Subject: [PATCH 32/60] Fix fd on ubuntu/debian --- aliases/functions | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/aliases/functions b/aliases/functions index 9886897..e3bf3ed 100644 --- a/aliases/functions +++ b/aliases/functions @@ -16,13 +16,17 @@ alias 7zu="7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on" alias cronmail="mutt -f $MAIL" if ! command -v fd >/dev/null; then - fd() { - if [[ "$1" =~ "-*" ]]; then - echo "fd not installed. shell alias supports only basic operation" - return 1 - fi - noglob find . -iname "*${*}*" - } + if command -v fdfind >/dev/null; then + alias fd="fdfind" + else + fd() { + if [[ "$1" =~ "^-" ]]; then + echo "fd not installed. shell alias supports only basic operation" + return 1 + fi + noglob find . -iname "*${*}*" + } + fi fi alias sudo="sudo " @@ -159,7 +163,7 @@ prenumbering() { for i in "$@"; do mv $i ${(l:2::0:)n}_$i; ((n++)); - done + done } # appends given suffix (first argument) From 67b66fdeed6a1363fb723c42160a1ab6108b4bbf Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 13 Mar 2024 14:13:29 +0100 Subject: [PATCH 33/60] Update env --- env/20_services.zsh | 5 +++++ env/90_podman-socket.zsh | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 env/90_podman-socket.zsh diff --git a/env/20_services.zsh b/env/20_services.zsh index 414be03..640e7a4 100644 --- a/env/20_services.zsh +++ b/env/20_services.zsh @@ -1,4 +1,9 @@ if [[ $DISPLAY && $UID != 0 ]]; then export SVDIR="$HOME/.local/session_service" export SVDIR_TEMPLATES="$HOME/.service-available" +elif [[ $UID != 0 ]]; then + export SVDIR=$HOME/.service + export SVDIR_TEMPLATES="$HOME/.service-available" +else + export SVDIR_TEMPLATES="/etc/sv" fi diff --git a/env/90_podman-socket.zsh b/env/90_podman-socket.zsh new file mode 100644 index 0000000..79035dd --- /dev/null +++ b/env/90_podman-socket.zsh @@ -0,0 +1,4 @@ +if command -v podman &>/dev/null; then + export DOCKER_SOCKET=$(podman system info -f '{{.Host.RemoteSocket.Path}}') + export DOCKER_HOST=unix://$DOCKER_SOCKET +fi From f7a90b03642b558c2e530209de010ec4dd247f5c Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 13 Mar 2024 14:14:21 +0100 Subject: [PATCH 34/60] aliases --- aliases/functions | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/aliases/functions b/aliases/functions index e3bf3ed..bc7737c 100644 --- a/aliases/functions +++ b/aliases/functions @@ -13,7 +13,9 @@ alias :q="exit" alias rget="rsync -rP --append-verify --inplace" alias 7zu="7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on" -alias cronmail="mutt -f $MAIL" +alias cronmail="mutt -f $MAIL -F <(grep -v 'set folder' ~/.config/mutt/neomuttrc | grep -v 'mailboxes'; echo 'mailboxes $MAIL\nset folder=$MAIL')" + +alias d="dragon-drop -a -x -T" if ! command -v fd >/dev/null; then if command -v fdfind >/dev/null; then @@ -113,7 +115,7 @@ cd(){ # count files in current or given directory count() { - find $1 \( ! -path '*/.*' \) | wc -l + find $1 -mindepth 1 \( ! -path '*/.*' \) | wc -l } pumount() { From c79950ce0228ae5c2d15ccf9220da7e0de6b209b Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 29 Apr 2024 11:51:54 +0200 Subject: [PATCH 35/60] Add copilot aliases --- aliases/functions | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/aliases/functions b/aliases/functions index bc7737c..4b1c4d9 100644 --- a/aliases/functions +++ b/aliases/functions @@ -366,10 +366,18 @@ if [[ $DISPLAY ]] && xinput | grep -q Wacom && xrandr | grep -q eDP1; then } fi -# vim: foldmethod=marker - function lastdl() { echo ~/downloads/*(oc.[1]) } alias mpvu="noglob mpv" + +# copilot +function gh-copilot-cli() { + local tpe="$1"; shift + gh copilot suggest -t $tpe "$*" +} + +alias C="gh-copilot-cli shell" +alias Cgit="gh-copilot-cli git" +alias Cgh="gh-copilot-cli gh" From 6a8412428b0adac25b362f1af3483cdae8bb6535 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 15 Jul 2024 12:27:39 +0200 Subject: [PATCH 36/60] sv-manage: add service listing --- aliases/void | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/aliases/void b/aliases/void index 81a3fb5..434c236 100644 --- a/aliases/void +++ b/aliases/void @@ -62,19 +62,32 @@ sv() { } sv-manage() { - action=$1 - shift + local action service svdir + zparseopts -D -E d:=dir -dir:=dir + svdir=${dir[2]:-${SVDIR:-/var/service}} + if [[ -z $1 ]]; then + action=list + else + action=$1 + shift + fi case "$action" in add) for service in "$@"; do - ln -s ${SVDIR_TEMPLATES:-/etc/sv}/${service:s#/##} ${SVDIR:-/var/service} + ln -s ${SVDIR_TEMPLATES:-/etc/sv}/${service:s#/##} ${svdir} done ;; remove|rm) for service in "$@"; do - rm ${SVDIR:-/var/service}/${service:s#/##} + rm ${svdir}/${service:s#/##} done ;; + list|ls) + sv status ${svdir}/* | sed " + s@${svdir}/@@ + s@run@\x1b[1;92mrun\x1b[0m@g + s@down@\x1b[1;31mdown\x1b[0m@g + " | column -t esac } From 2cceb7b489d392a6d1ba5331e09ab4afb172b813 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 15 Jul 2024 12:28:33 +0200 Subject: [PATCH 37/60] plugins and aliases --- .zimrc | 2 ++ aliases/functions | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.zimrc b/.zimrc index b2f5991..30c96f8 100644 --- a/.zimrc +++ b/.zimrc @@ -13,3 +13,5 @@ zmodule zsh-users/zsh-syntax-highlighting zmodule ohmyzsh/ohmyzsh --root plugins/ng --fpath ./ zmodule urbainvaes/fzf-marks + +zmodule carlosedp/mill-zsh-completions diff --git a/aliases/functions b/aliases/functions index 4b1c4d9..9cc021d 100644 --- a/aliases/functions +++ b/aliases/functions @@ -381,3 +381,5 @@ function gh-copilot-cli() { alias C="gh-copilot-cli shell" alias Cgit="gh-copilot-cli git" alias Cgh="gh-copilot-cli gh" + +alias e="nvim -c 'lua require(\"telescope.builtin\").fd { cwd = require(\"findroot\")(require(\"telescope.utils\").buffer_dir()) } '" From c8c6e801f87614bda7ea5ea6072764ce64ef4828 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 16 Jul 2024 01:02:58 +0200 Subject: [PATCH 38/60] add some xdg settings --- aliases/xdg | 2 ++ env/00_xdg.zsh | 1 + env/01_xdg-fixes.zsh | 19 +++++++++++++++++++ zprofile | 1 + zshrc | 8 +++++++- 5 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 aliases/xdg create mode 100644 env/01_xdg-fixes.zsh diff --git a/aliases/xdg b/aliases/xdg new file mode 100644 index 0000000..5d654f8 --- /dev/null +++ b/aliases/xdg @@ -0,0 +1,2 @@ +#!/bin/zsh +alias adb='HOME="$XDG_DATA_HOME"/android adb' diff --git a/env/00_xdg.zsh b/env/00_xdg.zsh index 38e3967..6b09eb8 100644 --- a/env/00_xdg.zsh +++ b/env/00_xdg.zsh @@ -1,3 +1,4 @@ XDG_CACHE_HOME=${XDG_CACHE_HOME:-${HOME}/.cache} XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-${HOME}/.config} XDG_DATA_HOME=${XDG_DATA_HOME:-${HOME}/.local/share} +XDG_STATE_HOME=${XDG_STATE_HOME:-${HOME}/.local/state} diff --git a/env/01_xdg-fixes.zsh b/env/01_xdg-fixes.zsh new file mode 100644 index 0000000..595e5ea --- /dev/null +++ b/env/01_xdg-fixes.zsh @@ -0,0 +1,19 @@ +export ANDROID_USER_HOME="$XDG_DATA_HOME"/android +export ANSIBLE_HOME="$XDG_DATA_HOME"/ansible +export BUNDLE_USER_CACHE="$XDG_CACHE_HOME"/bundle +export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME"/bundle +export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle +export CARGO_HOME="$XDG_DATA_HOME"/cargo +export ELINKS_CONFDIR="$XDG_CONFIG_HOME"/elinks +export GNUPGHOME=$XDG_CONFIG_HOME/gnupg +export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle +export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc +export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history +export SQLITE_HISTORY="$XDG_CACHE_HOME"/sqlite_history +export TERMINFO="$XDG_DATA_HOME"/terminfo +export TERMINFO_DIRS="$XDG_DATA_HOME"/terminfo:/usr/share/terminfo +export TEXMFCONFIG=$XDG_CONFIG_HOME/texlive/texmf-config +export TEXMFHOME=$XDG_DATA_HOME/texmf +export TEXMFVAR=$XDG_CACHE_HOME/texlive/texmf-var +export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc +export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java" diff --git a/zprofile b/zprofile index 22109b2..29e991c 100644 --- a/zprofile +++ b/zprofile @@ -40,5 +40,6 @@ set -$shopts unset sh shopts if [[ $TTY == /dev/tty1 ]]; then + export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority exec startx :1 fi diff --git a/zshrc b/zshrc index c0908dd..f05b987 100644 --- a/zshrc +++ b/zshrc @@ -1,6 +1,12 @@ typeset -U path -HISTFILE=~/.histfile +HISTFILE=${XDG_STATE_HOME:-$HOME/.local/state}/zsh/histfile +if [[ ! -d ${HISTFILE:h} ]]; then + mkdir -p ${HISTFILE:h} +fi +if [[ ! -e $HISTFILE && -e ~/.histfile ]]; then + mv ~/.histfile $HISTFILE +fi HISTSIZE=100000 SAVEHIST=100000 unsetopt histsavenodups From c7e72c3cb92dee3ad133f315596ef3cce79731f8 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 16 Jul 2024 01:04:48 +0200 Subject: [PATCH 39/60] add copilot-cli --- aliases/copilot.zsh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 aliases/copilot.zsh diff --git a/aliases/copilot.zsh b/aliases/copilot.zsh new file mode 100644 index 0000000..cddd67d --- /dev/null +++ b/aliases/copilot.zsh @@ -0,0 +1,3 @@ +if exists github-copilot-cli; then + eval "$(github-copilot-cli alias -- "$0")" +fi From 54133a240b94b9dc18279296e8fb929be86a4b36 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 16 Jul 2024 01:06:04 +0200 Subject: [PATCH 40/60] add server alias file --- aliases/server | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 aliases/server diff --git a/aliases/server b/aliases/server new file mode 100755 index 0000000..0b4b7f4 --- /dev/null +++ b/aliases/server @@ -0,0 +1,4 @@ +#!/bin/zsh +matrix() { + curl --header "Authorization: Bearer $(pass servers/matrix/matrix.qwertyuiop.de_admintoken)" -X $1 "https://qwertyuiop.de:8448/${2#/}" +} From 761fa842612a02e72a7f27cbc89f8131e4298420 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 16 Jul 2024 01:06:26 +0200 Subject: [PATCH 41/60] env: set DOCKER_HOST to podman socket, if it exists --- env/20_dockerhost.zsh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 env/20_dockerhost.zsh diff --git a/env/20_dockerhost.zsh b/env/20_dockerhost.zsh new file mode 100644 index 0000000..c8c5c49 --- /dev/null +++ b/env/20_dockerhost.zsh @@ -0,0 +1,3 @@ +if [[ -e $XDG_RUNTIME_DIR/podman/podman.sock ]]; then + export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/podman/podman.sock +fi From 88a70e9bd48fe64d93a0ac3632ee26dca6cc762d Mon Sep 17 00:00:00 2001 From: crater2150 Date: Tue, 16 Jul 2024 01:30:54 +0200 Subject: [PATCH 42/60] cleanup --- .zimrc | 2 -- 1 file changed, 2 deletions(-) diff --git a/.zimrc b/.zimrc index 30c96f8..d600952 100644 --- a/.zimrc +++ b/.zimrc @@ -12,6 +12,4 @@ zmodule zsh-users/zsh-syntax-highlighting zmodule ohmyzsh/ohmyzsh --root plugins/ng --fpath ./ -zmodule urbainvaes/fzf-marks - zmodule carlosedp/mill-zsh-completions From c5548aaa221bf254f00f75febdc13b99b40cbbb4 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 22 Jul 2024 17:50:14 +0200 Subject: [PATCH 43/60] Make config fully contained in xdg-dir (no ~/.zshenv) --- README.md | 13 +++++++++---- zshenv | 2 -- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 073015d..d43ecfa 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,14 @@ crater's zsh config Installation: ------------- -From the checked out repo: +Set the `ZDOTDIR` environment variable to the directory of this repo. Note that +this environment variable must be set before the user configuration files of zsh +are read. + +One way to do this is to set it in the global zsh configuration in +`/etc/zsh/zshenv`, e.g. to use the XDG basedir spec with this repo at +`~/.config/zsh`: + ``` -ln -s $PWD/zshenv $HOME/.zshenv +export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}"/zsh ``` -The zshenv file sets the location to the rest of the config (`$ZDOTDIR`) -automatically, based on the link target. diff --git a/zshenv b/zshenv index 95bbe34..d7b5b4b 100755 --- a/zshenv +++ b/zshenv @@ -1,5 +1,3 @@ -export ZDOTDIR="${$(readlink $HOME/.zshenv):h:a}" - exists() { command -v "$@" >/dev/null } function(){ local i From 9793f10c979a0a414294725fa8829d5621331859 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 22 Jul 2024 17:51:14 +0200 Subject: [PATCH 44/60] Do not error out if xrandr or xinput is missing while DISPLAY is set --- aliases/functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aliases/functions b/aliases/functions index 9cc021d..49ddeb3 100644 --- a/aliases/functions +++ b/aliases/functions @@ -357,7 +357,8 @@ batstat() { done } -if [[ $DISPLAY ]] && xinput | grep -q Wacom && xrandr | grep -q eDP1; then +if [[ $DISPLAY ]] && exists xinput && exists xrandr && \ +xinput | grep -q Wacom && xrandr | grep -q eDP1; then xrandr() { command xrandr $@ for dev in $(xinput | grep Wacom | grep -oP '(?<=id=)\d*'); do From 3cb6a1da7e3af8fce6e8062dc5e9f9a15a4bd9c9 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sat, 27 Jul 2024 00:56:58 +0200 Subject: [PATCH 45/60] update aliases --- aliases/functions | 4 ++-- aliases/void | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/aliases/functions b/aliases/functions index 49ddeb3..9b27019 100644 --- a/aliases/functions +++ b/aliases/functions @@ -52,8 +52,8 @@ fork() { "$@" &>/dev/null &| } -alias en="dict.cc.py de en" -alias de="dict.cc.py en de" +alias en="pipx run dict.cc.py de en" +alias de="pipx run dict.cc.py en de" su() { if [[ -z "$@" ]]; then diff --git a/aliases/void b/aliases/void index 434c236..bd84e83 100644 --- a/aliases/void +++ b/aliases/void @@ -88,6 +88,12 @@ sv-manage() { s@run@\x1b[1;92mrun\x1b[0m@g s@down@\x1b[1;31mdown\x1b[0m@g " | column -t + ;; + status) + for service in ${SVDIR:-/var/service}/*/supervise; do + sv status ${service:h} + done + ;; esac } From cfa828ec199e0268bce5bab66f974c20c16f369c Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 28 Aug 2024 17:55:49 +0200 Subject: [PATCH 46/60] add plugin to set java home per directory --- .zimrc | 1 + plugins/cs-java-home/cs-java-home.plugin.zsh | 41 ++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 plugins/cs-java-home/cs-java-home.plugin.zsh diff --git a/.zimrc b/.zimrc index d600952..fdcf8ef 100644 --- a/.zimrc +++ b/.zimrc @@ -6,6 +6,7 @@ zmodule crater2150-zsh/chroma-z zmodule $ZDOTDIR/plugins/tmpsrc zmodule $ZDOTDIR/plugins/pyenv +zmodule $ZDOTDIR/plugins/cs-java-home zmodule $ZDOTDIR/plugins/highlight-config zmodule zsh-users/zsh-syntax-highlighting diff --git a/plugins/cs-java-home/cs-java-home.plugin.zsh b/plugins/cs-java-home/cs-java-home.plugin.zsh new file mode 100644 index 0000000..f64f84d --- /dev/null +++ b/plugins/cs-java-home/cs-java-home.plugin.zsh @@ -0,0 +1,41 @@ +typeset -a chpwd_functions __chromaz_extra_left + +SYSTEM_JAVA_HOME=${CS_FORMER_JAVA_HOME:-$JAVA_HOME} + +local cs_jvm_id +local cs_java_home + +remove-from-path() { + for elem in $@; do + path=("${(@)path:#$elem}") + done +} + +cs-set-java-home() { + local dir=${1:-${PWD:a}} + if [[ $dir == / ]]; then + export JAVA_HOME=${SYSTEM_JAVA_HOME} + remove-from-path $cs_java_home/bin + cs_jvm_id= + return + fi + if [[ -e $dir/.jvm ]]; then + cs_jvm_id=$(<$dir/.jvm) + #echo "Setting Java version to ${cs_jvm_id}" + cs_java_home=$(cs java-home --jvm ${cs_jvm_id}) + path=( $cs_java_home/bin $path ) + export JAVA_HOME=${cs_java_home} + else + cs-set-java-home ${dir:h} + fi + + # +} + +cs-current-java() { + echo ${cs_jvm_id:+JVM: }${cs_jvm_id} +} + +chpwd_functions+=cs-set-java-home +__chromaz_extra_left+=cs-current-java +cs-set-java-home From cfe15e5e1b2dd21f52bb6a7b0d8f62bfb290b530 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Fri, 13 Sep 2024 17:15:24 +0200 Subject: [PATCH 47/60] if node is unavailable, ignore copilot cli --- aliases/copilot.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/copilot.zsh b/aliases/copilot.zsh index cddd67d..471c396 100644 --- a/aliases/copilot.zsh +++ b/aliases/copilot.zsh @@ -1,3 +1,3 @@ -if exists github-copilot-cli; then +if exists /usr/bin/node && exists github-copilot-cli; then eval "$(github-copilot-cli alias -- "$0")" fi From cbf1edac22ee2a44d45203c7f47038a6410b5d2d Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 28 Aug 2024 18:01:10 +0200 Subject: [PATCH 48/60] prompt todo: handle duplicates --- zshrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zshrc b/zshrc index f05b987..ce22276 100644 --- a/zshrc +++ b/zshrc @@ -102,8 +102,8 @@ exists thefuck && eval $(thefuck --alias) if [[ -e $HOME/.calendars ]]; then _prompt_todos() { - local todos=$(rg -l '^STATUS:NEEDS-ACTION' $HOME/.calendars | wc -l) - [[ $todos -gt 0 ]] && echo "Todos: $todos" + local todos=( ${(u)$( rg -l '^STATUS:NEEDS-ACTION' $HOME/.calendars ):t} ) + [[ $#todos -gt 0 ]] && echo "Todos: $#todos" } __chromaz_extra_left+=_prompt_todos fi From 281ea9f354bbfb6198f5508f666ad6165ca4a726 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Mon, 4 Aug 2025 21:48:01 +0200 Subject: [PATCH 49/60] Add atuin --- .zimrc | 2 ++ bindings.zsh | 8 +++++++- confs | 1 + plugins/atuin/atuin.plugin.zsh | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 plugins/atuin/atuin.plugin.zsh diff --git a/.zimrc b/.zimrc index fdcf8ef..752bb8e 100644 --- a/.zimrc +++ b/.zimrc @@ -7,6 +7,7 @@ zmodule crater2150-zsh/chroma-z zmodule $ZDOTDIR/plugins/tmpsrc zmodule $ZDOTDIR/plugins/pyenv zmodule $ZDOTDIR/plugins/cs-java-home +zmodule $ZDOTDIR/plugins/atuin zmodule $ZDOTDIR/plugins/highlight-config zmodule zsh-users/zsh-syntax-highlighting @@ -14,3 +15,4 @@ zmodule zsh-users/zsh-syntax-highlighting zmodule ohmyzsh/ohmyzsh --root plugins/ng --fpath ./ zmodule carlosedp/mill-zsh-completions +zmodule zsh-users/zsh-autosuggestions diff --git a/bindings.zsh b/bindings.zsh index 2726458..2689f19 100644 --- a/bindings.zsh +++ b/bindings.zsh @@ -98,11 +98,17 @@ bindkey "\ev" zle-venv # Map widgets to key bindkey "\ec" fzf-change-directory -bindkey "^r" fzf-insert-history bindkey "^xf" fzf-insert-files bindkey "^xd" fzf-insert-directory bindkey "^xn" fzf-insert-named-directory +if [[ $+commands[atuin] == 1 ]]; then + bindkey -M viins '^r' atuin-search-viins + bindkey -M vicmd '/' atuin-search +else + bindkey "^r" fzf-insert-history +fi + FZF_CHANGE_DIR_FIND_COMMAND="fd -t d" FZF_INSERT_DIR_COMMAND="fd -t d" FZF_INSERT_FILES_COMMAND="fd -t f" diff --git a/confs b/confs index a6c81a0..315910a 100755 --- a/confs +++ b/confs @@ -19,3 +19,4 @@ xd $XDG_CONFIG_HOME/xd.conf zsh $ZDOTDIR kitty $XDG_CONFIG_HOME/kitty/kitty.conf kitty-sessions $XDG_CONFIG_HOME/kitty/sessions +atuin $XDG_CONFIG_HOME/atuin/config.toml diff --git a/plugins/atuin/atuin.plugin.zsh b/plugins/atuin/atuin.plugin.zsh new file mode 100644 index 0000000..c2b4a07 --- /dev/null +++ b/plugins/atuin/atuin.plugin.zsh @@ -0,0 +1,5 @@ +local FOUND_ATUIN=$+commands[atuin] + +if [[ $FOUND_ATUIN -eq 1 ]]; then + source <(atuin init zsh --disable-up-arrow) +fi From 8a9503b95a136429f83e954f138c264a41502dfe Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 27 Nov 2024 12:14:40 +0100 Subject: [PATCH 50/60] Change various things --- aliases/copilot.zsh | 2 ++ aliases/functions | 4 ++++ env/01_xdg-fixes.zsh | 1 - env/50_scala.zsh | 2 +- .../highlight-config/highlight-config.plugin.zsh | 1 + zshenv | 3 +++ zshrc | 16 ++++++++++------ 7 files changed, 21 insertions(+), 8 deletions(-) diff --git a/aliases/copilot.zsh b/aliases/copilot.zsh index 471c396..1ab8265 100644 --- a/aliases/copilot.zsh +++ b/aliases/copilot.zsh @@ -1,3 +1,5 @@ if exists /usr/bin/node && exists github-copilot-cli; then eval "$(github-copilot-cli alias -- "$0")" +elif exists gh && gh extension list | grep copilot -q; then + eval "$(gh copilot alias -- zsh)" fi diff --git a/aliases/functions b/aliases/functions index 9b27019..51b8259 100644 --- a/aliases/functions +++ b/aliases/functions @@ -384,3 +384,7 @@ alias Cgit="gh-copilot-cli git" alias Cgh="gh-copilot-cli gh" alias e="nvim -c 'lua require(\"telescope.builtin\").fd { cwd = require(\"findroot\")(require(\"telescope.utils\").buffer_dir()) } '" + +if [[ -e ${XDG_CONFIG_HOME}/broot/launcher/bash/br ]]; then + source ${XDG_CONFIG_HOME}/broot/launcher/bash/br +fi diff --git a/env/01_xdg-fixes.zsh b/env/01_xdg-fixes.zsh index 595e5ea..70632da 100644 --- a/env/01_xdg-fixes.zsh +++ b/env/01_xdg-fixes.zsh @@ -16,4 +16,3 @@ export TEXMFCONFIG=$XDG_CONFIG_HOME/texlive/texmf-config export TEXMFHOME=$XDG_DATA_HOME/texmf export TEXMFVAR=$XDG_CACHE_HOME/texlive/texmf-var export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc -export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java" diff --git a/env/50_scala.zsh b/env/50_scala.zsh index 33e3636..5fbf3e5 100644 --- a/env/50_scala.zsh +++ b/env/50_scala.zsh @@ -1 +1 @@ -export SBT_OPTS="-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=10G -Xmx10G" +export SBT_OPTS="-Xmx10G" diff --git a/plugins/highlight-config/highlight-config.plugin.zsh b/plugins/highlight-config/highlight-config.plugin.zsh index dec3ff9..021229c 100644 --- a/plugins/highlight-config/highlight-config.plugin.zsh +++ b/plugins/highlight-config/highlight-config.plugin.zsh @@ -1,6 +1,7 @@ typeset -gA ZSH_HIGHLIGHT_STYLES ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern) +ZSH_HIGHLIGHT_DIRS_BLACKLIST+=(/mnt/) if [[ "`tput colors`" == "256" ]] || [[ "`tput colors`" == "88" ]] ; then diff --git a/zshenv b/zshenv index d7b5b4b..372ae2d 100755 --- a/zshenv +++ b/zshenv @@ -1,3 +1,6 @@ +if [ -z "$ZDOTDIR" ]; then + export ZDOTDIR=$HOME/.config/zsh +fi exists() { command -v "$@" >/dev/null } function(){ local i diff --git a/zshrc b/zshrc index ce22276..166796c 100644 --- a/zshrc +++ b/zshrc @@ -29,13 +29,16 @@ fpath=($ZDOTDIR/functions $fpath) function exists { command -v "$@" >/dev/null } -# get a file from ZDOTDIR, return file in /etc/zsh if it does not exist +# get a file from ZDOTDIR, return file in /etc/zsh if it does not exist. If both +# don't exist, return the first of them. zdotfile() { - if [[ -e $ZDOTDIR/$1 ]]; then - echo $ZDOTDIR/$1 - else - echo /etc/zsh/$1 - fi + if [[ -e $ZDOTDIR/$1 ]]; then + echo $ZDOTDIR/$1 + elif [[ -e /etc/zsh/$1 ]]; then + echo /etc/zsh/$1 + else + echo $ZDOTDIR/$1 + fi } try-source() { local i=0 @@ -109,6 +112,7 @@ if [[ -e $HOME/.calendars ]]; then fi if exists mail; then + MAILCHECK=0 _prompt_cron_mails() { [[ ! -e $MAIL ]] && return local newmails=$(mail -Hf $MAIL | grep -c '^.N') From d34af3e1945fadc2865793fe5f0601e2ec494c77 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 19 Nov 2025 12:08:16 +0100 Subject: [PATCH 51/60] function: duplicates --- aliases/functions | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aliases/functions b/aliases/functions index 51b8259..5ae4551 100644 --- a/aliases/functions +++ b/aliases/functions @@ -388,3 +388,7 @@ alias e="nvim -c 'lua require(\"telescope.builtin\").fd { cwd = require(\"findro if [[ -e ${XDG_CONFIG_HOME}/broot/launcher/bash/br ]]; then source ${XDG_CONFIG_HOME}/broot/launcher/bash/br fi + +duplicates() { + sort | uniq -c | grep -v '^\s*1' +} From 87ced67ef298f5916df96d47ec6fed8252c100de Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Mon, 28 Oct 2024 14:45:33 +0100 Subject: [PATCH 52/60] cs-java-home: add set-jvm function --- plugins/cs-java-home/_set-jvm | 5 +++++ plugins/cs-java-home/cs-java-home.plugin.zsh | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 plugins/cs-java-home/_set-jvm diff --git a/plugins/cs-java-home/_set-jvm b/plugins/cs-java-home/_set-jvm new file mode 100644 index 0000000..aa0c88e --- /dev/null +++ b/plugins/cs-java-home/_set-jvm @@ -0,0 +1,5 @@ +#compdef set-jvm + +_set-jvm() { + compadd $(cs java --available) +} diff --git a/plugins/cs-java-home/cs-java-home.plugin.zsh b/plugins/cs-java-home/cs-java-home.plugin.zsh index f64f84d..d4ed9d8 100644 --- a/plugins/cs-java-home/cs-java-home.plugin.zsh +++ b/plugins/cs-java-home/cs-java-home.plugin.zsh @@ -1,5 +1,7 @@ typeset -a chpwd_functions __chromaz_extra_left +fpath+=("${0:A:h}") + SYSTEM_JAVA_HOME=${CS_FORMER_JAVA_HOME:-$JAVA_HOME} local cs_jvm_id @@ -36,6 +38,15 @@ cs-current-java() { echo ${cs_jvm_id:+JVM: }${cs_jvm_id} } +set-jvm() { + if [[ -z $1 ]]; then + echo 'Usage: set-jvm VERSION' + return 1 + fi + cs java --jvm $1 --env && echo $1 > .jvm + cs-set-java-home +} + chpwd_functions+=cs-set-java-home __chromaz_extra_left+=cs-current-java cs-set-java-home From 03e0518f6fb05f052dbf09c798840c18ba96f4f9 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Tue, 4 Mar 2025 14:59:59 +0100 Subject: [PATCH 53/60] Do not run expensive env initializations for non-interactive shells --- .zshenv | 1 + env/50_rust.zsh | 2 +- env/50_scala.zsh | 9 +++++++++ env/90_podman-socket.zsh | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 120000 .zshenv diff --git a/.zshenv b/.zshenv new file mode 120000 index 0000000..65979f5 --- /dev/null +++ b/.zshenv @@ -0,0 +1 @@ +zshenv \ No newline at end of file diff --git a/env/50_rust.zsh b/env/50_rust.zsh index ddb51a8..f16266e 100644 --- a/env/50_rust.zsh +++ b/env/50_rust.zsh @@ -1,6 +1,6 @@ export RUSTUP_HOME="${XDG_DATA_HOME}/rustup" export CARGO_HOME="${XDG_DATA_HOME}/cargo" export PATH="${CARGO_HOME}/bin:${PATH}" -if which rustup &>/dev/null && [[ -n $(rustup show active-toolchain) ]]; then +if [[ $- == *i* ]] && which rustup &>/dev/null && [[ -n $(rustup show active-toolchain) ]]; then export RUST_SRC_PATH=$(rustup run stable rustc --print sysroot)/lib/rustlib/src/rust/src fi diff --git a/env/50_scala.zsh b/env/50_scala.zsh index 5fbf3e5..afd561b 100644 --- a/env/50_scala.zsh +++ b/env/50_scala.zsh @@ -1 +1,10 @@ +======= +[[ $- == *i* ]] || return 0 + +if command -v java &> /dev/null && java -version 2>&1 | grep -q GraalVM; then + export SBT_OPTS="-Xmx10G" +else + export SBT_OPTS="-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=10G -Xmx10G" +fi +>>>>>>> 4f34586 (Do not run expensive env initializations for non-interactive shells) export SBT_OPTS="-Xmx10G" diff --git a/env/90_podman-socket.zsh b/env/90_podman-socket.zsh index 79035dd..fb84b9b 100644 --- a/env/90_podman-socket.zsh +++ b/env/90_podman-socket.zsh @@ -1,3 +1,5 @@ +[[ $- == *i* ]] || return 0 + if command -v podman &>/dev/null; then export DOCKER_SOCKET=$(podman system info -f '{{.Host.RemoteSocket.Path}}') export DOCKER_HOST=unix://$DOCKER_SOCKET From 912a3282c5076ff7fdceefc31d8d6d81fa9a3875 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Tue, 4 Mar 2025 15:02:51 +0100 Subject: [PATCH 54/60] cache podman socket address --- env/90_podman-socket.zsh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/env/90_podman-socket.zsh b/env/90_podman-socket.zsh index fb84b9b..90d2d74 100644 --- a/env/90_podman-socket.zsh +++ b/env/90_podman-socket.zsh @@ -1,6 +1,15 @@ [[ $- == *i* ]] || return 0 +local SOCKET_CACHE=$XDG_CACHE_HOME/zsh-podman-socket if command -v podman &>/dev/null; then - export DOCKER_SOCKET=$(podman system info -f '{{.Host.RemoteSocket.Path}}') - export DOCKER_HOST=unix://$DOCKER_SOCKET + local podman_socket + if [[ ! -e $SOCKET_CACHE ]]; then + podman system info -f '{{.Host.RemoteSocket.Path}}' > $SOCKET_CACHE + else + podman_socket=$(<$SOCKET_CACHE) + fi + if [[ -e $podman_socket ]]; then + export DOCKER_SOCKET=$podman_socket + export DOCKER_HOST=unix://$DOCKER_SOCKET + fi fi From 21e41141efea7b45072d1c61552308cc1c35ffd9 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Thu, 8 May 2025 13:55:52 +0200 Subject: [PATCH 55/60] various additions from sim laptop --- .zimrc | 9 + aliases/apt | 13 +- aliases/devel | 6 + aliases/functions | 24 +- aliases/git | 13 + completion.zsh | 9 +- env/20_dockerhost.zsh | 3 - env/50_scala.zsh | 9 - plugins/cdup/cdup.plugin.zsh | 20 ++ plugins/fzf/fzf.plugin.zsh | 524 +++++++++++++++++++++++++++++++++++ plugins/nvm/nvm.plugin.zsh | 33 +++ zshenv | 1 + zshrc | 9 + 13 files changed, 645 insertions(+), 28 deletions(-) create mode 100644 aliases/devel delete mode 100644 env/20_dockerhost.zsh create mode 100644 plugins/cdup/cdup.plugin.zsh create mode 100644 plugins/fzf/fzf.plugin.zsh create mode 100644 plugins/nvm/nvm.plugin.zsh diff --git a/.zimrc b/.zimrc index 752bb8e..88fb1e8 100644 --- a/.zimrc +++ b/.zimrc @@ -1,3 +1,5 @@ +zmodule zsh-users/zsh-completions + zmodule jreese/zsh-titles -n titles zmodule SmartFinn/fzf-widgets @@ -8,11 +10,18 @@ zmodule $ZDOTDIR/plugins/tmpsrc zmodule $ZDOTDIR/plugins/pyenv zmodule $ZDOTDIR/plugins/cs-java-home zmodule $ZDOTDIR/plugins/atuin +zmodule $ZDOTDIR/plugins/nvm +zmodule $ZDOTDIR/plugins/cdup zmodule $ZDOTDIR/plugins/highlight-config zmodule zsh-users/zsh-syntax-highlighting zmodule ohmyzsh/ohmyzsh --root plugins/ng --fpath ./ +zmodule ohmyzsh/ohmyzsh --root plugins/direnv zmodule carlosedp/mill-zsh-completions zmodule zsh-users/zsh-autosuggestions + +zmodule $ZDOTDIR/plugins/fzf +zmodule chitoku-k/fzf-zsh-completions +zmodule urbainvaes/fzf-marks diff --git a/aliases/apt b/aliases/apt index 8f10add..14a2da7 100755 --- a/aliases/apt +++ b/aliases/apt @@ -9,7 +9,18 @@ grep -iq 'ID_LIKE=debian' /etc/os-release || \ return alias xq="apt-cache search" -alias xi="apt-get install" +alias xi="sudo apt-get install" alias xowner="dpkg -S" alias xfiles="dpkg -L" alias sv="systemctl" + +xupdate() { + sudo -v + echo "\e[1;32mUpdating package cache...\e[0m" + if sudo apt update 2>&1 | grep -q 'apt list --upgradable'; then + echo "\e[1;92mUpgrades available:\e[0m" + apt list --upgradable + echo "\e[1;92mRun upgrades?\e[0m" + read -q && sudo apt upgrade -y + fi +} diff --git a/aliases/devel b/aliases/devel new file mode 100644 index 0000000..029c995 --- /dev/null +++ b/aliases/devel @@ -0,0 +1,6 @@ + +ignore() { + printf "%s\n" $@ >> .gitignore + git add .gitignore +} +noglob ignore diff --git a/aliases/functions b/aliases/functions index 5ae4551..4de415d 100644 --- a/aliases/functions +++ b/aliases/functions @@ -20,6 +20,8 @@ alias d="dragon-drop -a -x -T" if ! command -v fd >/dev/null; then if command -v fdfind >/dev/null; then alias fd="fdfind" + autoload -Uz _fd + compdef _fd fdfind else fd() { if [[ "$1" =~ "^-" ]]; then @@ -145,7 +147,6 @@ send-subvolume() { btrfs property set $1 ro true; btrfs send -v $1 | pv | nc -c ################################################################################# # filename manipulation ##############################################################################{{{ -alias cleanspaces="renamexm -s/\ /_/g -R" # prefix all given files with first argument to this function prefix() { @@ -280,17 +281,8 @@ alias -s log=vimpager # various small scripts ##############################################################################{{{ -urlencode() { - local input - setopt extendedglob - if [ -n "$1" ]; then - input="$*" - else - input=$( /dev/null && java -version 2>&1 | grep -q GraalVM; then - export SBT_OPTS="-Xmx10G" -else - export SBT_OPTS="-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=10G -Xmx10G" -fi ->>>>>>> 4f34586 (Do not run expensive env initializations for non-interactive shells) export SBT_OPTS="-Xmx10G" diff --git a/plugins/cdup/cdup.plugin.zsh b/plugins/cdup/cdup.plugin.zsh new file mode 100644 index 0000000..4220071 --- /dev/null +++ b/plugins/cdup/cdup.plugin.zsh @@ -0,0 +1,20 @@ + +_cdup() { + local dir=$1; shift + local targets=("$@") + for target in $targets; do + if [[ -e $dir/$target ]]; then + cd $dir + return 0 + fi + done + if [[ $dir == "/" ]]; then return 1 + else _cdup ${dir:h} ${targets[@]} + fi +} + +cdup() { + if [[ ${#@} -gt 0 ]]; then _cdup ${PWD:h} "$@" + else _cdup ${PWD:h} .git .hg package.json build.sbt + fi +} diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh new file mode 100644 index 0000000..70470d7 --- /dev/null +++ b/plugins/fzf/fzf.plugin.zsh @@ -0,0 +1,524 @@ +### key-bindings.zsh ### +# ____ ____ +# / __/___ / __/ +# / /_/_ / / /_ +# / __/ / /_/ __/ +# /_/ /___/_/ key-bindings.zsh +# +# - $FZF_TMUX_OPTS +# - $FZF_CTRL_T_COMMAND +# - $FZF_CTRL_T_OPTS +# - $FZF_CTRL_R_OPTS +# - $FZF_ALT_C_COMMAND +# - $FZF_ALT_C_OPTS + + +# Key bindings +# ------------ + +# The code at the top and the bottom of this file is the same as in completion.zsh. +# Refer to that file for explanation. +if 'zmodload' 'zsh/parameter' 2>'/dev/null' && (( ${+options} )); then + __fzf_key_bindings_options="options=(${(j: :)${(kv)options[@]}})" +else + () { + __fzf_key_bindings_options="setopt" + 'local' '__fzf_opt' + for __fzf_opt in "${(@)${(@f)$(set -o)}%% *}"; do + if [[ -o "$__fzf_opt" ]]; then + __fzf_key_bindings_options+=" -o $__fzf_opt" + else + __fzf_key_bindings_options+=" +o $__fzf_opt" + fi + done + } +fi + +'builtin' 'emulate' 'zsh' && 'builtin' 'setopt' 'no_aliases' + +{ +if [[ -o interactive ]]; then + +__fzf_defaults() { + # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + echo "--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore $1" + command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null + echo "${FZF_DEFAULT_OPTS-} $2" +} + +# CTRL-T - Paste the selected file path(s) into the command line +__fzf_select() { + setopt localoptions pipefail no_aliases 2> /dev/null + local item + FZF_DEFAULT_COMMAND=${FZF_CTRL_T_COMMAND:-} \ + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path" "${FZF_CTRL_T_OPTS-} -m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) "$@" < /dev/tty | while read -r item; do + echo -n -E "${(q)item} " + done + local ret=$? + echo + return $ret +} + +__fzfcmd() { + [ -n "${TMUX_PANE-}" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "${FZF_TMUX_OPTS-}" ]; } && + echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf" +} + +fzf-file-widget() { + LBUFFER="${LBUFFER}$(__fzf_select)" + local ret=$? + zle reset-prompt + return $ret +} +if [[ "${FZF_CTRL_T_COMMAND-x}" != "" ]]; then + zle -N fzf-file-widget + bindkey -M emacs '^T' fzf-file-widget + bindkey -M vicmd '^T' fzf-file-widget + bindkey -M viins '^T' fzf-file-widget +fi + +# ALT-C - cd into the selected directory +fzf-cd-widget() { + setopt localoptions pipefail no_aliases 2> /dev/null + local dir="$( + FZF_DEFAULT_COMMAND=${FZF_ALT_C_COMMAND:-} \ + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path" "${FZF_ALT_C_OPTS-} +m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) < /dev/tty)" + if [[ -z "$dir" ]]; then + zle redisplay + return 0 + fi + zle push-line # Clear buffer. Auto-restored on next prompt. + BUFFER="builtin cd -- ${(q)dir:a}" + zle accept-line + local ret=$? + unset dir # ensure this doesn't end up appearing in prompt expansion + zle reset-prompt + return $ret +} +if [[ "${FZF_ALT_C_COMMAND-x}" != "" ]]; then + zle -N fzf-cd-widget + bindkey -M emacs '\ec' fzf-cd-widget + bindkey -M vicmd '\ec' fzf-cd-widget + bindkey -M viins '\ec' fzf-cd-widget +fi + +# CTRL-R - Paste the selected command from history into the command line +fzf-history-widget() { + local selected + setopt localoptions noglobsubst noposixbuiltins pipefail no_aliases noglob nobash_rematch 2> /dev/null + # Ensure the associative history array, which maps event numbers to the full + # history lines, is loaded, and that Perl is installed for multi-line output. + if zmodload -F zsh/parameter p:history 2>/dev/null && (( ${#commands[perl]} )); then + selected="$(printf '%s\t%s\000' "${(kv)history[@]}" | + perl -0 -ne 'if (!$seen{(/^\s*[0-9]+\**\t(.*)/s, $1)}++) { s/\n/\n\t/g; print; }' | + FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m --read0") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd))" + else + selected="$(fc -rl 1 | awk '{ cmd=$0; sub(/^[ \t]*[0-9]+\**[ \t]+/, "", cmd); if (!seen[cmd]++) print $0 }' | + FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd))" + fi + local ret=$? + if [ -n "$selected" ]; then + if [[ $(awk '{print $1; exit}' <<< "$selected") =~ ^[1-9][0-9]* ]]; then + zle vi-fetch-history -n $MATCH + else # selected is a custom query, not from history + LBUFFER="$selected" + fi + fi + zle reset-prompt + return $ret +} +zle -N fzf-history-widget +bindkey -M emacs '^R' fzf-history-widget +bindkey -M vicmd '^R' fzf-history-widget +bindkey -M viins '^R' fzf-history-widget +fi + +} always { + eval $__fzf_key_bindings_options + 'unset' '__fzf_key_bindings_options' +} +### end: key-bindings.zsh ### +### completion.zsh ### +# ____ ____ +# / __/___ / __/ +# / /_/_ / / /_ +# / __/ / /_/ __/ +# /_/ /___/_/ completion.zsh +# +# - $FZF_TMUX (default: 0) +# - $FZF_TMUX_OPTS (default: empty) +# - $FZF_COMPLETION_TRIGGER (default: '**') +# - $FZF_COMPLETION_OPTS (default: empty) +# - $FZF_COMPLETION_PATH_OPTS (default: empty) +# - $FZF_COMPLETION_DIR_OPTS (default: empty) + + +# Both branches of the following `if` do the same thing -- define +# __fzf_completion_options such that `eval $__fzf_completion_options` sets +# all options to the same values they currently have. We'll do just that at +# the bottom of the file after changing options to what we prefer. +# +# IMPORTANT: Until we get to the `emulate` line, all words that *can* be quoted +# *must* be quoted in order to prevent alias expansion. In addition, code must +# be written in a way works with any set of zsh options. This is very tricky, so +# careful when you change it. +# +# Start by loading the builtin zsh/parameter module. It provides `options` +# associative array that stores current shell options. +if 'zmodload' 'zsh/parameter' 2>'/dev/null' && (( ${+options} )); then + # This is the fast branch and it gets taken on virtually all Zsh installations. + # + # ${(kv)options[@]} expands to array of keys (option names) and values ("on" + # or "off"). The subsequent expansion# with (j: :) flag joins all elements + # together separated by spaces. __fzf_completion_options ends up with a value + # like this: "options=(shwordsplit off aliases on ...)". + __fzf_completion_options="options=(${(j: :)${(kv)options[@]}})" +else + # This branch is much slower because it forks to get the names of all + # zsh options. It's possible to eliminate this fork but it's not worth the + # trouble because this branch gets taken only on very ancient or broken + # zsh installations. + () { + # That `()` above defines an anonymous function. This is essentially a scope + # for local parameters. We use it to avoid polluting global scope. + 'local' '__fzf_opt' + __fzf_completion_options="setopt" + # `set -o` prints one line for every zsh option. Each line contains option + # name, some spaces, and then either "on" or "off". We just want option names. + # Expansion with (@f) flag splits a string into lines. The outer expansion + # removes spaces and everything that follow them on every line. __fzf_opt + # ends up iterating over option names: shwordsplit, aliases, etc. + for __fzf_opt in "${(@)${(@f)$(set -o)}%% *}"; do + if [[ -o "$__fzf_opt" ]]; then + # Option $__fzf_opt is currently on, so remember to set it back on. + __fzf_completion_options+=" -o $__fzf_opt" + else + # Option $__fzf_opt is currently off, so remember to set it back off. + __fzf_completion_options+=" +o $__fzf_opt" + fi + done + # The value of __fzf_completion_options here looks like this: + # "setopt +o shwordsplit -o aliases ..." + } +fi + +# Enable the default zsh options (those marked with in `man zshoptions`) +# but without `aliases`. Aliases in functions are expanded when functions are +# defined, so if we disable aliases here, we'll be sure to have no pesky +# aliases in any of our functions. This way we won't need prefix every +# command with `command` or to quote every word to defend against global +# aliases. Note that `aliases` is not the only option that's important to +# control. There are several others that could wreck havoc if they are set +# to values we don't expect. With the following `emulate` command we +# sidestep this issue entirely. +'builtin' 'emulate' 'zsh' && 'builtin' 'setopt' 'no_aliases' + +# This brace is the start of try-always block. The `always` part is like +# `finally` in lesser languages. We use it to *always* restore user options. +{ +# The 'emulate' command should not be placed inside the interactive if check; +# placing it there fails to disable alias expansion. See #3731. +if [[ -o interactive ]]; then + +# To use custom commands instead of find, override _fzf_compgen_{path,dir} +# +# _fzf_compgen_path() { +# echo "$1" +# command find -L "$1" \ +# -name .git -prune -o -name .hg -prune -o -name .svn -prune -o \( -type d -o -type f -o -type l \) \ +# -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@' +# } +# +# _fzf_compgen_dir() { +# command find -L "$1" \ +# -name .git -prune -o -name .hg -prune -o -name .svn -prune -o -type d \ +# -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@' +# } + +########################################################### + +__fzf_defaults() { + # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + echo "--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore $1" + command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null + echo "${FZF_DEFAULT_OPTS-} $2" +} + +__fzf_comprun() { + if [[ "$(type _fzf_comprun 2>&1)" =~ function ]]; then + _fzf_comprun "$@" + elif [ -n "${TMUX_PANE-}" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "${FZF_TMUX_OPTS-}" ]; }; then + shift + if [ -n "${FZF_TMUX_OPTS-}" ]; then + fzf-tmux ${(Q)${(Z+n+)FZF_TMUX_OPTS}} -- "$@" + else + fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%} -- "$@" + fi + else + shift + fzf "$@" + fi +} + +# Extract the name of the command. e.g. foo=1 bar baz** +__fzf_extract_command() { + local token tokens + tokens=(${(z)1}) + for token in $tokens; do + token=${(Q)token} + if [[ "$token" =~ [[:alnum:]] && ! "$token" =~ "=" ]]; then + echo "$token" + return + fi + done + echo "${tokens[1]}" +} + +__fzf_generic_path_completion() { + local base lbuf cmd compgen fzf_opts suffix tail dir leftover matches + base=$1 + lbuf=$2 + cmd=$(__fzf_extract_command "$lbuf") + compgen=$3 + fzf_opts=$4 + suffix=$5 + tail=$6 + + setopt localoptions nonomatch + if [[ $base = *'$('* ]] || [[ $base = *'<('* ]] || [[ $base = *'>('* ]] || [[ $base = *':='* ]] || [[ $base = *'`'* ]]; then + return + fi + eval "base=$base" 2> /dev/null || return + [[ $base = *"/"* ]] && dir="$base" + while [ 1 ]; do + if [[ -z "$dir" || -d ${dir} ]]; then + leftover=${base/#"$dir"} + leftover=${leftover/#\/} + [ -z "$dir" ] && dir='.' + [ "$dir" != "/" ] && dir="${dir/%\//}" + matches=$( + export FZF_DEFAULT_OPTS + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --scheme=path" "${FZF_COMPLETION_OPTS-}") + unset FZF_DEFAULT_COMMAND FZF_DEFAULT_OPTS_FILE + if declare -f "$compgen" > /dev/null; then + eval "$compgen $(printf %q "$dir")" | __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" + else + if [[ $compgen =~ dir ]]; then + walker=dir,follow + rest=${FZF_COMPLETION_DIR_OPTS-} + else + walker=file,dir,follow,hidden + rest=${FZF_COMPLETION_PATH_OPTS-} + fi + __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" --walker "$walker" --walker-root="$dir" ${(Q)${(Z+n+)rest}} < /dev/tty + fi | while read -r item; do + item="${item%$suffix}$suffix" + echo -n -E "${(q)item} " + done + ) + matches=${matches% } + if [ -n "$matches" ]; then + LBUFFER="$lbuf$matches$tail" + fi + zle reset-prompt + break + fi + dir=$(dirname "$dir") + dir=${dir%/}/ + done +} + +_fzf_path_completion() { + __fzf_generic_path_completion "$1" "$2" _fzf_compgen_path \ + "-m" "" " " +} + +_fzf_dir_completion() { + __fzf_generic_path_completion "$1" "$2" _fzf_compgen_dir \ + "" "/" "" +} + +_fzf_feed_fifo() { + command rm -f "$1" + mkfifo "$1" + cat <&0 > "$1" &| +} + +_fzf_complete() { + setopt localoptions ksh_arrays + # Split arguments around -- + local args rest str_arg i sep + args=("$@") + sep= + for i in {0..${#args[@]}}; do + if [[ "${args[$i]-}" = -- ]]; then + sep=$i + break + fi + done + if [[ -n "$sep" ]]; then + str_arg= + rest=("${args[@]:$((sep + 1)):${#args[@]}}") + args=("${args[@]:0:$sep}") + else + str_arg=$1 + args=() + shift + rest=("$@") + fi + + local fifo lbuf cmd matches post + fifo="${TMPDIR:-/tmp}/fzf-complete-fifo-$$" + lbuf=${rest[0]} + cmd=$(__fzf_extract_command "$lbuf") + post="${funcstack[1]}_post" + type $post > /dev/null 2>&1 || post=cat + + _fzf_feed_fifo "$fifo" + matches=$( + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse" "${FZF_COMPLETION_OPTS-} $str_arg") \ + FZF_DEFAULT_OPTS_FILE='' \ + __fzf_comprun "$cmd" "${args[@]}" -q "${(Q)prefix}" < "$fifo" | $post | tr '\n' ' ') + if [ -n "$matches" ]; then + LBUFFER="$lbuf$matches" + fi + command rm -f "$fifo" +} + +# To use custom hostname lists, override __fzf_list_hosts. +# The function is expected to print hostnames, one per line as well as in the +# desired sorting and with any duplicates removed, to standard output. +if ! declare -f __fzf_list_hosts > /dev/null; then + __fzf_list_hosts() { + setopt localoptions nonomatch + command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?%]') \ + <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts 2> /dev/null | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \ + <(command grep -v '^\s*\(#\|$\)' /etc/hosts 2> /dev/null | command grep -Fv '0.0.0.0' | command sed 's/#.*//') | + awk '{for (i = 2; i <= NF; i++) print $i}' | sort -u + } +fi + +_fzf_complete_telnet() { + _fzf_complete +m -- "$@" < <(__fzf_list_hosts) +} + +# The first and the only argument is the LBUFFER without the current word that contains the trigger. +# The current word without the trigger is in the $prefix variable passed from the caller. +_fzf_complete_ssh() { + local -a tokens + tokens=(${(z)1}) + case ${tokens[-1]} in + -i|-F|-E) + _fzf_path_completion "$prefix" "$1" + ;; + *) + local user + [[ $prefix =~ @ ]] && user="${prefix%%@*}@" + _fzf_complete +m -- "$@" < <(__fzf_list_hosts | awk -v user="$user" '{print user $0}') + ;; + esac +} + +_fzf_complete_export() { + _fzf_complete -m -- "$@" < <( + declare -xp | sed 's/=.*//' | sed 's/.* //' + ) +} + +_fzf_complete_unset() { + _fzf_complete -m -- "$@" < <( + declare -xp | sed 's/=.*//' | sed 's/.* //' + ) +} + +_fzf_complete_unalias() { + _fzf_complete +m -- "$@" < <( + alias | sed 's/=.*//' + ) +} + +_fzf_complete_kill() { + _fzf_complete -m --header-lines=1 --no-preview --wrap -- "$@" < <( + command ps -eo user,pid,ppid,start,time,command 2> /dev/null || + command ps -eo user,pid,ppid,time,args 2> /dev/null || # For BusyBox + command ps --everyone --full --windows # For cygwin + ) +} + +_fzf_complete_kill_post() { + awk '{print $2}' +} + +fzf-completion() { + local tokens cmd prefix trigger tail matches lbuf d_cmds + setopt localoptions noshwordsplit noksh_arrays noposixbuiltins + + # http://zsh.sourceforge.net/FAQ/zshfaq03.html + # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags + tokens=(${(z)LBUFFER}) + if [ ${#tokens} -lt 1 ]; then + zle ${fzf_default_completion:-expand-or-complete} + return + fi + + cmd=$(__fzf_extract_command "$LBUFFER") + + # Explicitly allow for empty trigger. + trigger=${FZF_COMPLETION_TRIGGER-'**'} + [ -z "$trigger" -a ${LBUFFER[-1]} = ' ' ] && tokens+=("") + + # When the trigger starts with ';', it becomes a separate token + if [[ ${LBUFFER} = *"${tokens[-2]-}${tokens[-1]}" ]]; then + tokens[-2]="${tokens[-2]-}${tokens[-1]}" + tokens=(${tokens[0,-2]}) + fi + + lbuf=$LBUFFER + tail=${LBUFFER:$(( ${#LBUFFER} - ${#trigger} ))} + + # Trigger sequence given + if [ ${#tokens} -gt 1 -a "$tail" = "$trigger" ]; then + d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS-cd pushd rmdir}) + + [ -z "$trigger" ] && prefix=${tokens[-1]} || prefix=${tokens[-1]:0:-${#trigger}} + if [[ $prefix = *'$('* ]] || [[ $prefix = *'<('* ]] || [[ $prefix = *'>('* ]] || [[ $prefix = *':='* ]] || [[ $prefix = *'`'* ]]; then + return + fi + [ -n "${tokens[-1]}" ] && lbuf=${lbuf:0:-${#tokens[-1]}} + + if eval "type _fzf_complete_${cmd} > /dev/null"; then + prefix="$prefix" eval _fzf_complete_${cmd} ${(q)lbuf} + zle reset-prompt + elif [ ${d_cmds[(i)$cmd]} -le ${#d_cmds} ]; then + _fzf_dir_completion "$prefix" "$lbuf" + else + _fzf_path_completion "$prefix" "$lbuf" + fi + # Fall back to default completion + else + zle ${fzf_default_completion:-expand-or-complete} + fi +} + +[ -z "$fzf_default_completion" ] && { + binding=$(bindkey '^I') + [[ $binding =~ 'undefined-key' ]] || fzf_default_completion=$binding[(s: :w)2] + unset binding +} + +zle -N fzf-completion +bindkey '^I' fzf-completion +fi + +} always { + # Restore the original options. + eval $__fzf_completion_options + 'unset' '__fzf_completion_options' +} +### end: completion.zsh ### diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh new file mode 100644 index 0000000..3da2921 --- /dev/null +++ b/plugins/nvm/nvm.plugin.zsh @@ -0,0 +1,33 @@ +typeset -a chpwd_functions __chromaz_extra_left + +export NVM_DIR="$HOME/.nvm" +nvm() { + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + nvm "$@" +} +_prompt_nvm_version() { + [[ -z $NVM_BIN ]] && return + echo "nvm: ${NVM_BIN:h:t}" +} +__chromaz_extra_left+=_prompt_nvm_version + +find-nvmrc-version() { + local dir=${1:-${PWD:a}} + if [[ $dir == / ]]; then return 1; fi + if [[ -e $dir/.nvmrc ]]; then + < $dir/.nvmrc + else + find-nvmrc-version ${dir:h} + fi +} + +chpwd-set-nvm() { + if vers=$(find-nvmrc-version); then + if [[ $vers != ${NVM_BIN:h:t} ]]; then + nvm use + fi + fi +} +chpwd-set-nvm &>/dev/null + +chpwd_functions+=chpwd-set-nvm diff --git a/zshenv b/zshenv index 372ae2d..dc0b69c 100755 --- a/zshenv +++ b/zshenv @@ -8,3 +8,4 @@ function(){ . $i done } +skip_global_compinit=1 diff --git a/zshrc b/zshrc index 166796c..8ede0d6 100644 --- a/zshrc +++ b/zshrc @@ -1,3 +1,4 @@ +#zmodload zsh/zprof typeset -U path HISTFILE=${XDG_STATE_HOME:-$HOME/.local/state}/zsh/histfile @@ -67,6 +68,12 @@ function(){ try-source $(zdotfile dirs) } +try-source $(zdotfile local.zsh) + +if [[ ! -z $ZDOTDIR/plugins/fzf/fzf.plugin.zsh ]] && exists fzf; then + mkdir -p $ZDOTDIR/plugins/fzf + fzf --zsh 2>/dev/null > $ZDOTDIR/plugins/fzf/fzf.plugin.zsh || true +fi ZIM_HOME=${XDG_CACHE_HOME:-$HOME/.cache}/zim if [[ ! -e ${ZIM_HOME}/zimfw.zsh ]]; then @@ -120,4 +127,6 @@ if exists mail; then } __chromaz_extra_left+=_prompt_cron_mails fi + tabs -4 +#zprof From 67c760dc6e6abf0dd9f036204b3dbcf133984b80 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Fri, 19 Sep 2025 16:22:54 +0200 Subject: [PATCH 56/60] Support FNM (NVM replacement) and bun --- env/50_bun.zsh | 4 +++ plugins/nvm/nvm.plugin.zsh | 74 +++++++++++++++++++++++--------------- zshrc | 3 ++ 3 files changed, 53 insertions(+), 28 deletions(-) create mode 100644 env/50_bun.zsh diff --git a/env/50_bun.zsh b/env/50_bun.zsh new file mode 100644 index 0000000..4aa7b25 --- /dev/null +++ b/env/50_bun.zsh @@ -0,0 +1,4 @@ +export BUN_INSTALL="$HOME/.local/share/bun" +if [[ -d $BUN_INSTALL ]]; then + path+="$BUN_INSTALL/bin" +fi diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh index 3da2921..7996004 100644 --- a/plugins/nvm/nvm.plugin.zsh +++ b/plugins/nvm/nvm.plugin.zsh @@ -1,33 +1,51 @@ typeset -a chpwd_functions __chromaz_extra_left +# fnm +FNM_PATH="${XDG_DATA_HOME:-$HOME/.local/share}/fnm" +if [ -d "$FNM_PATH" ]; then + export PATH="$FNM_PATH:$PATH" + eval "$(fnm env --use-on-cd --version-file-strategy recursive)" + FNM_DEFAULT=${$(readlink $FNM_PATH/aliases/default):h:t} -export NVM_DIR="$HOME/.nvm" -nvm() { - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - nvm "$@" -} -_prompt_nvm_version() { - [[ -z $NVM_BIN ]] && return - echo "nvm: ${NVM_BIN:h:t}" -} -__chromaz_extra_left+=_prompt_nvm_version + _prompt_fnm_version() { + local node_version=$(fnm current) + [[ $node_version == $FNM_DEFAULT ]] && return + echo "nodejs: ${node_version}" + } + __chromaz_extra_left+=_prompt_fnm_version +elif [ -d "$HOME/.nvm" ]; then + export NVM_DIR="$HOME/.nvm" + nvm() { + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + nvm "$@" + } -find-nvmrc-version() { - local dir=${1:-${PWD:a}} - if [[ $dir == / ]]; then return 1; fi - if [[ -e $dir/.nvmrc ]]; then - < $dir/.nvmrc - else - find-nvmrc-version ${dir:h} - fi -} - -chpwd-set-nvm() { - if vers=$(find-nvmrc-version); then - if [[ $vers != ${NVM_BIN:h:t} ]]; then - nvm use + find-nvmrc-version() { + local dir=${1:-${PWD:a}} + if [[ $dir == / ]]; then return 1; fi + if [[ -e $dir/.nvmrc ]]; then + < $dir/.nvmrc + else + find-nvmrc-version ${dir:h} fi - fi -} -chpwd-set-nvm &>/dev/null + } + + chpwd-set-nvm() { + if vers=$(find-nvmrc-version); then + if [[ $vers != ${NVM_BIN:h:t} ]]; then + nvm use + fi + fi + } + chpwd-set-nvm &>/dev/null + + chpwd_functions+=chpwd-set-nvm + + _prompt_nvm_version() { + [[ -z $NVM_BIN ]] && return + echo "nodejs: ${NVM_BIN:h:t}" + } + __chromaz_extra_left+=_prompt_nvm_version +else + return +fi -chpwd_functions+=chpwd-set-nvm diff --git a/zshrc b/zshrc index 8ede0d6..0c1eb6d 100644 --- a/zshrc +++ b/zshrc @@ -130,3 +130,6 @@ fi tabs -4 #zprof + +# bun completions +[ -s "/home/crater2150/.bun/_bun" ] && source "/home/crater2150/.bun/_bun" From a247c6661163f911b297659d3dedfda4bbe240b5 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Fri, 19 Sep 2025 16:30:27 +0200 Subject: [PATCH 57/60] Add completion for az --- bashcomp/az.completion | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 bashcomp/az.completion diff --git a/bashcomp/az.completion b/bashcomp/az.completion new file mode 100644 index 0000000..4046f49 --- /dev/null +++ b/bashcomp/az.completion @@ -0,0 +1,21 @@ +_az_python_argcomplete() { + local IFS=$'\013' + local SUPPRESS_SPACE=0 + if compopt +o nospace 2> /dev/null; then + SUPPRESS_SPACE=1 + fi + COMPREPLY=( $(IFS="$IFS" \ + COMP_LINE="$COMP_LINE" \ + COMP_POINT="$COMP_POINT" \ + COMP_TYPE="$COMP_TYPE" \ + _ARGCOMPLETE_COMP_WORDBREAKS="$COMP_WORDBREAKS" \ + _ARGCOMPLETE=1 \ + _ARGCOMPLETE_SUPPRESS_SPACE=$SUPPRESS_SPACE \ + "$1" 8>&1 9>&2 1>/dev/null 2>/dev/null) ) + if [[ $? != 0 ]]; then + unset COMPREPLY + elif [[ $SUPPRESS_SPACE == 1 ]] && [[ "$COMPREPLY" =~ [=/:]$ ]]; then + compopt -o nospace + fi +} +complete -o nospace -o default -o bashdefault -F _az_python_argcomplete "az" From 78e61b6489ed1e7a7a82c1cb79615fd05641f7be Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Fri, 19 Sep 2025 16:34:26 +0200 Subject: [PATCH 58/60] Ignore local settings --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index d607cbb..92bbcb2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ aliases/private_functions modules/vcs/filter *.zwc .zcompdump +env/*_local_* +local.zsh From 7a0e0f31a9aa7691d8131cf16bf9d7e8814c37c0 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Fri, 19 Sep 2025 16:36:46 +0200 Subject: [PATCH 59/60] fix ignore noglob setting --- aliases/devel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/devel b/aliases/devel index 029c995..c5199e4 100644 --- a/aliases/devel +++ b/aliases/devel @@ -3,4 +3,4 @@ ignore() { printf "%s\n" $@ >> .gitignore git add .gitignore } -noglob ignore +alias ignore="noglob ignore" From 0de5db390e4586ace72d5a9ce3f3c5f5c1f10dc7 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Thu, 1 Jan 2026 17:17:44 +0100 Subject: [PATCH 60/60] Do not run X, if no xsession is defined --- zprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zprofile b/zprofile index 29e991c..ffef4bc 100644 --- a/zprofile +++ b/zprofile @@ -39,7 +39,7 @@ shopts=$- set -$shopts unset sh shopts -if [[ $TTY == /dev/tty1 ]]; then +if [[ $TTY == /dev/tty1 && -e $HOME/.xsession ]]; then export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority exec startx :1 fi