switch font to Iosevka Light, fix dmenu font argument

This commit is contained in:
Łukasz Pankowski 2020-08-08 19:37:45 +02:00
parent fa4d56a6f4
commit e0c5b576e6
3 changed files with 14 additions and 6 deletions

View File

@ -94,6 +94,8 @@ colors: *lupan-dark
font: font:
size: 13.5 size: 13.5
normal: normal:
family: Iosevka Light
bold:
family: Iosevka family: Iosevka
key_bindings: key_bindings:

View File

@ -5,7 +5,7 @@ Xcursor.size: 48
Xft.dpi: 107 Xft.dpi: 107
#endif #endif
emacs.font: Iosevka-13.5 emacs.font: Iosevka Light-13.5
emacs.cursorBlink: false emacs.cursorBlink: false
emacs.scrollBarWidth: 20 emacs.scrollBarWidth: 20
emacs.background: #424242 emacs.background: #424242

View File

@ -4,7 +4,7 @@ THEMES_PATH=~/.config/bspwm/themes
CURRENT_THEME_PATH="${THEMES_PATH}/theme.sh" CURRENT_THEME_PATH="${THEMES_PATH}/theme.sh"
DEFAULT_THEME=lupan-dark DEFAULT_THEME=lupan-dark
FONT=Iosevka-13.5 FONT='Iosevka Light-13.5'
BAR_FONT="${FONT};5" BAR_FONT="${FONT};5"
BAR_HEIGHT=35 BAR_HEIGHT=35
@ -50,7 +50,13 @@ else
. "${THEMES_PATH}/${DEFAULT_THEME}-theme.sh" . "${THEMES_PATH}/${DEFAULT_THEME}-theme.sh"
fi fi
DMENU_ARGS="-nb ${BAR_BG} -nf ${BAR_FG} -sb ${BAR_ACTIVE} -sf ${BAR_FG} -fn ${FONT}" dmenu() {
command dmenu -nb ${BAR_BG} -nf ${BAR_FG} -sb ${BAR_ACTIVE} -sf ${BAR_FG} -fn "${FONT}" $@
}
dmenu_run() {
command dmenu_run -nb ${BAR_BG} -nf ${BAR_FG} -sb ${BAR_ACTIVE} -sf ${BAR_FG} -fn "${FONT}" $@
}
set_theme() { set_theme() {
echo "THEME=${THEME}" > "${CURRENT_THEME_PATH}" echo "THEME=${THEME}" > "${CURRENT_THEME_PATH}"
@ -79,12 +85,12 @@ case "$CMD" in
set_theme set_theme
;; ;;
dmenu|dmenu_run) dmenu|dmenu_run)
exec "$CMD" ${DMENU_ARGS} "$@" "$CMD" "$@"
;; ;;
dmenu_window) dmenu_window)
bspc node -f $(xtitle -f '%u %s\n' $(bspc query -N -n .window) \ bspc node -f $(xtitle -f '%u %s\n' $(bspc query -N -n .window) \
| dmenu ${DMENU_ARGS} "$@" -l 20 -i -p Window: | cut -f 1 -d ' ') | dmenu -l 20 -i -p Window: "$@" | cut -f 1 -d ' ')
;; ;;
dmenu_theme) dmenu_theme)
sh "$0" theme $(list_themes | dmenu ${DMENU_ARGS} "$@" -p Theme:) sh "$0" theme $(list_themes | dmenu -p Theme: "$@")
esac esac