From bd718b254d9bfb0d14c4f408350087eb220cf5d6 Mon Sep 17 00:00:00 2001
From: SqrtMinusOne <thexcloud@gmail.com>
Date: Fri, 17 Feb 2023 21:07:13 +0300
Subject: [PATCH] Revert "feat(desktop): try to fix font sizes"

This reverts commit 739d92c5ed11d011852f9e2c18e45393d266c92e.
---
 .config/alacritty/alacritty.yml |  2 +-
 .config/fontconfig/fonts.conf   | 59 ++++++++++++++++-----------------
 .emacs.d/init.el                |  2 +-
 Console.org                     |  2 +-
 Desktop.org                     | 33 ++----------------
 Emacs.org                       |  2 +-
 6 files changed, 35 insertions(+), 65 deletions(-)

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 7ad0ef1..9d32e78 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -6,7 +6,7 @@ font:
     family: JetBrainsMono Nerd Font
     style: Regular
 
-  size: 8
+  size: 10
 
 env:
   TERM: xterm-256color
diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
index a7f39cd..45d01f3 100644
--- a/.config/fontconfig/fonts.conf
+++ b/.config/fontconfig/fonts.conf
@@ -1,35 +1,32 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-  <match>
-    <edit name="pixelsize"><double>16</double></edit>
-  </match>
-  <match target="pattern">
-    <test qual="any" name="family">
-      <string>monospace</string>
-    </test>
-    <edit binding="strong" name="family" mode="assign">
-      <string>DejaVu Sans Mono</string>
-    </edit>
-  </match>
-  <match target="pattern">
-    <test qual="any" name="family">
-      <string>sans-serif</string>
-    </test>
-    <edit binding="strong" name="family" mode="assign">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <!--alias>
-    <family>monospace</family>
-    <prefer>
-      <family>DejaVu Sans Mono Book</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>Ubuntu Regular</family>
-    </prefer>
-  </alias-->
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>monospace</string>
+        </test>
+        <edit binding="strong" name="family" mode="assign">
+            <string>DejaVu Sans Mono</string>
+        </edit>
+    </match>
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>sans-serif</string>
+        </test>
+        <edit binding="strong" name="family" mode="assign">
+            <string>DejaVu Sans</string>
+        </edit>
+    </match>
+    <!--alias>
+        <family>monospace</family>
+        <prefer>
+            <family>DejaVu Sans Mono Book</family>
+        </prefer>
+    </alias>
+    <alias>
+        <family>sans-serif</family>
+        <prefer>
+            <family>Ubuntu Regular</family>
+        </prefer>
+    </alias-->
 </fontconfig>
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b1fe563..2b6b179 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1011,7 +1011,7 @@ influence of C1 on the result."
 
 (when (display-graphic-p)
   (if (x-list-fonts "JetBrainsMono Nerd Font")
-      (set-frame-font "JetBrainsMono Nerd Font 13" nil t)
+      (set-frame-font "JetBrainsMono Nerd Font 10" nil t)
     (message "Install JetBrainsMono Nerd Font!")))
 
 (use-package ligature
diff --git a/Console.org b/Console.org
index 7175556..87725f9 100644
--- a/Console.org
+++ b/Console.org
@@ -748,7 +748,7 @@ font:
     family: JetBrainsMono Nerd Font
     style: Regular
 
-  size: 8
+  size: 10
 
 env:
   TERM: xterm-256color
diff --git a/Desktop.org b/Desktop.org
index 15b8986..c8cab49 100644
--- a/Desktop.org
+++ b/Desktop.org
@@ -86,8 +86,7 @@ However, I'd rather use the =Xresources= file wherever possible. Here is the cod
 #+end_src
 
 So, whenever a program is capable of reading =.Xresources=, it will get colors from there, otherwise, it will get colors from noweb expressions in the literate config. Thus, in both cases, the color is set in a single Org Mode table.
-*** OFF Fonts
-CLOSED: [2023-02-17 Fri 20:36]
+*** Fonts
 Also, Xresources are used to set =Xft= settings. Unfortunately, the DPI setting has to be unique for each machine, which means I cannot commit =Xresources= to the repo.
 
 #+NAME: get-dpi
@@ -100,7 +99,7 @@ Also, Xresources are used to set =Xft= settings. Unfortunately, the DPI setting
 #+end_src
 
 #+begin_src conf-xdefaults :noweb yes :tangle ~/.Xresources
-! Xft.dpi: <<get-dpi()>>
+Xft.dpi: <<get-dpi()>>
 #+end_src
 ** Themes
 A few programs I use to customize the apperance are listed below.
@@ -119,39 +118,13 @@ A few programs I use to customize the apperance are listed below.
 Net/ThemeName "Matcha-dark-azul"
 Net/IconThemeName "Papirus-Dark"
 Gtk/DecorationLayout "menu:minimize,maximize,close"
-Gtk/FontName "Sans 14"
+Gtk/FontName "Sans 10"
 Gtk/MonospaceFontName "JetBrainsMono Nerd Mono 12"
 Gtk/CursorThemeName "Adwaita"
 Xft/Antialias 1
 Xft/Hinting 0
 Xft/HintStyle "hintnone"
 #+end_src
-** Fontconfig
-#+begin_src xml ~/.config/fontconfig/fonts.conf
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <match>
-    <edit name="pixelsize"><double>16</double></edit>
-  </match>
-  <match target="pattern">
-    <test qual="any" name="family">
-      <string>monospace</string>
-    </test>
-    <edit binding="strong" name="family" mode="assign">
-      <string>DejaVu Sans Mono</string>
-    </edit>
-  </match>
-  <match target="pattern">
-    <test qual="any" name="family">
-      <string>sans-serif</string>
-    </test>
-    <edit binding="strong" name="family" mode="assign">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-</fontconfig>
-#+end_src
 ** MIME
 Setting the default MIME types
 #+begin_src conf-unix :tangle ~/.config/mimeapps.list
diff --git a/Emacs.org b/Emacs.org
index fe84f5b..04c2504 100644
--- a/Emacs.org
+++ b/Emacs.org
@@ -1632,7 +1632,7 @@ References:
 #+begin_src emacs-lisp
 (when (display-graphic-p)
   (if (x-list-fonts "JetBrainsMono Nerd Font")
-      (set-frame-font "JetBrainsMono Nerd Font 13" nil t)
+      (set-frame-font "JetBrainsMono Nerd Font 10" nil t)
     (message "Install JetBrainsMono Nerd Font!")))
 #+end_src