From 4969600f3ea1d9f8b25c548c7f811b74f5681b67 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 16 May 2021 10:42:12 +0300
Subject: [PATCH] Add fontconfig, umask and silent pyenv init

---
 deploy.sh                              |  1 +
 home/.bashrc-bloated                   |  2 +-
 home/.config/fish/conf.d/evaluate.fish |  2 +-
 home/.config/fontconfig/fonts.conf     | 87 ++++++++++++++++++++++++++
 home/.config/zsh/.zshrc                |  2 +-
 system/etc/profile.d/umask.sh          |  1 +
 6 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 home/.config/fontconfig/fonts.conf
 create mode 100644 system/etc/profile.d/umask.sh

diff --git a/deploy.sh b/deploy.sh
index 9c9fccf..9c2e9a1 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -101,6 +101,7 @@ cp -rfv ./home/.config/cava/             ~/.config/cava/
 cp -rfv ./home/.config/cht.sh/           ~/.config/cht.sh/
 cp -rfv ./home/.config/cointop/          ~/.config/cointop/
 cp -rfv ./home/.config/doom/             ~/.config/doom/
+cp -rfv ./home/.config/fontconfig/       ~/.config/fontconfig/
 cp -rfv ./home/.config/gallery-dl/       ~/.config/gallery-dl/
 cp -rfv ./home/.config/GIMP/             ~/.config/GIMP/
 cp -rfv ./home/.config/git/              ~/.config/git/
diff --git a/home/.bashrc-bloated b/home/.bashrc-bloated
index 407d110..c43ac95 100644
--- a/home/.bashrc-bloated
+++ b/home/.bashrc-bloated
@@ -593,7 +593,7 @@ fi
 #   git clone https://github.com/pyenv/pyenv-virtualenv.git $PYENV_ROOT/plugins/pyenv-virtualenv
 #   git clone https://github.com/pyenv/pyenv-update.git $PYENV_ROOT/plugins/pyenv-update
 # fi
-# eval "$(pyenv init -)"
+# eval "$(pyenv init -)" >/dev/null
 # eval "$(pyenv virtualenv-init -)"
 
 # nodenv
diff --git a/home/.config/fish/conf.d/evaluate.fish b/home/.config/fish/conf.d/evaluate.fish
index c13a0b9..437701b 100644
--- a/home/.config/fish/conf.d/evaluate.fish
+++ b/home/.config/fish/conf.d/evaluate.fish
@@ -33,7 +33,7 @@ end
 #   git clone https://github.com/pyenv/pyenv-update.git $PYENV_ROOT/plugins/pyenv-update
 #   git clone https://github.com/pyenv/pyenv-virtualenv.git $PYENV_ROOT/plugins/pyenv-virtualenv
 # end
-# pyenv init - | source
+# pyenv init - | source >/dev/null
 # pyenv virtualenv-init - | source
 
 # nodenv
diff --git a/home/.config/fontconfig/fonts.conf b/home/.config/fontconfig/fonts.conf
new file mode 100644
index 0000000..7693c60
--- /dev/null
+++ b/home/.config/fontconfig/fonts.conf
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <!-- Default font (no fc-match pattern) -->
+  <match>
+    <edit mode="prepend" name="family">
+      <string>Iosevka Etoile</string>
+    </edit>
+  </match>
+
+  <!-- Default font for the ja_JP locale (no fc-match pattern) -->
+  <match>
+    <test compare="contains" name="lang">
+      <string>ja</string>
+    </test>
+    <edit mode="prepend" name="family">
+      <string>Sarasa Fixed Slab J</string>
+    </edit>
+  </match>
+
+  <!-- Default sans-serif font -->
+  <match target="pattern">
+    <test qual="any" name="family"><string>sans-serif</string></test>
+    <edit name="family" mode="prepend" binding="same"><string>Iosevka Aile</string></edit>
+    <edit name="family" mode="append" binding="same"><string>Sarasa Fixed J</string></edit>
+  </match>
+
+  <!-- Default serif fonts -->
+  <match target="pattern">
+    <test qual="any" name="family"><string>serif</string></test>
+    <edit name="family" mode="prepend" binding="same"><string>Iosevka Etoile</string></edit>
+    <edit name="family" mode="append" binding="same"><string>Sarasa Fixed Slab J</string></edit>
+  </match>
+
+  <!-- Default monospace fonts -->
+  <match target="pattern">
+    <test qual="any" name="family"><string>monospace</string></test>
+    <edit name="family" mode="prepend" binding="same"><string>Iosevka</string></edit>
+    <edit name="family" mode="append" binding="same"><string>Sarasa Mono J</string></edit>
+  </match>
+
+  <!-- Fallback fonts preference order -->
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Iosevka Aile</family>
+      <family>Noto Sans</family>
+      <family>FreeSans</family>
+      <family>Open Sans</family>
+      <family>Droid Sans</family>
+      <family>Ubuntu</family>
+      <family>Roboto</family>
+      <family>Sarasa Fixed J</family>
+      <family>NotoSansCJK</family>
+      <family>Source Han Sans JP</family>
+      <family>IPAPGothic</family>
+      <family>VL PGothic</family>
+      <family>Koruri</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Iosevka Etoile</family>
+      <family>Noto Serif</family>
+      <family>FreeSerif</family>
+      <family>Droid Serif</family>
+      <family>Roboto Slab</family>
+      <family>Sarasa Fixed Slab J</family>
+      <family>IPAPMincho</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Iosevka</family>
+      <family>Noto Sans Mono</family>
+      <family>FreeMono</family>
+      <family>Inconsolatazi4</family>
+      <family>Ubuntu Mono</family>
+      <family>Droid Sans Mono</family>
+      <family>Roboto Mono</family>
+      <family>Sarasa Mono J</family>
+      <family>IPAGothic</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff --git a/home/.config/zsh/.zshrc b/home/.config/zsh/.zshrc
index 479c0a3..a6999f2 100644
--- a/home/.config/zsh/.zshrc
+++ b/home/.config/zsh/.zshrc
@@ -66,7 +66,7 @@ fi
 #    git clone https://github.com/pyenv/pyenv-virtualenv.git $PYENV_ROOT/plugins/pyenv-virtualenv
 #    git clone https://github.com/pyenv/pyenv-update.git $PYENV_ROOT/plugins/pyenv-update
 # fi
-# eval "$(pyenv init -)"
+# eval "$(pyenv init -)" >/dev/null
 # eval "$(pyenv virtualenv-init -)"
 
 # nodenv
diff --git a/system/etc/profile.d/umask.sh b/system/etc/profile.d/umask.sh
new file mode 100644
index 0000000..426f745
--- /dev/null
+++ b/system/etc/profile.d/umask.sh
@@ -0,0 +1 @@
+umask 027