commit 1d30671229072acb83500b74af871fdf32d52285 parent ac63b4167eacd6e4b20f86ee8e33751d0b60dde4 Author: Anders Damsgaard <anders@adamsgaard.dk> Date: Tue, 19 Jan 2021 11:27:16 +0100 merge .xprofile into .xsession Diffstat:
| D | .xprofile | | | 36 | ------------------------------------ |
| M | .xsession | | | 23 | +++++++++++++++++++++-- |
2 files changed, 21 insertions(+), 38 deletions(-)
diff --git a/.xprofile b/.xprofile @@ -1,36 +0,0 @@ -#!/bin/sh - -xsetroot -solid "$(sed -n 's/^\*\.background: #/#/p' ~/.Xresources)" - -#[ -f ~/doc/colorprofile.icc ] && xcalib ~/doc/colorprofile.icc - -eval "$(gpg-agent)" -if [ -z "$SSH_AUTH_SOCK" ] ; then - eval $(ssh-agent -s) -fi - -setxkbmap -option ctrl:nocaps - -xset -b # Disable beeps -xset +dpms # Energy Star features on -if [ "$(hostname)" = "iddqd" ]; then - xset s off -dpms -else - xset dpms 300 600 900 -fi - -if [ "$(uname)" = "OpenBSD" ]; then - xset m 2/1 0 -else - xset m 1/4 0 -fi - -xset r rate 300 50 # key repeat rate ([delay in ms] [repeats per sec]) - -dunst & -spoon >/dev/null 2>&1 & -if [ "$(uname)" = OpenBSD ]; then - xidle -timeout 600 & -else - xautolock -time 20 -locker "slock" & -fi diff --git a/.xsession b/.xsession @@ -1,6 +1,6 @@ #!/bin/sh +set -x [ -f ~/.profile ] && . ~/.profile -[ -f ~/.xprofile ] && . ~/.xprofile [ -f ~/.Xresources ] && xrdb ~/.Xresources if [ "$(hostname)" = "lmsc.home" ] && [ "$DISPLAY" = :0 ]; then @@ -8,19 +8,38 @@ if [ "$(hostname)" = "lmsc.home" ] && [ "$DISPLAY" = :0 ]; then [ -f ~/.Xresources-hidpi ] && xrdb -merge ~/.Xresources-hidpi fi +xsetroot -solid "#000000" +setxkbmap -option ctrl:nocaps + +xset -b # Disable beeps +xset +dpms # Energy Star features on +xset dpms 300 600 900 +xset r rate 300 50 # key repeat rate ([delay in ms] [repeats per sec]) + if [ "$(uname)" = "OpenBSD" ]; then xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation" 1 xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Button" 2 xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Axes" 6 7 4 5 + xset m 2/1 0 + xidle -timeout 600 & +else + xset m 1/4 0 + xautolock -time 20 -locker "slock" & fi if [ -z "$SSH_AGENT_PID" ]; then if [ -x /usr/bin/ssh-agent ] && [ -f $HOME/.ssh/id_rsa ]; then eval "$(ssh-agent -s)" - ssh-add </dev/null # requires x11-ssh-askpass(1) + ssh-add < /dev/null fi fi +GPG_TTY=$(tty) +export GPG_TTY + +dunst & +spoon >/dev/null 2>&1 & + dwm || xterm if [ "$SSH_AGENT_PID" ]; then