From 00112acf28acf9e7fcffa2439922bef6b95e29e2 Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 20 Jun 2023 01:10:58 +0000 Subject: [PATCH] xinitrc: load Xdefaults into XRDB only when Xresources is present This reallows for editing Xdefaults in runtime. This is not supported by all programs, sadly. nsxiv is one of such programs. --- dotfiles/xinitrc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dotfiles/xinitrc b/dotfiles/xinitrc index 0aaffb9..bf8ac81 100755 --- a/dotfiles/xinitrc +++ b/dotfiles/xinitrc @@ -1,6 +1,6 @@ #!/bin/sh # env -# Written in 2019-2022 by Lucas +# Written in 2019-2023 by Lucas # CC0 1.0 Universal/Public domain - No rights reserved # # To the extent possible under law, the author(s) have dedicated all @@ -23,10 +23,11 @@ xset r rate 300 75 xset b off -xrdb -load ~/.Xdefaults if [ -r ~/.Xresources ]; then + xrdb -load ~/.Xdefaults xrdb -merge ~/.Xresources fi + if [ -r ~/code/lucas/env/utils/scripts/x-dpi-facesizes.sh ]; then sh ~/code/lucas/env/utils/scripts/x-dpi-facesizes.sh fi