diff --git a/de/bar/bar.bash b/de/bar/bar.bash index 03743b4..523c930 100755 --- a/de/bar/bar.bash +++ b/de/bar/bar.bash @@ -10,7 +10,7 @@ MONITOR_WIDTH=$(xrandr | grep "$BAR_MONITOR" | grep -Po ' \d+' | head -n 1) export BAR_FONT="${BAR_FONT:-$(xrdb -query | sed -ne 's/.*font:\s*xft:\([^:]*\)\:.*$/\1/p' | head -n 1)}" export BAR_ICON_FONT="${BAR_ICON_FONT:-"Font Awesome 5 Free"}" -export BAR_FONT_SIZE="${BAR_FONT_SIZE:-$(xrdb -query | sed -ne 's/.*font:\s*xft:[^-]*\=\([0-9]*\).*$/\1/p' | head -n 1)}" +export BAR_FONT_SIZE="${BAR_FONT_SIZE:-$(xrdb -query | sed -ne 's/.*font:\s*xft:[^-,]*\=\([0-9]*\).*$/\1/p' | head -n 1)}" export BAR_ICON_FONT_SIZE="${BAR_ICON_FONT_SIZE:-$((BAR_FONT_SIZE))}" export GAP=$(bspc wm -d | grep -Po '(windowGap.*?,)' | grep -Po '\-?\d*' | head -n 1) diff --git a/de/bspwm/bspwmrc b/de/bspwm/bspwmrc index 8f732a8..c254057 100755 --- a/de/bspwm/bspwmrc +++ b/de/bspwm/bspwmrc @@ -38,9 +38,9 @@ if command -v sxhkd >/dev/null 2>&1; then sxhkd -m -1 & fi -# if [ -f "$DOTFILES_PATH/de/x/loadresources" ]; then -# source "$DOTFILES_PATH/de/x/loadresources" -# fi +if [ -f "$DOTFILES_PATH/de/x/loadresources" ]; then + "$DOTFILES_PATH/de/x/loadresources" +fi if [ -f "$HOME/.fehbg" ]; then "$HOME/.fehbg" & diff --git a/de/x/initrc b/de/x/initrc index 37263ff..57df8d8 100644 --- a/de/x/initrc +++ b/de/x/initrc @@ -23,6 +23,7 @@ if [ -f "$HOME/.xmodmap" ]; then fi echo "a" > ~/.xinitrc.log +echo "initrc" > ~/.xstartup_log eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) export SSH_AUTH_SOCK diff --git a/de/x/loadresources b/de/x/loadresources index a514108..effc369 100755 --- a/de/x/loadresources +++ b/de/x/loadresources @@ -7,6 +7,8 @@ ENV_TYPE="${1}" if [[ "$ENV_TYPE" = "auto" ]]; then if [[ "$(xrandr --listmonitors | grep 'Monitors:' | awk '{print $2}')" -gt 1 ]]; then ENV_TYPE="lodpi" + else + ENV_TYPE="" fi echo "xloadresources auto env: $ENV_TYPE" >> "$HOME/.xstartup_log" fi @@ -24,6 +26,8 @@ usercolors="$HOME/.Xresources.colors" userenv="$HOME/.Xresources${ENV_TYPE}.env" usermodmap="$HOME/.Xmodmap" +echo "userenv: $userenv" >> "$HOME/.xstartup_log" + if [ -f "$sysresources" ]; then xrdb -merge "$sysresources" >/dev/null 2>&1 fi @@ -41,6 +45,7 @@ if [ -f "$usercolors" ]; then fi if [ -f "$userenv" ]; then + echo "Merging env Xresources: $userenv" >> ~/.xstartup_log xrdb -merge "$userenv" >/dev/null 2>&1 fi diff --git a/de/x/profile b/de/x/profile index 0dbc983..055eb37 100644 --- a/de/x/profile +++ b/de/x/profile @@ -13,10 +13,6 @@ fi echo "xprofile ($DOTFILES_PATH)" >> "$HOME/.xstartup_log" -if [ -f "$DOTFILES_PATH/de/x/loadresources" ]; then - "$DOTFILES_PATH/de/x/loadresources" auto -fi - # keyrepeat settings xset r rate 250 80 & @@ -40,8 +36,8 @@ if [ -f "$HOME/.xmodmap" ]; then xmodmap "$HOME/.xmodmap" fi -if [ -f "$HOME/.env_xprofile" ]; then - source "$HOME/.env_xprofile" +if [ -f "$DOTFILES_PATH/de/x/loadresources" ]; then + "$DOTFILES_PATH/de/x/loadresources" fi if command -v xcape >/dev/null 2>&1; then @@ -52,3 +48,7 @@ if command -v autocutsel >/dev/null 2>&1; then autocutsel -fork & autocutsel -selection PRIMARY -fork & fi + +if [ -f "$HOME/.env_xprofile" ]; then + source "$HOME/.env_xprofile" +fi diff --git a/de/x/resources b/de/x/resources index 25c2ed0..02c5886 100755 --- a/de/x/resources +++ b/de/x/resources @@ -45,6 +45,7 @@ Xcursor.theme: human ## DPI config dpi: 92 .dpi: 92 +*dpi: 92 Xft.dpi: 92 *autohint: 0 *lcdfilter: lcddefault