From 92bc3d7f212447e12bfc52a3c09e236e308af87e Mon Sep 17 00:00:00 2001
From: crater2150 <crater@qwertyuiop.de>
Date: Tue, 13 Dec 2022 16:45:40 +0100
Subject: [PATCH 01/49] 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 <crater@qwertyuiop.de>
Date: Tue, 13 Dec 2022 17:43:38 +0100
Subject: [PATCH 02/49] 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 <crater@qwertyuiop.de>
Date: Thu, 12 Jan 2023 11:49:56 +0100
Subject: [PATCH 03/49] 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 <crater@qwertyuiop.de>
Date: Tue, 13 Dec 2022 16:45:40 +0100
Subject: [PATCH 04/49] 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 <crater@qwertyuiop.de>
Date: Tue, 13 Dec 2022 17:43:38 +0100
Subject: [PATCH 05/49] 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 <crater@qwertyuiop.de>
Date: Fri, 13 Jan 2023 11:38:12 +0100
Subject: [PATCH 06/49] 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 <crater@qwertyuiop.de>
Date: Fri, 13 Jan 2023 11:38:12 +0100
Subject: [PATCH 07/49] 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 <crater@qwertyuiop.de>
Date: Sat, 22 May 2021 17:39:39 +0000
Subject: [PATCH 08/49] 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 <crater@qwertyuiop.de>
Date: Sat, 5 Jun 2021 16:55:27 +0000
Subject: [PATCH 09/49] 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 <crater@qwertyuiop.de>
Date: Fri, 20 Jan 2023 15:11:01 +0100
Subject: [PATCH 10/49] 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 <chneukirchen@gmail.com>
+# Leah Neukirchen <leah@vuxu.org>
 # 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 <crater@qwertyuiop.de>
Date: Mon, 23 Jan 2023 15:31:22 +0100
Subject: [PATCH 11/49] 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 <crater@qwertyuiop.de>
Date: Thu, 2 Feb 2023 13:03:53 +0100
Subject: [PATCH 12/49] 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 <crater@qwertyuiop.de>
Date: Thu, 2 Mar 2023 16:07:52 +0100
Subject: [PATCH 13/49] 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 <crater@qwertyuiop.de>
Date: Thu, 2 Mar 2023 16:11:04 +0100
Subject: [PATCH 14/49] 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 <crater@qwertyuiop.de>
Date: Wed, 8 Mar 2023 17:36:58 +0100
Subject: [PATCH 15/49] 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 <crater@qwertyuiop.de>
Date: Thu, 2 Mar 2023 16:21:23 +0100
Subject: [PATCH 16/49] 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 <crater@qwertyuiop.de>
Date: Thu, 2 Mar 2023 16:21:35 +0100
Subject: [PATCH 17/49] 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 <ft@bewatermyfriend.org>
+## 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 <crater@qwertyuiop.de>
Date: Thu, 2 Mar 2023 16:22:15 +0100
Subject: [PATCH 18/49] 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 <crater@qwertyuiop.de>
Date: Thu, 2 Mar 2023 16:23:50 +0100
Subject: [PATCH 19/49] 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 <crater@qwertyuiop.de>
Date: Thu, 2 Mar 2023 16:24:40 +0100
Subject: [PATCH 20/49] 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 <crater@qwertyuiop.de>
Date: Mon, 20 Mar 2023 12:54:12 +0100
Subject: [PATCH 21/49] 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 <crater@qwertyuiop.de>
Date: Sat, 22 Apr 2023 09:39:04 +0200
Subject: [PATCH 22/49] 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 <crater@qwertyuiop.de>
Date: Tue, 30 May 2023 10:50:02 +0200
Subject: [PATCH 23/49] 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 <crater@qwertyuiop.de>
Date: Tue, 30 May 2023 10:50:45 +0200
Subject: [PATCH 24/49] 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 </dev/tty
-	if [ -n "$TMUX" ] && [ "$UID" -ne 0 ]; then
-		tmux splitw -v -l $ECLHEIGHT "vim -c 'set laststatus=0 showtabline=0 ft=zsh' $tmpfile"
-		pid=$(ps -ef | awk "/[0-9] vim.*${tmpfile:t}/ { print \$2 }")
-		wait_on_pid $pid
+	if [[ $KITTY_WINDOW_ID ]]; then
+		kitty @launch --type overlay vim -c 'set laststatus=0 showtabline=0 ft=zsh' $tmpfile
+		tail -f --pid=$(pgrep -f "vim.*${tmpfile:t}") /dev/null
 	else
 		${=${VISUAL:-${EDITOR:-vi}}} $tmpfile
 	fi

