repositories
/
dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:dopefishh/dotfiles
[dotfiles.git]
/
x
/
.xinitrc
diff --git
a/x/.xinitrc
b/x/.xinitrc
index
763a2b5
..
2822f41
100755
(executable)
--- a/
x/.xinitrc
+++ b/
x/.xinitrc
@@
-1,17
+1,31
@@
#!/bin/bash
#!/bin/bash
-PATH=$PATH:~/.local/bin
-xautolock -locker ~/.local/bin/lock.sh &
+#To fix java applications in tiling (e.g. arduino)
+export _JAVA_AWT_WM_NONREPARENTING=1
+
+# notifications
dunst &
dunst &
+# gpg agent
eval "$(gpg-agent --daemon)"
eval "$(gpg-agent --daemon)"
+
+# XResources
xrdb -merge ~/.Xresources
xrdb -merge ~/.Xresources
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
- for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+# auto locking but only on laptop
+if [ $(hostname) != ygdrassil ]; then
+ xautolock -locker slock -time 10 &
+fi
+
+# Other system wide xinit files
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh; do
[ -x "$f" ] && . "$f"
done
[ -x "$f" ] && . "$f"
done
- unset f
fi
fi
+# status bar
while true; do xsetroot -name "$(bar)"; sleep 1m; done &
while true; do xsetroot -name "$(bar)"; sleep 1m; done &
-while true; do dwm >dwm.log 2>&1; done
+
+#xrandr --setmonitor Presentation 3840/1040x1080/640+0+0 eDP1,HDMI1
+#xrandr --output eDP1 --mode 1920x1080 --output HDMI1 --mode 1920x1080 --right-of=eDP1
+while true; do dwm 1>/tmp/dwm.log 2>&1; done