switch to Hack, simplify init.el fonts code, scale Bitstream too

4 files changed, 19 insertions, 22 deletions

diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini
index 9026a07e..4046fc6f 100644
--- a/.config/foot/foot.ini
+++ b/.config/foot/foot.ini
@@ -1,4 +1,6 @@
-font = Cousine:size=7
+# size=6.5 is required for two 80-col Emacs windows on smaller screens.
+# size=8 for now because not using Sway on any machines with smaller screens.
+font = Hack:size=8
 term = xterm-256color
 
 [colors]
diff --git a/.config/i3/config b/.config/i3/config
index bc8d32f4..aab9bbac 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -4,7 +4,7 @@
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
-font pango:Cousine 10
+font pango:Hack 10
 
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
diff --git a/.config/sway/config b/.config/sway/config
index 74b88d74..0c0e29ed 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,6 +1,6 @@
 include /etc/sway/config.d/*
 
-font pango:Cousine 10
+font pango:Hack 10
 
 # class                 border    bground   text      indicator   child_border
 client.focused          #000000FF #B4EEB4BB #000000BB #B4EEB4BB   #000000BB
@@ -228,22 +228,19 @@ mode "C-i-" {
 		exec pkill -u $USER -f --signal USR1 i3status-wrapper; \
 		mode "default"
 
-	# This says: resize so that an Emacs window taking up the rest of the
-	# width has (eq (frame-width) 160).  So should be <<33.  The value 32
-	# is for melete's monitor, using the Cousine font as installed from
-	# the Debian archive.  We don't choose this value with any hope of
-	# fitting 80 columns into the smaller window, note, though sometimes
-	# we'll be able to.  Idea is to have something we want to stay visible
-	# in the right split and Emacs frame where we're doing most of our
-	# work taking up the larger portion of the screen, and such that Emacs
-	# will prefer to split horizontally to pop to or display other buffers
-	bindsym minus resize set width 32 ppt, mode "default"
-	# And this says ensure that the current window can be an Emacs frame
-	# with at least 80 columns.  Value is based on melete's monitor, using
-	# the Inconsolata font as installed from athena's apt repo (see
-	# spw/maybe-change-frame-font function for why one of these bindings
-	# is based on Cousine and the other is based on Inconsolata)
-	bindsym equal resize set width 39 ppt, mode "default"
+	# The two % values are for melete.  Cf. `spw/maybe-scale-basic-faces'.
+	#
+	# This says: shrink such that an Emacs frame taking up the rest of the
+	# width can fit two 80-column windows, with Debian's fonts-hack at
+	# height 105.  So should be <33.  Sometimes we'll be able to fit an
+	# 80-column frame in the smaller part of the split, but usually we
+	# won't: the point is to ensure we can use Emacs with two 80-column
+	# windows, as is usual, while also displaying something narrower.
+	bindsym minus resize set width 31 ppt, mode "default"
+	# And this says: ensure that the current window can be an Emacs frame
+	# with at least 80 columns.  Based on Debian's fonts-hack scaled up to
+	# height 120 by `spw/maybe-scale-basic-faces'.
+	bindsym equal resize set width 43 ppt, mode "default"
 
         # connect to Debian's ftp-master server for ftpteam work
 	bindsym Shift+f exec ~/src/dotfiles/scripts/desktop/sway-ftp-master , mode "default"
diff --git a/.config/xfce4/terminal/terminalrc b/.config/xfce4/terminal/terminalrc
index 8593d467..e68c6e1a 100644
--- a/.config/xfce4/terminal/terminalrc
+++ b/.config/xfce4/terminal/terminalrc
@@ -27,9 +27,7 @@ MiscUseShiftArrowsToScroll=FALSE
 MiscSlimTabs=FALSE
 TitleMode=TERMINAL_TITLE_REPLACE
 ScrollingBar=TERMINAL_SCROLLBAR_NONE
-# Inconsolata in Debian doesn't have a bold variant which
-# xfce4-terminal is able to pick up
-FontName=Cousine 10
+FontName=Hack 10
 ShortcutsNoMnemonics=TRUE
 ShortcutsNoMenukey=TRUE
 ShortcutsNoHelpkey=TRUE