From: sev Date: Mon, 5 Apr 2021 10:04:23 +0000 (-0500) Subject: update colors, fonts, and related configs X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/commitdiff_plain/4ab8c2987fc7c57fc7f1b0f9986619c2a770821d update colors, fonts, and related configs get rid of solarized—it does not serve my purpose. replace with original scheme based on symmetric variances on the color wheel. yellow is now orange, magenta is purple. a script has been added to display term color sequences in a nicer way than what is commonly available. update cursor, fade, etc. in .Xresources. also, delete yeahconsole from Xresources while we are here. first attempt at building a TTF from Dina BDFs. Vim and tmux appear to use bold italic where it shouldn't which looks weird, but terminal color codes come out fine. underscore is also misplaced, it is at the bottom of the glyphs instead of at the baseline. Dina and other monospace fonts are fixed upstream, so re-enable in fontconfig. add some small tweaks while we are there. https://savannah.nongnu.org/bugs/?56067 add termux colors.properties, and font.ttf link to installer. --- diff --git a/base/.Xresources b/base/.Xresources index 3f56cd4..f81b439 100644 --- a/base/.Xresources +++ b/base/.Xresources @@ -1,10 +1,14 @@ ! fonts +! X11 font server fontspec *font: -windows-dina-medium-r-*-*-10-80-*-*-*-*-* +! xft/fontconfig +! NOTE: xterm etc. use faceName for Xft fonts. classic font server rendering is +! preferred so this is just in case the program doesn't support PCF. *faceName: Dina *faceSize: 8 +! matches font.conf, just in case Xft.antialias: 1 Xft.rgba: rgb -Xft.dpi: 96 Xft.hinting: 1 Xft.hintstyle: hintslight @@ -12,56 +16,38 @@ Xft.hintstyle: hintslight Xcursor.theme: Paper-Mono-Dark ! colors -! http://ethanschoonover.com/solarized -!#define S_base03 #002b36 -#define S_base03 #000a0d -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 -#define S_base0 #839496 -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -!#define S_green #859900 -#define S_green #85c000 -*background: S_base03 -*foreground: S_base0 -*fadeColor: S_base03 -*cursorColor: S_base1 -*pointerColorBackground: S_base01 -*pointerColorForeground: S_base1 -*underlineColor: S_yellow -! black -*color0: S_base02 -*color8: S_base03 +*background: #010812 +*foreground: #798699 +*fading: 40 +*fadeColor: #820ad5 +*cursorColor: #6408a4 +*pointerColorBackground: #6408a4 +*pointerColorForeground: #191c21 +*underlineColor: #d5820a +! black/grey +*color0: #191c21 +*color8: #3b434e ! red -*color1: S_red -*color9: S_orange +*color1: #d51d0a +*color9: #f4321e ! green -*color2: S_green -*color10: S_base01 +*color2: #5dd50a +*color10: #75f41e ! yellow -*color3: S_yellow -*color11: S_base00 +*color3: #d5820a +*color11: #f49d1e ! blue -*color4: S_blue -*color12: S_base0 +*color4: #0a5dd5 +*color12: #1e75f4 ! magenta -*color5: S_magenta -*color13: S_violet +*color5: #820ad5 +*color13: #9d1ef4 ! cyan -*color6: S_cyan -*color14: S_base1 -! white -*color7: S_base2 -*color15: S_base3 +*color6: #0ac2d5 +*color14: #1ee0f4 +! light grey/white +*color7: #bcc2cc +*color15: #e8ebee ! URxvt URxvt.termName: rxvt-unicode-256color @@ -69,7 +55,7 @@ URxvt.perl-ext: URxvt.perl-ext-common: searchable-scrollback,confirm-paste,matcher,font-size URxvt.depth: 32 -URxvt.background: rgba:0000/0a00/0d00/d000 +URxvt.background: rgba:0100/0800/1200/d000 URxvt.internalBorder: 1 URxvt.dynamicColors: true URxvt.intensityStyles: false @@ -79,7 +65,7 @@ URxvt.scrollBar_right: true URxvt.urgentOnBell: true URxvt.visualBell: true -URxvt.url-launcher: firefox +URxvt.url-launcher: xdg-open URxvt.matcher.button: 2 URxvt.matcher.pattern.0: [a-zA-Z\d]+:/\/[\\w-](?:\\.?[\\w-]+)*(?::\\d{1,5})?(?:/(?:[\\w\\d\\.!#$&\\-;=?~[\\]/]|%[\\da-fA-F]{2})*)? URxvt.matcher.rend.0: Uline Bold fg6 @@ -128,19 +114,3 @@ xvkbd.Alt_R.width: 1 xvkbd.Meta_R.width: 1 xvkbd.Multi_key.width: 1 xvkbd.Shift_R.width: 75 - -! yeahconsole -yeahconsole.term: urxvtc -yeahconsole.toggleKey: Alt+grave -yeahconsole.keySmaller: AltShift+subtract -yeahconsole.keyBigger: AltShift+equals -yeahconsole.keyFull: Alt+F11 -yeahconsole.scrollBar: false -yeahconsole.cursorUnderline: true -yeahconsole.visualBell: true - -yeahconsole.depth: 32 -yeahconsole.borderLess: true -yeahconsole.transparent: true -yeahconsole.shading: 80 -yeahconsole.blurRadius: 2x4 diff --git a/bin/colors b/bin/colors new file mode 100755 index 0000000..60eabc0 --- /dev/null +++ b/bin/colors @@ -0,0 +1,17 @@ +#!/bin/zsh +attrs=(none bold dim italic underline blink undefined 'reverse video' invisible + strikethrough) +colors=(default black red green yellow blue magenta cyan white) +for ai in {0..5} {7..9}; do + [[ $ai == 0 ]] && a='' || a="$ai;" + echo "$ai: $attrs[(($ai+1))]" + for fi in {29..37}; do + [[ $fi == 29 ]] && f='' || f="$fi;" + echo -n ' ' + for bi in {39..47}; do + [[ $bi == 39 ]] && b='' || b="$bi" + echo -ne "\e[$a$f$b""m${(r[7])colors[(($fi-28))]}\e[0m " + done + echo + done +done diff --git a/fonts/Dina-ttf/Dina.ttf b/fonts/Dina-ttf/Dina.ttf new file mode 100644 index 0000000..62bc1bc Binary files /dev/null and b/fonts/Dina-ttf/Dina.ttf differ diff --git a/fonts/Dina-ttf/LICENSE b/fonts/Dina-ttf/LICENSE new file mode 120000 index 0000000..d7a9d94 --- /dev/null +++ b/fonts/Dina-ttf/LICENSE @@ -0,0 +1 @@ +../Dina/LICENSE \ No newline at end of file diff --git a/install.sh b/install.sh index 85774a0..2da2589 100755 --- a/install.sh +++ b/install.sh @@ -84,3 +84,4 @@ for y in ssh termux; do l "$HOME/.$y/`basename "$x"`" done done +x='fonts/Dina-ttf/Dina.ttf' l "$HOME/.termux/font.ttf" diff --git a/termux/colors.properties b/termux/colors.properties index 45b0502..2b596e5 100644 --- a/termux/colors.properties +++ b/termux/colors.properties @@ -1,29 +1,27 @@ -# http://ethanschoonover.com/solarized -#background = #002b36 -background = #000a0d -foreground = #839496 -cursor = #93a1a1 -# black -color0 = #073642 -color8 = #002b36 +background = #010812 +foreground = #798699 +cursor = #6408a4 +# black/grey +color0 = #191c21 +color8 = #3b434e # red -color1 = #dc322f -color9 = #cb4b16 +color1 = #d51d0a +color9 = #f4321e # green -color2 = #85c000 -color10 = #586e75 +color2 = #5dd50a +color10 = #75f41e # yellow -color3 = #b58900 -color11 = #657b83 +color3 = #d5820a +color11 = #f49d1e # blue -color4 = #268bd2 -color12 = #839496 +color4 = #0a5dd5 +color12 = #1e75f4 # magenta -color5 = #d33682 -color13 = #6c71c4 +color5 = #820ad5 +color13 = #9d1ef4 # cyan -color6 = #2aa198 -color14 = #93a1a1 -# white -color7 = #eee8d5 -color15 = #fdf6e3 +color6 = #0ac2d5 +color14 = #1ee0f4 +# light grey/white +color7 = #bcc2cc +color15 = #e8ebee diff --git a/xdg/fontconfig/fonts.conf b/xdg/fontconfig/fonts.conf index 44f52a1..bf1ab78 100644 --- a/xdg/fontconfig/fonts.conf +++ b/xdg/fontconfig/fonts.conf @@ -1,7 +1,7 @@ - prefer Source, Noto, DejaVu, Free; monospace Dina + set up render settings; aliases for Source, Dina @@ -9,8 +9,14 @@ rgb + + + + hintslight + + - @@ -68,8 +74,7 @@ monospace - + Dina Noto Sans Mono DejaVu Sans Mono FreeMono @@ -77,6 +82,5 @@ -