Merged etc/modules into etc/function

3 files changed, 13 insertions, 13 deletions

diff --git a/etc/function b/etc/function
index 2bdbb97..8ea4f45 100644
--- a/etc/function
+++ b/etc/function
@@ -1,11 +1,17 @@
 ## vim:ft=zsh
-autoload chpwd extr plonkhost world-readable youtube-watch
-autoload reload
-autoload rtab
+
+# zsh functions
+autoload -U compinit
+autoload colors
+autoload catch throw
+autoload zargs
+
+# own functions
+autoload chpwd extr plonkhost put reload rtab world-readable youtube-watch
 autoload xexport xsource
-autoload put
 
-autoload throw catch
+colors
+chpwd
 
 # from https://git.tabularazor.org/~mikael/etc/tree/zsh/functions
 for action in Start Stop Restart Reload; {
diff --git a/etc/modules b/etc/modules
deleted file mode 100644
index 12e464e..0000000
--- a/etc/modules
+++ /dev/null
@@ -1,5 +0,0 @@
-## vim:ft=zsh
-autoload -U compinit
-autoload colors
-autoload zargs
-colors
diff --git a/etc/rc b/etc/rc
index f449b20..75c7411 100644
--- a/etc/rc
+++ b/etc/rc
@@ -12,11 +12,10 @@ alias 'ls-colors:'='which dircolors &> /dev/null &&'
 alias 'openbsd:'='[[ $uname = OpenBSD ]] &&'
 
 ## include the actual config
-source $ZDIR/modules
+source $ZDIR/options
 source $ZDIR/parameters
-source $ZDIR/colors
 source $ZDIR/function
-source $ZDIR/options
+source $ZDIR/colors
 source $ZDIR/prompt
 source $ZDIR/directories
 source $ZDIR/keys