From 26aff394c0bf61e16826ead2071714a8685a1e6e Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Sat, 27 Jan 2024 20:44:38 +0100
Subject: [PATCH] Improve completions (bash-completions in zsh still broken)

---
 .config/completionsrc | 10 ----------
 .config/environment   |  2 +-
 .config/zsh/.zshrc    |  8 ++++++++
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.config/completionsrc b/.config/completionsrc
index 20b380e..25f0621 100644
--- a/.config/completionsrc
+++ b/.config/completionsrc
@@ -29,13 +29,3 @@ _dott_completions()
 	fi
 }
 complete -F _dott_completions ".t"
-
-completions_dir="$XDG_CONFIG_HOME/completionsrc.d/"
-if [ -n "$(ls "$completions_dir" 2>/dev/null)" ]
-then
-	for additional_completions in "$completions_dir"*
-	do
-		# shellcheck disable=1090
-		. "$additional_completions"
-	done
-fi
diff --git a/.config/environment b/.config/environment
index 9affaf8..518ddd2 100644
--- a/.config/environment
+++ b/.config/environment
@@ -9,7 +9,7 @@ set +a
 
 export AUTOSTART_DISPLAY=''
 
-export BASH_COMPLETION_USER_DIR="$XDG_DATA_HOME"
+export BASH_COMPLETION_USER_DIR="$XDG_DATA_HOME/bash-completion"
 export BEMENU_OPTS="--tb '#6272a4'\
  --tf '#f8f8f2'\
  --fb '#282a36'\
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 6eb940d..d1c0e50 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -65,6 +65,14 @@ ZSH_CUSTOM=$ZDOTDIR/custom
 export plugin_path="$ZSH_CUSTOM/plugins"
 autoinstall run oh-my-zsh
 
+nix_completions="$HOME/.nix-profile/share/zsh/site-functions"
+if [ -d "$nix_completions" ]; then
+	fpath=($nix_completions $fpath)
+fi
+fpath=(
+	"$XDG_DATA_HOME/zsh/site-functions"
+	$fpath
+)
 
 # Which plugins would you like to load?
 # Standard plugins can be found in $ZSH/plugins/