added xloadresources
This commit is contained in:
parent
7ed193d7d7
commit
4aeef2d74d
5 changed files with 55 additions and 38 deletions
|
@ -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"
|
||||
|
||||
|
|
|
@ -4,6 +4,6 @@ source "$DOTFILES_PATH/variables.bash"
|
|||
|
||||
source "$DOTFILES_PATH/wm/bspwm_config"
|
||||
|
||||
sxhkd &
|
||||
urxvtd &
|
||||
sxhkd &
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
43
x/xinitrc
43
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
|
||||
|
||||
|
|
40
x/xloadresources
Normal file
40
x/xloadresources
Normal file
|
@ -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
|
||||
|
Reference in a new issue