From 44ec46cf8e234e731aac00b66555a73a1d553b9e Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Wed, 24 Sep 2014 13:08:57 +0200 Subject: zsh/zprofile: remove HOSTNAME/FQDN variables, replace with SHORTHOST SHORTHOST to match with the zsh built in HOST variable --- zsh/.zprofile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/zsh/.zprofile b/zsh/.zprofile index 325f130..946bc5f 100644 --- a/zsh/.zprofile +++ b/zsh/.zprofile @@ -35,19 +35,17 @@ export GTK_IM_MODULE=xim export SUDO_PROMPT=$'\e[31mSUDO\e[m password for \e[34m%p\e[m: ' -export HOSTNAME=$(hostname -s) -export FQDN=$(hostname -f) - export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/"$UID"/dbus/user_bus_socket +export SHORTHOST=$(hostname -s) export XAUTHORITY="$XDG_RUNTIME_DIR"/xauthority +if [[ -f "$ZDOTDIR"/profile-"$SHORTHOST" ]]; then + source "$ZDOTDIR"/profile-"$SHORTHOST" +fi # LS_COLORS is now required for `ls` to use colour source <(dircolors -b "$XDG_CONFIG_HOME"/dircolors) -[[ -f "$ZDOTDIR"/profile-"$(hostname -s)" ]] && \ - source "$ZDOTDIR"/profile-"$(hostname -s)" - if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then exec startx "$XDG_CONFIG_HOME"/X11/xinitrc fi -- cgit v1.2.3-70-g09d2