From c3ccad3fef928bc9bf57acf42126e8fd829ce994 Mon Sep 17 00:00:00 2001
From: shokinn <mail@philip-henning.com>
Date: Thu, 1 Sep 2022 14:58:59 +0200
Subject: [PATCH] Add zsh-completions and dotdrop helper script

---
 config.yaml             |  7 ++++++-
 dotfiles/bin/dotdrop.sh |  8 ++++++++
 dotfiles/zshrc          | 21 +++++++++++++++------
 3 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100755 dotfiles/bin/dotdrop.sh

diff --git a/config.yaml b/config.yaml
index 17a9435..5325065 100644
--- a/config.yaml
+++ b/config.yaml
@@ -7,7 +7,8 @@ actions:
     [[ ! -d ${{HOME}}/.oh-my-zsh ]] && sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" "" --unattended || echo "do nothing" >/dev/null
     [[ -f ${{HOME}}/.zshrc.pre-oh-my-zsh ]] && rm ${{HOME}}/.zshrc && mv ${{HOME}}/.zshrc.pre-oh-my-zsh ${{HOME}}/.zshrc || echo "do nothing" >/dev/null
     [[ ! -d ${{ZSH_CUSTOM:-${{HOME}}/.oh-my-zsh/custom}}/plugins ]] && mkdir -p ${{ZSH_CUSTOM:-${{HOME}}/.oh-my-zsh/custom}}/plugins || echo "do nothing" >/dev/null
-    [[ ! -d ${{ZSH_CUSTOM:-${{HOME}}/.oh-my-zsh/custom}}/completions ]] && mkdir -p ${{ZSH_CUSTOM:-${{HOME}}/.oh-my-zsh/custom}}/completions || echo "do nothing" >/dev/null
+    [[ ! -d ${{ZSH_CUSTOM:-${{HOME}}/.oh-my-zsh/custom}}/plugins/custom-completions ]] && mkdir -p ${{ZSH_CUSTOM:-${{HOME}}/.oh-my-zsh/custom}}/plugins/custom-completions || echo "do nothing" >/dev/null
+    [[ ! -f ${{ZSH_CUSTOM:-${{HOME}}/.oh-my-zsh/custom}}/plugins/custom-completions/_dotdrop.sh-completion.zsh ]] && curl -o ${{ZSH_CUSTOM:-${{HOME}}/.oh-my-zsh/custom}}/plugins/custom-completions/_dotdrop.sh-completion.zsh https://raw.githubusercontent.com/deadc0de6/dotdrop/master/completion/_dotdrop.sh-completion.zsh || echo "do nothing" >/dev/null
     [[ ! -d ${{ZSH_CUSTOM:-${{HOME}}/.oh-my-zsh/custom}}/plugins/zsh-completions ]] && git clone https://github.com/zsh-users/zsh-completions.git ${{ZSH_CUSTOM:-${{HOME}}/.oh-my-zsh/custom}}/plugins/zsh-completions || echo "do nothing" >/dev/null
     [[ ! -d ${{ZSH_CUSTOM:-${{HOME}}/.oh-my-zsh/custom}}/plugins/fzf-tab-completion ]] && git clone https://github.com/lincheney/fzf-tab-completion.git ${{ZSH_CUSTOM:-${{HOME}}/.oh-my-zsh/custom}}/plugins/fzf-tab-completion || echo "do nothing" >/dev/null
   powerlevel9k-theme: |
@@ -50,6 +51,9 @@ dotfiles:
   f_compton.conf:
     dst: ~/.config/compton/compton.conf
     src: config/compton/compton.conf
+  f_dotdrop.sh:
+    src: bin/dotdrop.sh
+    dst: ~/.bin/dotdrop.sh
   f_fehbg:
     dst: ~/.fehbg
     src: fehbg
@@ -204,6 +208,7 @@ profiles:
     - f_c3kdenlive
     - f_c3mpv
     - f_c3check
+    - f_dotdrop.sh
   workspace:
     dotfiles:
     - d_fonts
diff --git a/dotfiles/bin/dotdrop.sh b/dotfiles/bin/dotdrop.sh
new file mode 100755
index 0000000..4651b42
--- /dev/null
+++ b/dotfiles/bin/dotdrop.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env zsh
+
+#
+# {{@@ header() @@}}
+#
+
+eval $(grep -v "^#" {{@@ env['HOME'] @@}}/.files/.env.public)
+{{@@ env['HOME'] @@}}/.files/dotdrop.sh ${@}
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 91c498d..60e9f1d 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -103,15 +103,24 @@ plugins=(
   systemd
   themes
   vscode
-  zsh-completions
+  #zsh-completions (https://github.com/zsh-users/zsh-completions/issues/603)
   zsh-navigation-tools
 )
 
 autoload -U compinit && compinit
 
-# Try on linux without fig
-#source {{@@ env['HOME'] @@}}/.oh-my-zsh/custom/plugins/fzf-tab-completion/zsh/fzf-zsh-completion.sh
-#zstyle ':completion:*' fzf-search-display true
+{%@@ if profile == 'ymir' @@%}
+# Source fzf-tab-completions
+# source {{@@ env['HOME'] @@}}/.oh-my-zsh/custom/plugins/fzf-tab-completion/zsh/fzf-zsh-completion.sh
+# zstyle ':completion:*' fzf-search-display true
+
+# fpath extensions
+# Add zsh-completions to fpath (https://github.com/zsh-users/zsh-completions/issues/603)
+fpath+={{@@ env['HOME'] @@}}/.oh-my-zsh/custom/plugins/zsh-completions/src
+# A set of custom completions
+fpath+={{@@ env['HOME'] @@}}/.oh-my-zsh/custom/plugins/custom-completions
+{%@@ endif @@%}
+
 
 source ${ZSH}/oh-my-zsh.sh
 
@@ -142,7 +151,7 @@ source ${ZSH}/oh-my-zsh.sh
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
-[[ -f {{@@ env['HOME'] @@}}/.files/dotdrop.sh ]] && alias dotdrop='eval $(grep -v "^#" {{@@ env['HOME'] @@}}/.files/.env.public) {{@@ env['HOME'] @@}}/.files/dotdrop.sh'
+# [[ -f {{@@ env['HOME'] @@}}/.files/dotdrop.sh ]] && alias dotdrop='eval $(grep -v "^#" {{@@ env['HOME'] @@}}/.files/.env.public) {{@@ env['HOME'] @@}}/.files/dotdrop.sh' # Not required anymore since I now use
 [[ $(command -v thefuck) ]] && eval $(thefuck --alias)
 #{%@@ if profile == 'AINCRAD-wsl' or profile == 'YOETUNHEIMR-wsl' or profile == 'ymir' @@%}
 # Use https://github.com/jgaa/shinysocks as simple socks5 proxy for windows
@@ -151,7 +160,7 @@ source ${ZSH}/oh-my-zsh.sh
 #{%@@ endif @@%}
 
 # Initialize pyenv
-[[ $(command -v pyenv) ]] && eval "$(pyenv init -)"
+[[ $(command -v pyenv) ]] && eval "$(pyenv init -)"; eval "$(pyenv virtualenv-init -)"
 
 # Enable pipx completions
 if [ -f "{{@@ env['HOME'] @@}}/.local/bin/pipx" ]; then