diff --git a/fonts/fontconfig/fonts.conf b/fonts/fontconfig/fonts.conf index 740ede6..1f6bf9e 100644 --- a/fonts/fontconfig/fonts.conf +++ b/fonts/fontconfig/fonts.conf @@ -1,78 +1,81 @@ - - monospace - - Drafting* Mono - Symbols Nerd Font - Unifont - - - - sans-serif - - Graphik - Unifont - - - - Helvetica - - Graphik - - - - Times - - Merriweather - - - - Georgia - - Merriweather - - - - Charter - - Merriweather - - - - serif - - Merriweather - Unifont - - - - - mono - - - false - - - ~/.fonts - - - rgb - - - - - true - - - - - hintslight - - - - - true - - + + monospace + + MonoLisa + Unifont + + + + sans-serif + + DejaVu Sans + Unifont + + + + Helvetica + + DejaVu Sans + Unifont + + + + Times + + DejaVu Serif + Unifont + + + + Georgia + + DejaVu Serif + Unifont + + + + Charter + + DejaVu Serif + Unifont + + + + serif + + DejaVu Serif + Unifont + + + + + mono + + + false + + + ~/.fonts + + + rgb + + + + + true + + + + + hintslight + + + + + true + + diff --git a/fonts/fonts.txz.gpg b/fonts/fonts.txz.gpg index fa3c52c..5cbf4fc 100644 Binary files a/fonts/fonts.txz.gpg and b/fonts/fonts.txz.gpg differ diff --git a/fonts/install-termux b/fonts/install-termux index 3dc021d..528d4e4 100755 --- a/fonts/install-termux +++ b/fonts/install-termux @@ -2,5 +2,5 @@ mkdir -p ~/fontstemp gpg --decrypt fonts.txz.gpg | tar xJvC ~/fontstemp -cp ~/fontstemp/fonts/DraftingMono-Regular.ttf ~/.termux/font.ttf +cp ~/fontstemp/fonts/MonaLisa-normal.ttf ~/.termux/font.ttf rm -rf ~/fontstemp diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 19fc1e4..7bfaddf 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -20,7 +20,7 @@ #: . -font_size 14.0 +font_size 13.0 #: Font size (in pts). @@ -2616,8 +2616,8 @@ include current-theme.conf # BEGIN_KITTY_FONTS -font_family family='Drafting* Mono' style=Light -bold_font family='Drafting* Mono' style=Medium -italic_font family='Drafting* Mono' style='Light Italic' -bold_italic_font family='Drafting* Mono' style='Medium Italic' +font_family family='MonoLisa' style=Light features='+ss07 +ss11 +ss18 -liga +zero' +bold_font family='MonoLisa' style=Medium features='+ss07 +ss11 +ss18 -liga +zero' +italic_font family='MonoLisa' style='Light Italic' features='+ss07 +ss11 +ss18 -liga +zero' +bold_italic_font family='MonoLisa' style='Medium Italic' features='+ss07 +ss11 +ss18 -liga +zero' # END_KITTY_FONTS diff --git a/scripts/swaystatus.sh b/scripts/swaystatus.sh index 546ab11..d855192 100755 --- a/scripts/swaystatus.sh +++ b/scripts/swaystatus.sh @@ -19,7 +19,7 @@ print_stat() { print_icon() { icon=$1 - echo -n "$icon " + echo -n "$icon " } read -r -d '' -a cpu < <(sicli -i cpu -p0) @@ -46,7 +46,7 @@ status=$( print_icon "" print_stat "${cpu[0]}" "${cpu[1]}" echo -n " $separator " - print_icon "" + print_icon "" print_stat "${ram[0]}" "${ram[1]}" echo -n " $separator " print_icon "" diff --git a/sway/config.d/05-swaybar b/sway/config.d/05-swaybar index 2b9a57d..022e31d 100644 --- a/sway/config.d/05-swaybar +++ b/sway/config.d/05-swaybar @@ -1,6 +1,6 @@ bar { position top - font monospace 13 + font "MonoLisa" 13 status_command while ~/skynet/scripts/swaystatus.sh; do sleep 3; done pango_markup enabled