zsh: move includes to XDG compliant locations

.config/zsh/{functions,includes}/*:
Move functions and includes to XDG compliant locations.

.zshrc:
Include functions and other includes from XDG compliant locations.
Remove use of prepend-sudo function.

16 files changed, 4 insertions, 9 deletions

diff --git a/.zsh.functions/01_editor.zsh b/.config/zsh/functions/01_editor.zsh
index 1484a92..1484a92 100644
--- a/.zsh.functions/01_editor.zsh
+++ b/.config/zsh/functions/01_editor.zsh
diff --git a/.zsh.functions/02_utility.zsh b/.config/zsh/functions/02_utility.zsh
index 05b77bc..05b77bc 100644
--- a/.zsh.functions/02_utility.zsh
+++ b/.config/zsh/functions/02_utility.zsh
diff --git a/.zsh.functions/0_terminal.zsh b/.config/zsh/functions/0_terminal.zsh
index 85be89a..85be89a 100644
--- a/.zsh.functions/0_terminal.zsh
+++ b/.config/zsh/functions/0_terminal.zsh
diff --git a/.zsh.functions/overrides.zsh b/.config/zsh/functions/overrides.zsh
index b320671..b320671 100644
--- a/.zsh.functions/overrides.zsh
+++ b/.config/zsh/functions/overrides.zsh
diff --git a/.zsh.functions/packaging.zsh b/.config/zsh/functions/packaging.zsh
index 69d6df4..69d6df4 100644
--- a/.zsh.functions/packaging.zsh
+++ b/.config/zsh/functions/packaging.zsh
diff --git a/.zsh.after/aliases.zsh b/.config/zsh/includes/aliases.zsh
index 20a055f..20a055f 100644
--- a/.zsh.after/aliases.zsh
+++ b/.config/zsh/includes/aliases.zsh
diff --git a/.zsh.after/apt b/.config/zsh/includes/apt
index e1942cf..e1942cf 100644
--- a/.zsh.after/apt
+++ b/.config/zsh/includes/apt
diff --git a/.zsh.after/export.zsh b/.config/zsh/includes/export.zsh
index 59eb186..59eb186 100644
--- a/.zsh.after/export.zsh
+++ b/.config/zsh/includes/export.zsh
diff --git a/.zsh.after/frqrec b/.config/zsh/includes/frqrec
index e69de29..e69de29 100644
--- a/.zsh.after/frqrec
+++ b/.config/zsh/includes/frqrec
diff --git a/.zsh.after/functions.zsh b/.config/zsh/includes/functions.zsh
index 7a87bee..7a87bee 100644
--- a/.zsh.after/functions.zsh
+++ b/.config/zsh/includes/functions.zsh
diff --git a/.zsh.after/hostspecific.zsh b/.config/zsh/includes/hostspecific.zsh
index 20d569b..20d569b 100644
--- a/.zsh.after/hostspecific.zsh
+++ b/.config/zsh/includes/hostspecific.zsh
diff --git a/.zsh.after/key-bindings.zsh b/.config/zsh/includes/key-bindings.zsh
index 300b3c7..300b3c7 100644
--- a/.zsh.after/key-bindings.zsh
+++ b/.config/zsh/includes/key-bindings.zsh
diff --git a/.zsh.after/path.zsh b/.config/zsh/includes/path.zsh
index 21e36e6..21e36e6 100644
--- a/.zsh.after/path.zsh
+++ b/.config/zsh/includes/path.zsh
diff --git a/.zsh.after/udisks.zsh b/.config/zsh/includes/udisks.zsh
index 3478aea..3478aea 100644
--- a/.zsh.after/udisks.zsh
+++ b/.config/zsh/includes/udisks.zsh
diff --git a/.zsh.after/unixpool b/.config/zsh/includes/unixpool
index e2edade..e2edade 100644
--- a/.zsh.after/unixpool
+++ b/.config/zsh/includes/unixpool
diff --git a/.zshrc b/.zshrc
index d2ea153..082c2d3 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,7 +1,4 @@
 
-# zsh.functions
-for config_file ($HOME/.zsh.functions/*.zsh) source $config_file
-
 # dircolors
 # Set colors for ls output
 eval $(dircolors ~/.dircolors)
@@ -173,9 +170,6 @@ for keymap in 'emacs' 'viins'; do
 
   # Complete in the middle of word.
   bindkey -M "$keymap" "$key_info[Control]I" expand-or-complete
-
-  # Insert 'sudo ' at the beginning of the line.
-  bindkey -M "$keymap" "$key_info[Control]X$key_info[Control]S" prepend-sudo
 done
 
 # Set the key layout to vi mode
@@ -436,9 +430,10 @@ for p in ${history_substring}; do
   fi
 done
 
-# zsh.after
-#
-for config_file ($HOME/.zsh.after/*.zsh) source $config_file
+# functions
+for config_file ($HOME/.config/zsh/functions/*.zsh) source $config_file
+# includes
+for config_file ($HOME/.config/zsh/includes/*.zsh) source $config_file
 
 # use starship for prompt if it exists
 (( ${+commands[starship]} )) && eval "$(starship init zsh)"