From 35266434f67ec641fccd92b4ad55e350945abf95 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Sun, 19 Aug 2018 20:19:41 -0700
Subject: [PATCH] Update xinitrc for gnome

---
 home/.xinitrc | 40 +++++++++++-----------------------------
 1 file changed, 11 insertions(+), 29 deletions(-)

diff --git a/home/.xinitrc b/home/.xinitrc
index df7b2498..52720977 100755
--- a/home/.xinitrc
+++ b/home/.xinitrc
@@ -7,10 +7,12 @@
 
 
 # session to run if none passed as first arg ($1)
-session="${1:-openbox}"
+session="${1:-openbox-session}"
 
 # set environment wm for use in scripts
-export WM="$session"
+WM="${session%-session}"
+WM="${session#start}"
+export WM
 
 # default arch xinit scripts
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
@@ -25,27 +27,6 @@ fi
 [ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
 [ -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
 xset s 3600 3600
 xset dpms 3600 3700 4000
@@ -56,10 +37,11 @@ kbdrate -d 400 -r 50
 
 # do NOT put commands below the exec lines
 case $session in
-    i3|i3wm)    exec i3 ;;
-    bsp|bspwm)  exec bspwm ;;
-    xfce|xfce4) exec startxfce4 ;;
-    openbox)    exec openbox-session ;;
-    awesome)    exec awesome ;;
-    *)          exec "$session" # Unknown, try running it
+    i3|i3wm|i3-gaps)         exec i3 ;;
+    bsp|bspwm)               exec bspwm ;;
+    xfce|xfce4|startxfce4)   exec startxfce4 ;;
+    openbox|openbox-session) exec openbox-session ;;
+    awesome|awesomewm)       exec awesome ;;
+    gnome|gnome-session)     exec gnome-session ;;
+    *)                       exec "$session" # Unknown, try running it
 esac