summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bspwm/.xinitrc1
-rw-r--r--i3/.xinitrc1
-rwxr-xr-xxinit/Scripts/xlaunchrc37
3 files changed, 30 insertions, 9 deletions
diff --git a/bspwm/.xinitrc b/bspwm/.xinitrc
index 26eed8d..c805667 100644
--- a/bspwm/.xinitrc
+++ b/bspwm/.xinitrc
@@ -1,4 +1,5 @@
+export LOPTS="panel"
# Launch other stuff
source ~/Scripts/xlaunchrc
diff --git a/i3/.xinitrc b/i3/.xinitrc
index d989877..9aa3b88 100644
--- a/i3/.xinitrc
+++ b/i3/.xinitrc
@@ -1,4 +1,5 @@
+export LOPTS="composer"
# Launch other stuff
source ~/Scripts/xlaunchrc
diff --git a/xinit/Scripts/xlaunchrc b/xinit/Scripts/xlaunchrc
index 2a27fa2..5614973 100755
--- a/xinit/Scripts/xlaunchrc
+++ b/xinit/Scripts/xlaunchrc
@@ -5,27 +5,46 @@ set +e
setxkbmap -layout us -variant altgr-intl
export _JAVA_AWT_WM_NONREPARENTING=1
-feh --bg-tile /home/julian/Pictures/defaultWall.*
-export TERM=xfce4-terminal
-export TERMINAL=xfce4-terminal
+export TERM=termite
+export TERMINAL=termite
export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh
-dbus-update-activation-environment --systemd DISPLAY &
-eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets) &
-
xmodmap .Xmodmap
xcape -e "Control_R=Escape"
nm-applet &
xscreensaver &
+
+# set wallpaper
+~/Scripts/setwall
+
xss-lock -- xscreensaver-command --lock &
dunst &
-# xcompmgr &
+play ~/Winsounds/login.wav -q &
-# play ~/Winsounds/login.wav -q &
+# Set dbus display variable
+dbus-update-activation-environment --systemd DISPLAY
autorandr -c
-xfce4-panel &
+
+for arg in "$LOPTS"
+do
+ case $arg in
+ *"panel"*)
+ echo starting panel
+ xfce4-panel &
+ ;;
+ *"composer"*)
+ echo starting comp
+ xcompmgr &
+ ;;
+ *"gnome-keyring"*)
+ dbus-update-activation-environment --systemd DISPLAY &
+ eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets) &
+ ;;
+ esac
+done
+
# Please do not block