1
0
Fork 0

Now using ~/.Xresources.d

This allows for both easily splitting configuration files and for per-system
configuration (for the latter, one need only put another file in the
directory).
org
Mike Gerwitz 2014-04-16 03:15:55 -04:00
parent 1c200677b6
commit 51f44a2759
No known key found for this signature in database
GPG Key ID: F22BB8158EE30EAB
2 changed files with 13 additions and 4 deletions

View File

@ -50,3 +50,5 @@ urxvt.modifier: alt
! white ! white
*color7: #babdb6 *color7: #babdb6
*color15: #d3d7cf *color15: #d3d7cf
! vim: set ft=xdefaults:

15
xinitrc
View File

@ -1,12 +1,19 @@
#!/bin/sh
setxkbmap -option ctrl:nocaps setxkbmap -option ctrl:nocaps
xmodmap ~/.xmodmap xmodmap ~/.xmodmap
xset mouse 5/0.1 xset mouse 5/0.1
xsetroot -cursor_name arrow xsetroot -cursor_name arrow
# .Xresources is managed by software (e.g. Puppet) whereas .Xresources-local # .Xresources will be included by convention, but .Xresources.d should be used
# may contain any system-specific configuration # instead; the latter will override the former
xrdb -merge ~/.Xresources xrd="$HOME/.Xresources.d"
test -f ~/.Xresources-local && xrdb -merge ~/.Xresources-local test -f ~/.Xresources && xrdb -merge ~/.Xresources
test -d "$xrd" && {
for xr in "$xrd"/*; do
xrdb -merge "$xr"
done
}
# .xprofile is *not* managed by software (such as Puppet) and may therefore # .xprofile is *not* managed by software (such as Puppet) and may therefore
# be used for system-specific configuration # be used for system-specific configuration