Update xinitrc for gnome

This commit is contained in:
natemaia 2018-08-19 20:19:41 -07:00
parent 6b6f82837c
commit 35266434f6

View File

@ -7,10 +7,12 @@
# session to run if none passed as first arg ($1) # session to run if none passed as first arg ($1)
session="${1:-openbox}" session="${1:-openbox-session}"
# set environment wm for use in scripts # set environment wm for use in scripts
export WM="$session" WM="${session%-session}"
WM="${session#start}"
export WM
# default arch xinit scripts # default arch xinit scripts
if [ -d /etc/X11/xinit/xinitrc.d ]; then if [ -d /etc/X11/xinit/xinitrc.d ]; then
@ -25,27 +27,6 @@ fi
[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources [ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
[ -f ~/.xprofile ] && source ~/.xprofile [ -f ~/.xprofile ] && source ~/.xprofile
# some things to start for awesome
# other wm already have these started elsewhere
if [[ $session == "awesome" ]]; then
# keyring for storing passwords
if hash gnome-keyring &>/dev/null; then
gnome-keyring-daemon --start --components=pkcs11 &
fi
# gnome polkit
if [[ -x /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 ]]; then
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
fi
# simulate Alt+F1 with just pressing Super
if hash ksuperkey &>/dev/null; then
ksuperkey -e 'Super_L=Alt_L|F1' &
ksuperkey -e 'Super_R=Alt_L|F1' &
fi
fi
# display timeout and sleep # display timeout and sleep
xset s 3600 3600 xset s 3600 3600
xset dpms 3600 3700 4000 xset dpms 3600 3700 4000
@ -56,10 +37,11 @@ kbdrate -d 400 -r 50
# do NOT put commands below the exec lines # do NOT put commands below the exec lines
case $session in case $session in
i3|i3wm) exec i3 ;; i3|i3wm|i3-gaps) exec i3 ;;
bsp|bspwm) exec bspwm ;; bsp|bspwm) exec bspwm ;;
xfce|xfce4) exec startxfce4 ;; xfce|xfce4|startxfce4) exec startxfce4 ;;
openbox) exec openbox-session ;; openbox|openbox-session) exec openbox-session ;;
awesome) exec awesome ;; awesome|awesomewm) exec awesome ;;
gnome|gnome-session) exec gnome-session ;;
*) exec "$session" # Unknown, try running it *) exec "$session" # Unknown, try running it
esac esac