summaryrefslogtreecommitdiff
path: root/config/essentials
diff options
context:
space:
mode:
Diffstat (limited to 'config/essentials')
-rw-r--r--config/essentials/shell/aliases.sh3
-rw-r--r--config/essentials/zsh/.zshrc12
2 files changed, 8 insertions, 7 deletions
diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index 44aa7bc..5db3d65 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -3,7 +3,8 @@
# The most important one
alias vi='nvim'
-alias cd='z'
+which z > /dev/null 2>&1 &&
+ alias cd='z'
# Zsh specific aliases
if [ $SHELL = "/bin/zsh" ]
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 6e28602..2b3ae1a 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