From e73ce2bd1867ec1990a34076a53ba22c9f5ad82d Mon Sep 17 00:00:00 2001
From: crater2150 <crater@qwertyuiop.de>
Date: Sat, 19 Aug 2023 15:22:39 +0200
Subject: [PATCH 25/49] 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 <crater@qwertyuiop.de>
Date: Sat, 19 Aug 2023 15:23:37 +0200
Subject: [PATCH 26/49] 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 <crater@qwertyuiop.de>
Date: Mon, 21 Aug 2023 11:46:14 +0200
Subject: [PATCH 27/49] 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 <crater@qwertyuiop.de>
Date: Mon, 21 Aug 2023 11:52:05 +0200
Subject: [PATCH 28/49] 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 <crater@qwertyuiop.de>
Date: Mon, 21 Aug 2023 11:53:57 +0200
Subject: [PATCH 29/49] 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 </dev/tty
-	if [[ $KITTY_WINDOW_ID ]]; then
-		kitty @launch --type overlay vim -c 'set laststatus=0 showtabline=0 ft=zsh' $tmpfile
-		tail -f --pid=$(pgrep -f "vim.*${tmpfile:t}") /dev/null
-	else
-		${=${VISUAL:-${EDITOR:-vi}}} $tmpfile
-	fi
-	print -Rz - "$(<$tmpfile)" 
+print -R - "$PREBUFFER$BUFFER" >$tmpfile
+exec </dev/tty
+if [[ $KITTY_WINDOW_ID ]]; then
+	kitty @launch --type overlay vim -c 'set laststatus=0 showtabline=0 ft=zsh' $tmpfile
+	tail -f --pid=$(pgrep -f "vim.*${tmpfile}") /dev/null &> /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 <crater@qwertyuiop.de>
Date: Mon, 21 Aug 2023 11:54:19 +0200
Subject: [PATCH 30/49] 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 <crater@qwertyuiop.de>
Date: Fri, 15 Sep 2023 18:18:32 +0200
Subject: [PATCH 31/49] 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 <crater@qwertyuiop.de>
Date: Thu, 14 Dec 2023 16:56:10 +0100
Subject: [PATCH 32/49] 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 <crater@qwertyuiop.de>
Date: Wed, 13 Mar 2024 14:13:29 +0100
Subject: [PATCH 33/49] 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 <crater@qwertyuiop.de>
Date: Wed, 13 Mar 2024 14:14:21 +0100
Subject: [PATCH 34/49] 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 <crater@qwertyuiop.de>
Date: Mon, 29 Apr 2024 11:51:54 +0200
Subject: [PATCH 35/49] 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 <crater@qwertyuiop.de>
Date: Mon, 15 Jul 2024 12:27:39 +0200
Subject: [PATCH 36/49] 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 <crater@qwertyuiop.de>
Date: Mon, 15 Jul 2024 12:28:33 +0200
Subject: [PATCH 37/49] 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 <crater@qwertyuiop.de>
Date: Tue, 16 Jul 2024 01:02:58 +0200
Subject: [PATCH 38/49] 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 <crater@qwertyuiop.de>
Date: Tue, 16 Jul 2024 01:04:48 +0200
Subject: [PATCH 39/49] 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 <crater@qwertyuiop.de>
Date: Tue, 16 Jul 2024 01:06:04 +0200
Subject: [PATCH 40/49] 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 <crater@qwertyuiop.de>
Date: Tue, 16 Jul 2024 01:06:26 +0200
Subject: [PATCH 41/49] 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 <crater@qwertyuiop.de>
Date: Tue, 16 Jul 2024 01:30:54 +0200
Subject: [PATCH 42/49] 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 <crater@qwertyuiop.de>
Date: Mon, 22 Jul 2024 17:50:14 +0200
Subject: [PATCH 43/49] 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 <crater@qwertyuiop.de>
Date: Mon, 22 Jul 2024 17:51:14 +0200
Subject: [PATCH 44/49] 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 <crater@qwertyuiop.de>
Date: Sat, 27 Jul 2024 00:56:58 +0200
Subject: [PATCH 45/49] 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 <crater@qwertyuiop.de>
Date: Wed, 28 Aug 2024 17:55:49 +0200
Subject: [PATCH 46/49] 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 <crater@qwertyuiop.de>
Date: Fri, 13 Sep 2024 17:15:24 +0200
Subject: [PATCH 47/49] 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 <crater@qwertyuiop.de>
Date: Wed, 28 Aug 2024 18:01:10 +0200
Subject: [PATCH 48/49] 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 <crater@qwertyuiop.de>
Date: Mon, 4 Aug 2025 21:48:01 +0200
Subject: [PATCH 49/49] 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