big xinit fix

1 files changed, 25 insertions, 15 deletions

diff --git a/.xinitrc b/.xinitrc
index beb01e7..9a5ef8c 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,16 +1,8 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 # xinitrc runs automatically when you run startx.
 
-# There are some small but important commands that need to be run when we start
-# the graphical environment. I keep those commands in ~/.xprofile because that
-# file is run automatically if someone uses a display manager (login screen)
-# and so they are needed there. To prevent doubling up commands, I source them
-# here with the line below.
-
-[ -f ~/.xprofile ] && . ~/.xprofile
-
-startlarbs() {
+guesswm() {
 	# Here, LARBS decides whether to boot dwm or i3. It will boot what is manually
 	# set in ~/.local/share/larbs/wm, otherwise it will test to see if dwm is
 	# installed, in which case it will load dwm. It will assume i3 otherwise.
@@ -30,17 +22,35 @@ startlarbs() {
 		dwm)
 			export FILE="lf"
 			export STATUSBAR="dwmblocks"
-			# The loop is just to enable dwm's "restart" feature (mod+F2).
-			while :; do
-				ssh-agent dwm || break
-			done
+			startlarbs() { # The loop is just to enable dwm's "restart" feature (mod+F2).
+				while :; do
+					ssh-agent dwm || break
+				done ;}
 			;;
 		i3)
 			export FILE="ranger"
 			export STATUSBAR="i3blocks"
-			exec i3
+			startlarbs() { exec i3 ;}
 			;;
 		*) echo "No valid LARBS window manager detected." ;;
 	esac ;}
 
+guesswm
+
+# There are some small but important commands that need to be run when we start
+# the graphical environment. I keep those commands in ~/.xprofile because that
+# file is run automatically if someone uses a display manager (login screen)
+# and so they are needed there. To prevent doubling up commands, I source them
+# here with the line below.
+
+[ -f ~/.xprofile ] && . ~/.xprofile
+
+# There are some small but important commands that need to be run when we start
+# the graphical environment. I keep those commands in ~/.xprofile because that
+# file is run automatically if someone uses a display manager (login screen)
+# and so they are needed there. To prevent doubling up commands, I source them
+# here with the line below.
+
+[ -f ~/.xprofile ] && . ~/.xprofile
+
 startlarbs