diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index 5e41925..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,6 +0,0 @@ -repos: -- repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 - hooks: - - id: end-of-file-fixer - - id: trailing-whitespace diff --git a/.zimrc b/.zimrc index fdcf8ef..f2db05f 100644 --- a/.zimrc +++ b/.zimrc @@ -1,4 +1,4 @@ -zmodule jreese/zsh-titles -n titles +zmodule jreese/zsh-titles zmodule SmartFinn/fzf-widgets zmodule crater2150-zsh/conf @@ -6,11 +6,10 @@ 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 -zmodule ohmyzsh/ohmyzsh --root plugins/ng --fpath ./ +zmodule ohmyzsh/ohmyzsh --root plugins/ng -zmodule carlosedp/mill-zsh-completions +zmodule urbainvaes/fzf-marks diff --git a/README.md b/README.md index d43ecfa..073015d 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,9 @@ crater's zsh config Installation: ------------- -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`: - +From the checked out repo: ``` -export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}"/zsh +ln -s $PWD/zshenv $HOME/.zshenv ``` +The zshenv file sets the location to the rest of the config (`$ZDOTDIR`) +automatically, based on the link target. diff --git a/aliases/copilot.zsh b/aliases/copilot.zsh deleted file mode 100644 index 471c396..0000000 --- a/aliases/copilot.zsh +++ /dev/null @@ -1,3 +0,0 @@ -if exists /usr/bin/node && exists github-copilot-cli; then - eval "$(github-copilot-cli alias -- "$0")" -fi diff --git a/aliases/fork_by_default b/aliases/fork_by_default new file mode 100755 index 0000000..66bb39b --- /dev/null +++ b/aliases/fork_by_default @@ -0,0 +1,10 @@ +#!/bin/zsh + +local forkprogs=( + geeqie + feh +) + +for i in $forkprogs; do + alias $i="fork $i" +done diff --git a/aliases/functions b/aliases/functions index 9b27019..b45f081 100644 --- a/aliases/functions +++ b/aliases/functions @@ -13,37 +13,25 @@ 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 -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 - 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 + fd() { + if [[ "$1" =~ "-*" ]]; then + echo "fd not installed. shell alias supports only basic operation" + return 1 + fi + noglob find . -iname "*${*}*" + } fi alias sudo="sudo " alias S='sudo $(history -n -1)' alias rm="rm -I" -if exists rifle; then - alias v=rifle -else - function v() { - for file in $@; do - xdg-open $file &| - done - } -fi +function v() { + for file in $@; do + xdg-open $file &| + done +} alias vmemcache="vmtouch -l -m 12G -v" @@ -52,8 +40,8 @@ fork() { "$@" &>/dev/null &| } -alias en="pipx run dict.cc.py de en" -alias de="pipx run dict.cc.py en de" +alias en="dict.cc.py de en" +alias de="dict.cc.py en de" su() { if [[ -z "$@" ]]; then @@ -92,7 +80,7 @@ E() { # edit and refresh aliases aliases() { $EDITOR $(zdotfile aliases/${1:-functions}) - source $(zdotfile aliases)/* + . $(zdotfile aliases)/* } # per directory configuration @@ -115,7 +103,7 @@ cd(){ # count files in current or given directory count() { - find $1 -mindepth 1 \( ! -path '*/.*' \) | wc -l + find $1 \( ! -path '*/.*' \) | wc -l } pumount() { @@ -165,7 +153,7 @@ prenumbering() { for i in "$@"; do mv $i ${(l:2::0:)n}_$i; ((n++)); - done + done } # appends given suffix (first argument) @@ -263,8 +251,7 @@ btrfs-subvolume-force-delete() { # lazy shortcuts alias -g G="| grep" -alias -g L="| ${PAGER:-less}" -alias -g LE="2>&1 | ${PAGER:-less}" +alias -g L="| less" alias -g T="| tail" # xclipboard @@ -323,64 +310,10 @@ 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 ]] && 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 - xinput map-to-output $dev eDP1 - done - } -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" - -alias e="nvim -c 'lua require(\"telescope.builtin\").fd { cwd = require(\"findroot\")(require(\"telescope.utils\").buffer_dir()) } '" diff --git a/aliases/git b/aliases/git index e6f9a14..c056341 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 diff --git a/aliases/mpd b/aliases/mpd index 1ce257e..61296ed 100755 --- a/aliases/mpd +++ b/aliases/mpd @@ -1,23 +1,5 @@ #!/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 diff --git a/aliases/server b/aliases/server deleted file mode 100755 index 0b4b7f4..0000000 --- a/aliases/server +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/zsh -matrix() { - curl --header "Authorization: Bearer $(pass servers/matrix/matrix.qwertyuiop.de_admintoken)" -X $1 "https://qwertyuiop.de:8448/${2#/}" -} diff --git a/aliases/void b/aliases/void index bd84e83..53cfbce 100644 --- a/aliases/void +++ b/aliases/void @@ -23,13 +23,11 @@ xqn() { alias xfiles="xbps-query -f" xbps-install() { - local logfile=$(mktemp) - sudo script --return --quiet -c "/usr/bin/xbps-install $*" $logfile - local ret=$? - grep -oP ".*(?=: post-install message)" < $logfile \ + sudo script --return --quiet -c "/usr/bin/xbps-install $*" /dev/null \ + | tee /dev/stderr \ + | grep -oP ".*(?=: post-install message)" \ | ifne xargs -L 1 xbps-query -p install-msg hash -r - return $ret } xupdate() { @@ -41,7 +39,6 @@ xupdate() { fi else xbps-install -SA "$@" - xcheckupdates fi } @@ -52,46 +49,25 @@ xowner() { sv() { command sv "$@" - ret=$? if [[ "$1" == "up" ]]; then shift sleep 0.5 command sv check "$@" fi - return $ret } sv-manage() { - 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 + action=$1 + shift case "$action" in add) for service in "$@"; do - ln -s ${SVDIR_TEMPLATES:-/etc/sv}/${service:s#/##} ${svdir} + ln -s /etc/sv/${service:s#/##} /var/service done ;; remove|rm) for service in "$@"; do - 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 - ;; - status) - for service in ${SVDIR:-/var/service}/*/supervise; do - sv status ${service:h} + rm /var/service/${service:s#/##} done ;; esac diff --git a/aliases/xdg b/aliases/xdg deleted file mode 100644 index 5d654f8..0000000 --- a/aliases/xdg +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/zsh -alias adb='HOME="$XDG_DATA_HOME"/android adb' diff --git a/aliases/yank-paste b/aliases/yank-paste deleted file mode 100755 index d2795e5..0000000 --- a/aliases/yank-paste +++ /dev/null @@ -1,70 +0,0 @@ -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/bindings.zsh b/bindings.zsh index 2726458..aea5cd8 100644 --- a/bindings.zsh +++ b/bindings.zsh @@ -1,5 +1,4 @@ #!/bin/zsh -fpath=( "${ZDOTDIR:+$ZDOTDIR/widgets}" $fpath ) bindkey -v @@ -32,9 +31,7 @@ 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 +bindkey -M vicmd ! edit-command-line-tmux #unicode input autoload -U insert-unicode-char @@ -57,7 +54,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/compdef/_conf b/compdef/_conf index 7c769cf..7aba86b 100644 --- a/compdef/_conf +++ b/compdef/_conf @@ -1,11 +1,3 @@ #compdef conf - -_conf_locations() { - _alternative \ - "configs:Configs:(${(k)conf_locations})" \ - "dirs:XDG configs:_files -/ -W ${XDG_CONFIG_HOME:-$HOME/.config}/ -S '' -F '*/*'" -} - - -_conf_locations +_arguments "1:Commands:(${(k)conf_locations})" diff --git a/compdef/_cs b/compdef/_cs deleted file mode 100644 index 12e3d29..0000000 --- a/compdef/_cs +++ /dev/null @@ -1,6 +0,0 @@ -#compdef _cs cs - -function _cs { - eval "$(cs complete zsh-v1 $CURRENT $words[@])" -} - diff --git a/compdef/_scala-cli b/compdef/_scala-cli deleted file mode 100644 index 85adfb4..0000000 --- a/compdef/_scala-cli +++ /dev/null @@ -1,5 +0,0 @@ -#compdef _scala-cli scala-cli - -function _scala-cli { - eval "$(scala-cli complete zsh-v1 $CURRENT $words[@])" -} diff --git a/compdef/_sv b/compdef/_sv index d56981e..673a671 100644 --- a/compdef/_sv +++ b/compdef/_sv @@ -1,7 +1,7 @@ #compdef sv # completion for runit sv(1) -# Leah Neukirchen +# Christian Neukirchen # runit 2.1.1, services in /var/service are completed by default local ret=1 services @@ -35,12 +35,10 @@ cmds) check ret=0;; args) - if [[ $BUFFER == "sudo "* - || $BUFFER == "doas "* - || $BUFFER == "su "*-c* ]] then - services=( /var/service/*(-/N:t) ) + if [[ $BUFFER == sudo* ]] 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 c886896..c7ae698 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 ${SVDIR_TEMPLATES:-/etc/sv}" + "*:service:_files -W /etc/sv" diff --git a/completion.zsh b/completion.zsh index 9aa001c..14b3509 100644 --- a/completion.zsh +++ b/completion.zsh @@ -1,6 +1,5 @@ # autoload completions -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) +fpath=( "${ZDOTDIR:+$ZDOTDIR/compdef}" "/etc/zsh/compdef" $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) @@ -21,13 +20,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/confs b/confs index a6c81a0..7004245 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/ +ssh $HOME/.ssh/config vdirsyncer $XDG_CONFIG_HOME/vdirsyncer/config vim $XDG_CONFIG_HOME/vim xd $XDG_CONFIG_HOME/xd.conf diff --git a/env/00_xdg.zsh b/env/00_xdg.zsh deleted file mode 100644 index 6b09eb8..0000000 --- a/env/00_xdg.zsh +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 595e5ea..0000000 --- a/env/01_xdg-fixes.zsh +++ /dev/null @@ -1,19 +0,0 @@ -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/env/15_basic.zsh b/env/15_basic.zsh deleted file mode 100644 index 0f899d0..0000000 --- a/env/15_basic.zsh +++ /dev/null @@ -1,13 +0,0 @@ -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/20_dockerhost.zsh b/env/20_dockerhost.zsh deleted file mode 100644 index c8c5c49..0000000 --- a/env/20_dockerhost.zsh +++ /dev/null @@ -1,3 +0,0 @@ -if [[ -e $XDG_RUNTIME_DIR/podman/podman.sock ]]; then - export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/podman/podman.sock -fi diff --git a/env/20_services.zsh b/env/20_services.zsh index 640e7a4..b6e358c 100644 --- a/env/20_services.zsh +++ b/env/20_services.zsh @@ -1,9 +1,3 @@ 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/50_nodejs.zsh b/env/50_nodejs.zsh index 9196f29..507f907 100644 --- a/env/50_nodejs.zsh +++ b/env/50_nodejs.zsh @@ -1,4 +1,3 @@ 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" diff --git a/env/50_rust.zsh b/env/50_rust.zsh index ddb51a8..18201a6 100644 --- a/env/50_rust.zsh +++ b/env/50_rust.zsh @@ -1,6 +1,3 @@ -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 diff --git a/env/50_scala.zsh b/env/50_scala.zsh deleted file mode 100644 index 33e3636..0000000 --- a/env/50_scala.zsh +++ /dev/null @@ -1 +0,0 @@ -export SBT_OPTS="-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=10G -Xmx10G" diff --git a/env/90_pass.zsh b/env/90_pass.zsh deleted file mode 100644 index a1f77c2..0000000 --- a/env/90_pass.zsh +++ /dev/null @@ -1 +0,0 @@ -export PASSWORD_STORE_ENABLE_EXTENSIONS=true diff --git a/env/90_podman-socket.zsh b/env/90_podman-socket.zsh deleted file mode 100644 index 79035dd..0000000 --- a/env/90_podman-socket.zsh +++ /dev/null @@ -1,4 +0,0 @@ -if command -v podman &>/dev/null; then - export DOCKER_SOCKET=$(podman system info -f '{{.Host.RemoteSocket.Path}}') - export DOCKER_HOST=unix://$DOCKER_SOCKET -fi diff --git a/functions/VCS_INFO_bydir_detect b/functions/VCS_INFO_bydir_detect deleted file mode 100644 index 0d313b2..0000000 --- a/functions/VCS_INFO_bydir_detect +++ /dev/null @@ -1,41 +0,0 @@ -## 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/plugins/cs-java-home/cs-java-home.plugin.zsh b/plugins/cs-java-home/cs-java-home.plugin.zsh deleted file mode 100644 index f64f84d..0000000 --- a/plugins/cs-java-home/cs-java-home.plugin.zsh +++ /dev/null @@ -1,41 +0,0 @@ -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 diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh index c6f5dda..d79d4e6 100644 --- a/plugins/pyenv/pyenv.plugin.zsh +++ b/plugins/pyenv/pyenv.plugin.zsh @@ -18,11 +18,6 @@ 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 diff --git a/widgets/edit-command-line-split b/widgets/edit-command-line-split deleted file mode 100644 index 43c8a85..0000000 --- a/widgets/edit-command-line-split +++ /dev/null @@ -1,16 +0,0 @@ -local tmpfile=${TMPPREFIX:-/tmp/zsh}ecl$$ - -print -R - "$PREBUFFER$BUFFER" >$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 - -# vim:ft=zsh diff --git a/widgets/edit-command-line-tmux b/widgets/edit-command-line-tmux new file mode 100644 index 0000000..bd8652a --- /dev/null +++ b/widgets/edit-command-line-tmux @@ -0,0 +1,18 @@ +ECLHEIGHT=${ECLHEIGHT:-5} +edit-command-line-tmux() { + local tmpfile=${TMPPREFIX:-/tmp/zsh}ecl$$ + + print -R - "$PREBUFFER$BUFFER" >$tmpfile + exec /dev/null } function(){ local i @@ -5,3 +7,4 @@ function(){ . $i done } + diff --git a/zshrc b/zshrc index f05b987..7fdbe9a 100644 --- a/zshrc +++ b/zshrc @@ -1,12 +1,6 @@ typeset -U path -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 +HISTFILE=~/.histfile HISTSIZE=100000 SAVEHIST=100000 unsetopt histsavenodups @@ -14,18 +8,17 @@ 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 -#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 } @@ -77,6 +70,8 @@ source ${ZIM_HOME}/init.zsh . $(zdotfile completion.zsh) +#source $(zdotfile zplug.zsh) + . $(zdotfile bindings.zsh) stty -ixon @@ -107,13 +102,3 @@ if [[ -e $HOME/.calendars ]]; then } __chromaz_extra_left+=_prompt_todos 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" - } - __chromaz_extra_left+=_prompt_cron_mails -fi -tabs -4