From 115181a553ce2c75000625a62e899c9127ff871e Mon Sep 17 00:00:00 2001
From: David O'Trakoun <me@davidosomething.com>
Date: Thu, 26 Mar 2020 14:05:37 -0400
Subject: [PATCH] universal-ctags is XDG compliant now
 https://github.com/universal-ctags/ctags/pull/2384

---
 bootstrap/cleanup | 6 ++++--
 bootstrap/symlink | 6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bootstrap/cleanup b/bootstrap/cleanup
index f8c1e14d7..759ed68c1 100755
--- a/bootstrap/cleanup
+++ b/bootstrap/cleanup
@@ -80,11 +80,13 @@ __clean_nvm() {
 # ============================================================================
 
 __move "${HOME}/.bash_history" "${HOME}/.local/bash_history"
-__move "${HOME}/.zhistory" "${HOME}/.local/zsh_history"
+__move "${HOME}/.ctags.d" "${XDG_CONFIG_HOME}/ctags"
 __move "${HOME}/.gimp-2.8" "${XDG_CONFIG_HOME}/GIMP/2.8"
 __move "${HOME}/.hyper.js" "${XDG_CONFIG_HOME}/hyper/.hyper.js"
 __move "${HOME}/.inputrc" "${XDG_CONFIG_HOME}/readline/inputrc"
 __move "${HOME}/.vagrant.d" "${XDG_DATA_HOME}/vagrant"
+__move "${HOME}/.zhistory" "${HOME}/.local/zsh_history"
+
 __merge_dir "${HOME}/.fonts" "${XDG_DATA_HOME}/fonts"
 
 [[ -n "$CARGO_HOME" ]] && __move "${HOME}/.cargo" "$CARGO_HOME"
@@ -104,7 +106,7 @@ __merge_dir "${HOME}/.fonts" "${XDG_DATA_HOME}/fonts"
   __remove "${HOME}/.zshenv"
 # support dropped in 2.2.0
 __remove "${HOME}/.agignore"
-# should be ~/.ctags.d/universal.ctags
+# should be ~/.config/ctags/*.ctags
 __remove "${HOME}/.ctags"
 # should be in XDG_CONFIG_HOME/fzf/fzf.bash and fzf.zsh
 __remove "${HOME}/.fzf.bash"
diff --git a/bootstrap/symlink b/bootstrap/symlink
index 29ae66456..3e9f0dbd3 100755
--- a/bootstrap/symlink
+++ b/bootstrap/symlink
@@ -40,10 +40,6 @@ __symlink() {
   dko-symlink "shell/dot.profile" \
     ".profile"
 
-  # universal-ctags
-  dko-symlink "universal-ctags/dot.ctags" \
-    ".ctags.d/universal.ctags"
-
   # XDG-compatible, not linux specific
   dko-symlink "bat/config" \
     ".config/bat/config"
@@ -64,6 +60,8 @@ __symlink() {
   [ -z "$KITTY_CONFIG_DIRECTORY" ] &&
     dko-symlink "kitty/kitty.conf" \
     ".config/kitty/kitty.conf"
+  dko-symlink "universal-ctags/dot.ctags" \
+    ".config/ctags/universal.ctags"
 
   # (n)vim / intellij ideavim
   dko-symlink "vim" \