From ce127c80946dfe63056071e66c977724d11bfdc7 Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 5 Apr 2021 05:04:23 -0500
Subject: [PATCH] update colors, fonts, and related configs
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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.
---
 base/.Xresources          |  96 +++++++++++++-------------------------
 bin/colors                |  17 +++++++
 fonts/Dina-ttf/Dina.ttf   | Bin 0 -> 14532 bytes
 fonts/Dina-ttf/LICENSE    |   1 +
 install.sh                |   1 +
 termux/colors.properties  |  44 +++++++++--------
 xdg/fontconfig/fonts.conf |  14 ++++--
 7 files changed, 82 insertions(+), 91 deletions(-)
 create mode 100755 bin/colors
 create mode 100644 fonts/Dina-ttf/Dina.ttf
 create mode 120000 fonts/Dina-ttf/LICENSE

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 0000000000000000000000000000000000000000..62bc1bc273c1b9faf8a33fc46f1445890db29863
GIT binary patch
literal 14532
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
UA}{xRA_PFyVbo-=*FECD0Osk)C;$Ke

literal 0
HcmV?d00001

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 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-  <description>prefer Source, Noto, DejaVu, Free; monospace Dina</description>
+  <description>set up render settings; aliases for Source, Dina</description>
 
   <!-- rgb pixel alignment -->
   <match target="font">
@@ -9,8 +9,14 @@
       <const>rgb</const>
     </edit>
   </match>
+  <!-- duplicate 20-hinting-slight.conf just in case -->
+  <match target="pattern">
+    <edit name="hintstyle" mode="append">
+      <const>hintslight</const>
+    </edit>
+  </match>
 
-  <!-- preface 60-generic.conf and prefer no color. 
+  <!-- preface 60-generic.conf and prefer no color.
        this value is actually not that useful due to implementation detail...
     -->
   <match>
@@ -68,8 +74,7 @@
   <alias binding="same">
     <family>monospace</family>
     <prefer>
-      <!-- fontconfig 2.10 broke Dina - ->
-      <family>Dina</family> -->
+      <family>Dina</family>
       <family>Noto Sans Mono</family>
       <family>DejaVu Sans Mono</family>
       <family>FreeMono</family>
@@ -77,6 +82,5 @@
   </alias>
 </fontconfig>
 
-
 <!-- vim: set et ft=xml sts=2 sw=2 ts=8 tw=0 :
 -->
-- 
2.47.0