diff --git a/users/guanranwang/home-manager/nixos/fonts.nix b/users/guanranwang/home-manager/nixos/fonts.nix
index 4bda9c4..8a24a9f 100644
--- a/users/guanranwang/home-manager/nixos/fonts.nix
+++ b/users/guanranwang/home-manager/nixos/fonts.nix
@@ -1,30 +1,25 @@
{pkgs, ...}: {
fonts.fontconfig.enable = true;
home.packages = with pkgs; [
- ### Noto Fonts
- noto-fonts
- noto-fonts-cjk-sans
- noto-fonts-cjk-serif
- noto-fonts-emoji
-
- ### Source Han
- source-han-sans
- source-han-serif
- source-han-mono
-
### Sans
inter
- roboto
### Monospace
- fira-code
jetbrains-mono
(nerdfonts.override {
fonts = [
- "FiraCode"
"JetBrainsMono"
"NerdFontsSymbolsOnly"
];
})
+
+ ### Adobe Source Han
+ source-han-sans
+ source-han-serif
+ source-han-mono
+
+ ### Noto Fonts
+ noto-fonts
+ noto-fonts-emoji
];
}
diff --git a/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/nixos-fonts.conf b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/nixos-fonts.conf
new file mode 100644
index 0000000..1881219
--- /dev/null
+++ b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/nixos-fonts.conf
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+ DejaVu Sans
+
+
+
+
diff --git a/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/old-chinese-fonts.conf b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/old-chinese-fonts.conf
new file mode 100644
index 0000000..d306b42
--- /dev/null
+++ b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/old-chinese-fonts.conf
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+ WenQuanYi Zen Hei
+ sans-serif
+
+
+ WenQuanYi Micro Hei
+ sans-serif
+
+
+ WenQuanYi Micro Hei Light
+ sans-serif
+
+
+
diff --git a/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/qt-fonts.conf b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/qt-fonts.conf
index 8b57e53..ad6eef7 100644
--- a/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/qt-fonts.conf
+++ b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/qt-fonts.conf
@@ -1,8 +1,9 @@
-
- trash Font Config 2.0
+
+
+
@@ -40,4 +41,5 @@
Noto Sans Runic
+
\ No newline at end of file
diff --git a/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/unliked-fonts.conf b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/unliked-fonts.conf
new file mode 100644
index 0000000..b5e5f78
--- /dev/null
+++ b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/unliked-fonts.conf
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+ Liberation Mono
+ monospace
+
+
+ SF Mono
+ monospace
+
+
+ Noto Sans Mono
+ monospace
+
+
+
\ No newline at end of file
diff --git a/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf
index 3bdca12..cf48549 100644
--- a/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf
+++ b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf
@@ -1,8 +1,9 @@
-
- trash Font Config 2.0
+
+
+
+
+
+ Microsoft YaHei
+ sans-serif
+
+
+ SimHei
+ sans-serif
+
+
+
+ SimSun
+ serif
+
+
+ SimSun-18030
+ serif
+
+
+
\ No newline at end of file
diff --git a/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/fonts.conf b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/fonts.conf
index 810e638..c3d4748 100644
--- a/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/fonts.conf
+++ b/users/guanranwang/home-manager/resources/dotfiles/config/fontconfig/fonts.conf
@@ -4,7 +4,10 @@
- trash Font Config 2.0
+ trash Font Config 3.0
+
+
+
-
- serif
- Noto Serif
+
+ serif
+ Source Han Serif SC
+
+
+ sans-serif
+ Inter
+
+
+ monospace
+ JetBrainsMono Nerd Font
+
+
+ system-ui
+ Inter
+
+
+
+
+
+
+ serif
+ Source Han Serif SC
- sans-serif
- Inter
+ sans-serif
+ Source Han Sans SC
- monospace
- JetBrainsMono Nerd Font
+ monospace
+ Source Han Mono SC
+
+
+ system-ui
+ Source Han Sans SC
-
-
+
zh
serif
- Noto Serif CJK SC
+ Source Han Serif SC
-
+
zh
sans-serif
- Noto Sans CJK SC
+ Source Han Sans SC
-
+
zh
monospace
- Noto Sans Mono CJK SC
+ Source Han Mono SC
+
+
+ zh
+ system-ui
+ Source Han Sans SC
-
-
-
-
+
zh-hans
serif
- Noto Serif CJK SC
+ Source Han Sans SC
-
+
zh-hans
sans-serif
- Noto Sans CJK SC
+ Source Han Sans SC
-
+
zh-hans
monospace
- Noto Sans Mono CJK SC
+ Source Han Mono SC
+
+
+ zh-hans
+ system-ui
+ Source Han Sans SC
-
-
-
+
zh-hant
serif
- Noto Serif CJK TC
+ Source Han Serif TC
-
+
zh-hant
sans-serif
- Noto Sans CJK TC
+ Source Han Sans TC
-
+
zh-hant
monospace
- Noto Sans Mono CJK TC
+ Source Han Mono TC
+
+
+ zh-hant
+ system-ui
+ Source Han Sans TC
-
-
-
+
zh-hant
serif
- Noto Serif CJK HK
+ Source Han Serif HC
-
+
zh-hant
sans-serif
- Noto Sans CJK HK
+ Source Han Sans HC
-
+
zh-hant
monospace
- Noto Sans Mono CJK HK
+ Source Han Mono HC
+
+
+ zh-hant
+ system-ui
+ Source Han Sans HC
-
-
+
zh-cn
serif
- Noto Serif CJK SC
+ Source Han Sans SC
-
+
zh-cn
sans-serif
- Noto Sans CJK SC
+ Source Han Sans SC
-
+
zh-cn
monospace
- Noto Sans Mono CJK SC
+ Source Han Mono SC
+
+
+ zh-cn
+ system-ui
+ Source Han Sans SC
-
-
+
zh-tw
serif
- Noto Serif CJK TC
+ Source Han Serif TC
-
+
zh-tw
sans-serif
- Noto Sans CJK TC
+ Source Han Sans TC
-
+
zh-tw
monospace
- Noto Sans Mono CJK TC
+ Source Han Mono TC
+
+
+ zh-tw
+ system-ui
+ Source Han Sans TC
-
-
+
zh-hk
serif
- Noto Serif CJK HK
+ Source Han Serif HC
-
+
zh-hk
sans-serif
- Noto Sans CJK HK
+ Source Han Sans HC
-
+
zh-hk
monospace
- Noto Sans Mono CJK HK
+ Source Han Mono HC
+
+
+ zh-hk
+ system-ui
+ Source Han Sans HC
@@ -174,17 +225,22 @@
ja
serif
- Noto Serif CJK JP
+ Source Han Serif
ja
sans-serif
- Noto Sans CJK JP
+ Source Han Sans
ja
monospace
- Noto Sans Mono CJK JP
+ Source Han Mono
+
+
+ ja
+ system-ui
+ Source Han Sans
@@ -192,138 +248,22 @@
ko
serif
- Noto Serif CJK KR
+ Source Han Serif K
ko
sans-serif
- Noto Sans CJK KR
+ Source Han Sans K
ko
monospace
- Noto Sans Mono CJK KR
-
-
-
-
-
- sans-serif
-
- Inter
- Roboto
- Noto Sans
- Noto Sans CJK SC
- Noto Sans CJK TC
- Noto Sans CJK JP
- Noto Sans CJK KR
- Source Han Sans CN
- Noto Color Emoji
- Noto Emoji
-
- DejaVu Sans
- Verdana
- Arial
- Albany AMT
- Luxi Sans
- Nimbus Sans L
- Nimbus Sans
- Helvetica
- Lucida Sans Unicode
- BPG Glaho International
- Tahoma
-
-
-
- serif
-
- Noto Serif
- Noto Serif CJK SC
- Noto Serif CJK TC
- Noto Serif CJK JP
- Noto Serif CJK KR
- Source Han Serif CN
- Noto Color Emoji
- Noto Emoji
-
-
-
- monospace
-
- JetBrainsMono Nerd Font
- Noto Sans Mono
- Noto Sans Mono CJK SC
- Noto Sans Mono CJK TC
- Noto Sans Mono CJK JP
- Noto Sans Mono CJK KR
- Noto Color Emoji
- Noto Emoji
-
-
-
-
-
-
- Microsoft YaHei
- sans-serif
+ Source Han Mono K
- SimHei
- sans-serif
-
-
-
- SimSun
- serif
-
-
- SimSun-18030
- serif
-
-
-
-
-
- WenQuanYi Zen Hei
- sans-serif
-
-
- WenQuanYi Micro Hei
- sans-serif
-
-
- WenQuanYi Micro Hei Light
- sans-serif
-
-
-
-
-
- Liberation Mono
- monospace
-
-
- SF Mono
- monospace
-
-
- Noto Sans Mono
- monospace
-
-
-
-
-
- DejaVu Sans
-
-
-
-
-
-
-
- Helvetica
- sans-serif
+ ko
+ system-ui
+ Source Han Sans K