diff --git a/arch_linux_init/wm.bash b/arch_linux_init/wm.bash index 047c14c..dc3073e 100755 --- a/arch_linux_init/wm.bash +++ b/arch_linux_init/wm.bash @@ -3,7 +3,7 @@ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd) source "$DIR/variables.bash" -sudo pacman -S xcb-util xcb-util-keysyms xcb-util-wm --noconfirm +sudo pacman -S xcb-util xcb-util-keysyms xcb-util-wm feh --noconfirm mkdir -p "$REPOSITORY_PATH" diff --git a/wm/bspwmrc b/wm/bspwmrc index 36e125d..ea8aef5 100755 --- a/wm/bspwmrc +++ b/wm/bspwmrc @@ -4,6 +4,6 @@ source "$DOTFILES_PATH/variables.bash" source "$DOTFILES_PATH/wm/bspwm_config" -sxhkd & urxvtd & +sxhkd & diff --git a/x/link.bash b/x/link.bash index 5541269..e408c3a 100755 --- a/x/link.bash +++ b/x/link.bash @@ -8,13 +8,13 @@ rm "$HOME/.Xresources" ln -s "$HOME/.dotfiles/x/xinitrc" "$HOME/.xinitrc" ln -s "$HOME/.dotfiles/x/xresources" "$HOME/.Xresources" -xrdb "$HOME/.Xresources" +xrdb "$HOME/.Xresources" >/dev/null 2>&1 if [ -f "$HOME/.Xresources.colors" ]; then - xrdb -merge "$HOME/.Xresources.colors" + xrdb -merge "$HOME/.Xresources.colors" >/dev/null 2>&1 fi if [ -f "$HOME/.Xresources.env" ]; then - xrdb -merge "$HOME/.Xresources.env" + xrdb -merge "$HOME/.Xresources.env" >/dev/null 2>&1 fi diff --git a/x/xinitrc b/x/xinitrc index 6507bf6..1c50c52 100644 --- a/x/xinitrc +++ b/x/xinitrc @@ -1,42 +1,19 @@ #!/bin/sh -userresources=$HOME/.Xresources -usercolors=$HOME/.Xresources.colors -userenv=$HOME/.Xresources.env -usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap - -if [ -f $sysresources ]; then - xrdb -merge $sysresources +if [ -f ~/.fehbg ]; then + ~/.fehbg & fi -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi +source "$DOTFILES_PATH/x/xloadresources" -if [ -f "$userresources" ]; then - xrdb -merge "$userresources" -fi +# keyrepeat settings +xset r rate 300 80 & -if [ -f "$usercolors" ]; then - xrdb -merge "$usercolors" -fi - -if [ -f "$userenv" ]; then - xrdb -merge "$userenv" -fi - -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f -fi +# no screen blanking +xset -dpms & +xset s noblank & +xset s off & +# fire up wm exec bspwm diff --git a/x/xloadresources b/x/xloadresources new file mode 100644 index 0000000..ba04e16 --- /dev/null +++ b/x/xloadresources @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +userresources=$HOME/.Xresources +usercolors=$HOME/.Xresources.colors +userenv=$HOME/.Xresources.env +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +if [ -f "$usercolors" ]; then + xrdb -merge "$usercolors" +fi + +if [ -f "$userenv" ]; then + xrdb -merge "$userenv" +fi + +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f +fi +