From 07e7109fa9bde3f54123a130dbd2e7b6c3282b4a Mon Sep 17 00:00:00 2001
From: xerus2000 <27jf@pm.me>
Date: Mon, 19 Apr 2021 10:38:28 +0200
Subject: [PATCH] config/zsh: update completions

---
 .config/zsh/.gitignore                         |  1 -
 .config/zsh/.zshrc                             |  4 +++-
 .../zsh/{zsh_completion => completion}/_duel   |  0
 .config/zsh/completion/_edbin                  |  2 ++
 .config/zsh/completion/_edshell                |  2 ++
 .config/zsh/completion/_git                    |  2 ++
 .config/zsh/completion/_gitclone               |  6 ++++++
 .../{zsh_completion => completion}/_gitsquash  |  0
 .config/zsh/zsh_completion/_editshell          |  2 --
 .config/zsh/zsh_completion/_gitclone           | 18 ------------------
 .config/zsh/zsh_completion/_gitrmbranch        |  2 --
 11 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 .config/zsh/.gitignore
 rename .config/zsh/{zsh_completion => completion}/_duel (100%)
 create mode 100644 .config/zsh/completion/_edbin
 create mode 100644 .config/zsh/completion/_edshell
 create mode 100644 .config/zsh/completion/_git
 create mode 100644 .config/zsh/completion/_gitclone
 rename .config/zsh/{zsh_completion => completion}/_gitsquash (100%)
 delete mode 100644 .config/zsh/zsh_completion/_editshell
 delete mode 100644 .config/zsh/zsh_completion/_gitclone
 delete mode 100644 .config/zsh/zsh_completion/_gitrmbranch

diff --git a/.config/zsh/.gitignore b/.config/zsh/.gitignore
deleted file mode 100644
index dea2d4f..0000000
--- a/.config/zsh/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.zcompdump
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 935a2c2..1297caa 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -47,13 +47,15 @@ plugins=(
 )
 
 _comp_options+=(globdots) # Show files starting with dot in autocomplete
-fpath=($fpath "$CONFIG_ZSH/zsh_completion") # Custom completions
+fpath=($fpath "$CONFIG_ZSH/completion") # Custom completions
 ZSH_COMPDUMP="$XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION" # Cache completions
 DISABLE_UPDATE_PROMPT=true
 ZSH_DISABLE_COMPFIX=true
 
 source $ZSH/oh-my-zsh.sh
 
+compdef wh=which
+
 ## Functions
 
 tab_list_files() {
diff --git a/.config/zsh/zsh_completion/_duel b/.config/zsh/completion/_duel
similarity index 100%
rename from .config/zsh/zsh_completion/_duel
rename to .config/zsh/completion/_duel
diff --git a/.config/zsh/completion/_edbin b/.config/zsh/completion/_edbin
new file mode 100644
index 0000000..2ee3d3f
--- /dev/null
+++ b/.config/zsh/completion/_edbin
@@ -0,0 +1,2 @@
+#compdef edbin
+compadd $(echo $PATH | cut -d':' -f1 | xargs ls -pA)
diff --git a/.config/zsh/completion/_edshell b/.config/zsh/completion/_edshell
new file mode 100644
index 0000000..008dbed
--- /dev/null
+++ b/.config/zsh/completion/_edshell
@@ -0,0 +1,2 @@
+#compdef edshell
+compadd -V unsorted zsh profile $(ls -pA $CONFIG_SHELLS)
diff --git a/.config/zsh/completion/_git b/.config/zsh/completion/_git
new file mode 100644
index 0000000..94c7aff
--- /dev/null
+++ b/.config/zsh/completion/_git
@@ -0,0 +1,2 @@
+#compdef git_rmbranch git_rebranch
+compadd $(git branch --format='%(refname:short)' | grep -v master | grep -v main)
diff --git a/.config/zsh/completion/_gitclone b/.config/zsh/completion/_gitclone
new file mode 100644
index 0000000..52b14e0
--- /dev/null
+++ b/.config/zsh/completion/_gitclone
@@ -0,0 +1,6 @@
+#compdef gitclone gitremote
+_arguments '-hub[GitHub]:hub:->github.com' '-lab[Gitlab]:GitLab:->gitlab.com'
+case "$state" in
+  (github.com|'""') compadd $(curl -s https://api.github.com/users/xerus2000/repos?per_page=100 | grep '"name"' | grep -v '      ' | cut -d'"' -f4);;
+  (gitlab.com) _values -s , 'flags' a b c d e;;
+esac
diff --git a/.config/zsh/zsh_completion/_gitsquash b/.config/zsh/completion/_gitsquash
similarity index 100%
rename from .config/zsh/zsh_completion/_gitsquash
rename to .config/zsh/completion/_gitsquash
diff --git a/.config/zsh/zsh_completion/_editshell b/.config/zsh/zsh_completion/_editshell
deleted file mode 100644
index c122b54..0000000
--- a/.config/zsh/zsh_completion/_editshell
+++ /dev/null
@@ -1,2 +0,0 @@
-#compdef editshell
-compadd $(ls -pA $SHELL_CONFIG | grep -v / )
diff --git a/.config/zsh/zsh_completion/_gitclone b/.config/zsh/zsh_completion/_gitclone
deleted file mode 100644
index d524685..0000000
--- a/.config/zsh/zsh_completion/_gitclone
+++ /dev/null
@@ -1,18 +0,0 @@
-#compdef gitclone 
-_arguments '-hub[GitHub]:hub:->hub' '-lab[Gitlab]:GitLab:->lab'
-case "$state" in
-    hub) compadd $(curl -s https://api.github.com/users/xerus2000/repos?per_page=100 | grep '"name"' | grep -v '      ' | cut -d'"' -f4);;
-    lab) _values -s , 'flags' a b c d e;;
-esac
-
-cur=$words[$CURRENT-1]
-unset 'words[-1]'
-case $cur in
-    -p) compadd {13060..13069};;
-    *) 
-    case $PREFIX in
-        -*) compadd -- -p -g -min -v -vv -nodocker;;
-        *)  compadd $(find $projects_dir/softwarechallenge2018/clients -name "*.jar" | sed "s|.*Jumper-||" | sed "s|.jar||" | while read in; do for word in $words; do [ "$in" = "$word" ] && continue 2; done; echo $in; done)
-            compadd -- -p -g -min -v -vv -nodocker;;
-    esac
-esac
diff --git a/.config/zsh/zsh_completion/_gitrmbranch b/.config/zsh/zsh_completion/_gitrmbranch
deleted file mode 100644
index 2815cbe..0000000
--- a/.config/zsh/zsh_completion/_gitrmbranch
+++ /dev/null
@@ -1,2 +0,0 @@
-#compdef gitrmbranch gitrebranch
-compadd $(git branch | cut -c 3- | grep -v master)