From 1e2442eb6e918df394a71bb4e6abded115447395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?tr=C3=A9meur?= <eheu48@gmail.com>
Date: Tue, 21 Apr 2020 18:08:25 +0100
Subject: [PATCH] Change fonts to support CJK characters in conky

---
 .gitignore              |  1 +
 dots/.conkyrc           | 14 +++++++-------
 dots/fonts.conf         |  8 ++++----
 dots/gtk/3/settings.ini |  2 +-
 dots/openbox/rc.xml     | 12 ++++++------
 dots/sakura.conf        |  2 +-
 dots/tint2rctemplate    |  4 ++--
 7 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index ea39f6b..7df409b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 */nohup.out
 nohup.out
 *~
+*#
diff --git a/dots/.conkyrc b/dots/.conkyrc
index 1bddf55..0bbcc88 100644
--- a/dots/.conkyrc
+++ b/dots/.conkyrc
@@ -37,7 +37,7 @@ conky.config = {
     draw_shades = false,
     double_buffer = true,
     use_xft = true,
-    font = 'VictorMono Nerd Font:size=9',
+    font = 'Noto Sans:size=9:style=Regular',
     gap_x = 30,
     gap_y = 25,
 	minimum_width = 5,
@@ -62,13 +62,13 @@ conky.config = {
 }
 
 conky.text = [[
-# ${font VictorMono Nerd Font:size=9:bold}Sync
-# ${font VictorMono Nerd Font:size=9:regular}${exec command insync get_sync_progress}
+# ${font Noto Sans:size=9:bold}Sync
+# ${font Noto Sans:size=9:regular}${exec command insync get_sync_progress}
 # $hr insync very stupidly got rid of this feature in version 3
-${font VictorMono Nerd Font:size=9:bold}Agenda
-${font VictorMono Nerd Font:size=9:regular}${exec command ~/.linux/scripts/today.sh}
+${font Noto Sans:size=9:style=Bold}Agenda
+${font Noto Sans:size=9:style=Regular}${exec command ~/.linux/scripts/today.sh}
 $hr
-${font VictorMono Nerd Font:size=9:bold}Music
-${font VictorMono Nerd Font:size=9:regular}${exec command ~/.linux/scripts/nowplaying.sh}
+${font Noto Sans:size=9:style=Bold}Music
+${font Noto Sans CJK JP:size=9:style=Regular}${exec command ~/.linux/scripts/nowplaying.sh}
 ${execbar command ~/.linux/scripts/cmus-conky-timebar.sh}
 ]]
diff --git a/dots/fonts.conf b/dots/fonts.conf
index 63a9ceb..7f53048 100644
--- a/dots/fonts.conf
+++ b/dots/fonts.conf
@@ -3,18 +3,18 @@
 <fontconfig>
 <alias>
   <family>serif</family>
-  <prefer><family>VictorMono Nerd Font</family></prefer>
+  <prefer><family>Noto Serif</family></prefer>
 </alias>
 <alias>
   <family>sans-serif</family>
-  <prefer><family>VictorMono Nerd Font</family></prefer>
+  <prefer><family>Noto Sans</family></prefer>
 </alias>
 <alias>
   <family>sans</family>
-  <prefer><family>VictorMono Nerd Font</family></prefer>
+  <prefer><family>Noto Sans</family></prefer>
 </alias>
 <alias>
   <family>monospace</family>
-  <prefer><family>VictorMono Nerd Font Mono</family></prefer>
+  <prefer><family>Noto Mono</family></prefer>
 </alias>
 </fontconfig>
diff --git a/dots/gtk/3/settings.ini b/dots/gtk/3/settings.ini
index d7dd97d..3570366 100644
--- a/dots/gtk/3/settings.ini
+++ b/dots/gtk/3/settings.ini
@@ -2,7 +2,7 @@
 gtk-application-prefer-dark-theme=0
 gtk-theme-name=Arc
 gtk-icon-theme-name=Papirus-Light
-gtk-font-name=VictorMono Nerd Font 10
+gtk-font-name=Noto Sans 10
 gtk-cursor-theme-name=Suru
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
diff --git a/dots/openbox/rc.xml b/dots/openbox/rc.xml
index f80cd15..20ace6d 100644
--- a/dots/openbox/rc.xml
+++ b/dots/openbox/rc.xml
@@ -57,7 +57,7 @@
     <keepBorder>yes</keepBorder>
     <animateIconify>yes</animateIconify>
     <font place="ActiveWindow">
-      <name>VictorMono Nerd Font</name>
+      <name>Noto Sans</name>
       <size>8</size>
       <!-- font size in points -->
       <weight>normal</weight>
@@ -66,7 +66,7 @@
       <!-- 'italic' or 'normal' -->
     </font>
     <font place="InactiveWindow">
-      <name>VictorMono Nerd Font</name>
+      <name>Noto Sans</name>
       <size>8</size>
       <!-- font size in points -->
       <weight>normal</weight>
@@ -75,7 +75,7 @@
       <!-- 'italic' or 'normal' -->
     </font>
     <font place="MenuHeader">
-      <name>VictorMono Nerd Font</name>
+      <name>Noto Sans</name>
       <size>9</size>
       <!-- font size in points -->
       <weight>normal</weight>
@@ -84,7 +84,7 @@
       <!-- 'italic' or 'normal' -->
     </font>
     <font place="MenuItem">
-      <name>VictorMono Nerd Font</name>
+      <name>Noto Sans</name>
       <size>9</size>
       <!-- font size in points -->
       <weight>normal</weight>
@@ -93,7 +93,7 @@
       <!-- 'italic' or 'normal' -->
     </font>
     <font place="ActiveOnScreenDisplay">
-      <name>VictorMono Nerd Font</name>
+      <name>Noto Sans</name>
       <size>9</size>
       <!-- font size in points -->
       <weight>normal</weight>
@@ -102,7 +102,7 @@
       <!-- 'italic' or 'normal' -->
     </font>
     <font place="InactiveOnScreenDisplay">
-      <name>VictorMono Nerd Font</name>
+      <name>Noto Sans</name>
       <size>9</size>
       <!-- font size in points -->
       <weight>normal</weight>
diff --git a/dots/sakura.conf b/dots/sakura.conf
index 4d4d219..80cb39c 100644
--- a/dots/sakura.conf
+++ b/dots/sakura.conf
@@ -25,7 +25,7 @@ colorset6_curs=rgb(255,255,255)
 colorset6_key=F6
 last_colorset=1
 scroll_lines=4096
-font=VictorMono Nerd Font Mono Regular 10
+font=NotoMono Nerd Font Mono Regular 10
 show_always_first_tab=No
 scrollbar=false
 closebutton=true
diff --git a/dots/tint2rctemplate b/dots/tint2rctemplate
index 9d19c7c..b3b0011 100644
--- a/dots/tint2rctemplate
+++ b/dots/tint2rctemplate
@@ -148,10 +148,10 @@ launcher_item_app = x-terminal-emulator.desktop
 # Clock
 time1_format = %H:%M
 time2_format = %-d/%-m/%y
-time1_font = VictorMono Nerd Font Bold 10
+time1_font = Noto Sans Bold 10
 time1_timezone = 
 time2_timezone = 
-time2_font = VictorMono Nerd Font 8
+time2_font = Noto Sans 8
 clock_font_color = #000000 100
 clock_padding = 3 3
 clock_background_id = 2