updates to work with login manager, let's test on other machine

This commit is contained in:
Solomon Laing 2022-05-22 21:43:08 +09:30
parent 7acda4cd9d
commit 39c149d9f0
3 changed files with 22 additions and 9 deletions

View File

@ -126,7 +126,11 @@ LICENSE=:\
*.java=:\ *.java=:\
" "
[ ! -f ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ] && shortcuts >/dev/null 2>&1 & # I'm not using Luke's shortcuts so...
#[ ! -f ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ] && shortcuts >/dev/null 2>&1 &
# This is something luke smith has in his profile (which I have stolen, it's nice but
# doesn't work very nicely with my login manager, lightdm, and I prefer to just run
# startx myself if I'm not using a login manager anyway.
# Start graphical server on user's current tty if not already running. # Start graphical server on user's current tty if not already running.
[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC" #[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC"

View File

@ -18,9 +18,18 @@ if [ "$HOST" == "archmetabox" ] ; then
xrandr --auto xrandr --auto
fi fi
if [ "$HOST" == "holocene" ] ; then # My default is still xmonad, maybe dwm in future?
session=${1:-xmonad}
case $session in
i3|i3wm)
exec i3;;
dwm)
dwmblocks & dwmblocks &
exec dwm exec dwm;;
else xmonad)
./$MOME/.xmonad/start-xmonad.sh exec $HOME/.xmonad/start-xmonad.sh;;
fi # No known session, try to run it as command
*)
exec twm;;
esac

View File

@ -7,7 +7,7 @@ setxkbmap dvorak &
~/.fehbg & ~/.fehbg &
# compositor # compositor
picom & picom --experimental-backend &
# cursor # cursor
xsetroot -cursor_name left_ptr xsetroot -cursor_name left_ptr