Put X script directly into .zprofile

5 files changed, 9 insertions, 10 deletions

diff --git a/etc/.zprofile b/etc/.zprofile
index cadc848..c311330 100644
--- a/etc/.zprofile
+++ b/etc/.zprofile
@@ -15,6 +15,14 @@ echo
 
 [[ -n $(echo Maildir/new/*(N)) ]] && pr_info "You have mail!"
 [[ -r ${ZDIR}/local-profile ]] && source ${ZDIR}/local-profile
-[[ -r ${ZDIR}/hosts/profile-${HOST} ]] && source ${ZDIR}/hosts/profile-${HOST}
+
+if [[ ${HOST} == (remnant|saviour) && -z ${SSH_CONNECTION} && \
+	! -e /tmp/.x-started ]] \
+{
+	touch /tmp/.x-started
+	unsetopt bg_nice
+	xinit /home/derf/.xinitrc -- /etc/X11/xinit/xserverrc :0 -auth \
+		$(mktemp --tmpdir serverauth.XXXXXXXXXX) &! exit
+}
 
 unfunction pr_info
diff --git a/etc/hosts/profile-kraftwerk b/etc/hosts/profile-kraftwerk
deleted file mode 120000
index 1f23414..0000000
--- a/etc/hosts/profile-kraftwerk
+++ /dev/null
@@ -1 +0,0 @@
-../startx
\ No newline at end of file
diff --git a/etc/hosts/profile-remnant b/etc/hosts/profile-remnant
deleted file mode 120000
index 1f23414..0000000
--- a/etc/hosts/profile-remnant
+++ /dev/null
@@ -1 +0,0 @@
-../startx
\ No newline at end of file
diff --git a/etc/hosts/profile-saviour b/etc/hosts/profile-saviour
deleted file mode 120000
index 1f23414..0000000
--- a/etc/hosts/profile-saviour
+++ /dev/null
@@ -1 +0,0 @@
-../startx
\ No newline at end of file
diff --git a/etc/startx b/etc/startx
deleted file mode 100644
index 5492c4b..0000000
--- a/etc/startx
+++ /dev/null
@@ -1,6 +0,0 @@
-## vim:ft=zsh
-if [[ -z ${SSH_CONNECTION} && ! -e /tmp/.x-started ]] {
-	touch /tmp/.x-started
-	unsetopt bg_nice
-	xinit /home/derf/.xinitrc -- /etc/X11/xinit/xserverrc :0 -auth $(mktemp --tmpdir serverauth.XXXXXXXXXX) &! exit
-}