3 files changed, 13 insertions, 17 deletions
diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index be35a6c..fdd9d17 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -3,7 +3,8 @@
 
 # The most important one
 alias vi='vis'
-alias cd='z'
+which z > /dev/null 2>&1 &&
+    alias cd='z'
 
 # Zsh specific aliases
 if [ $SHELL = "/bin/zsh" ]
@@ -53,7 +54,8 @@ alias pf='profanity'
 
 alias f='fg'
 
-alias gurk='pgrep gurk > /dev/null && printf "Already Running.\n" || gurk'
+which gurk > /dev/null 2>&1 &&
+    alias gurk='pgrep gurk > /dev/null && printf "Already Running.\n" || gurk'
 
 alias arduino-cli='arduino-cli --config-file $XDG_CONFIG_HOME/arduino15/arduino-cli.yaml'
 
diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh
index 976db1e..8e51135 100644
--- a/config/essentials/shell/functions.sh
+++ b/config/essentials/shell/functions.sh
@@ -318,17 +318,10 @@ serve() {
     if [ "$1" ]
     then
         logn "Serving $1"
-        docker container run \
-            --rm \
-            --volume "$(readlink -f "$1")":/data \
-            --publish 80:5000 sigoden/dufs /data
+        dufs "$1"
     else
-
         logn "Receiving files.."
-        docker container run \
-            --rm \
-            --volume /tmp/data:/data \
-            --publish 80:5000 sigoden/dufs /data --allow-upload
+        dufs /tmp/data --alow-upload
     fi
 }
 
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 8aa9f5e..5981fd9 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -7,8 +7,6 @@ then
 	[ "${TTY%%tty*}" = '/dev/' ] && clear
 	case "${TTY#/dev/tty}" in
 		1) exec startx > /dev/null 2>&1 ;;
-		2) exec startdwl > /dev/null 2>&1 ;;
-		3) exec startw > /dev/null 2>&1 ;;
 		*) false ;;
 	esac && exit
 fi
@@ -18,10 +16,12 @@ autoload -z edit-command-line
 zle -N edit-command-line
 
 ### Source files
-. $XDG_CONFIG_HOME/zsh/comp.zsh
-. $XDG_CONFIG_HOME/shell/functions.sh
-. $XDG_CONFIG_HOME/shell/aliases.sh
-. $XDG_CONFIG_HOME/zsh/widgets.zsh
+source_it() { [ -f "$1" ] && . "$1" }
+source_it /etc/profile.d/plan9.sh
+source_it $XDG_CONFIG_HOME/zsh/comp.zsh
+source_it $XDG_CONFIG_HOME/shell/functions.sh
+source_it $XDG_CONFIG_HOME/shell/aliases.sh
+source_it $XDG_CONFIG_HOME/zsh/widgets.zsh
 # . $XDG_CONFIG_HOME/zsh/prompt.zsh
 # . $XDG_CONFIG_HOME/zsh/plugins.zsh
 
@@ -31,6 +31,7 @@ eval "$(zoxide init zsh)"
 
 ### Plugins
 [ -f "$HOME/.local/share/zap/zap.zsh" ] && source "$HOME/.local/share/zap/zap.zsh"
+# plug "MichaelAquilina/zsh-you-should-use"
 plug "chivalryq/git-alias"
 # plug "marlonrichert/zsh-autocomplete"
 plug "zap-zsh/fzf"