aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.xinitrc29
-rw-r--r--.zprofile3
2 files changed, 19 insertions, 13 deletions
diff --git a/.xinitrc b/.xinitrc
index 2714d16..6583274 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -7,21 +7,13 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps
-if [ -f $sysresources ]; then
- xrdb -merge $sysresources
-fi
+[ -f $sysresources ] && xrdb -merge $sysresources
-if [ -f $sysmodmap ]; then
- xmodmap $sysmodmap
-fi
+[ -f $sysmodmap ] && xmodmap $sysmodmap
-if [ -f "$userresources" ]; then
- xrdb -merge "$userresources"
-fi
+[ -f "$userresources" ] && xrdb -merge "$userresources"
-if [ -f "$usermodmap" ]; then
- xmodmap "$usermodmap"
-fi
+[ -f "$usermodmap" ] && xmodmap "$usermodmap"
# start some nice programs
@@ -34,5 +26,16 @@ fi
nitrogen --restore &
picom &
+dunst &
+#xmodmap .Xmodmap
+
+echo $1 >> /tmp/pepe
+
+case $1 in
+ xmonad) exec xmonad ;;
+ openbox) exec openbox-session ;;
+ *) exec xmonad ;;
+esac
+
-exec xmonad
+# exec xmonad
diff --git a/.zprofile b/.zprofile
new file mode 100644
index 0000000..2a4b59f
--- /dev/null
+++ b/.zprofile
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+[[ -f ~/.config/zsh/.zshenv ]] && source ~/.config/zsh/.zshenv