nyancat/flake
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nixos: move font packages to home-manager

Browse source
This commit is contained in:
Guanran Wang 2023-11-04 20:49:54 +08:00
parent db3355ffee
commit 3ad8fc3963
Signed by: nyancat
SSH key fingerprint: SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8
4 changed files with 30 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/packages/graphical/default.nix
View file

@ -2,7 +2,6 @@
imports = [
./display-server
./fonts.nix
./gnome-keyring.nix
./graphical.nix
./polkit.nix

47
nixos/packages/graphical/fonts.nix
View file

@ -1,47 +0,0 @@
{pkgs, ...}: {
# Fonts
fonts = {
fontDir.enable = true;
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
### CJK
#wqy_zenhei # weird font shape, noto sans cjk is a better alternative
#wqy_microhei
### Sans
inter
roboto
### Monospace
fira-code
jetbrains-mono
(nerdfonts.override {
fonts = [
"FiraCode"
"JetBrainsMono"
"NerdFontsSymbolsOnly"
];
})
];
fontconfig = {
cache32Bit = true;
defaultFonts = {
emoji = ["Noto Color Emoji"];
serif = ["Noto Serif"];
sansSerif = ["Inter" "Noto Sans"];
monospace = ["JetBrainsMono Nerd Font" "JetBrains Mono" "FiraCode Nerd Font" "Fira Code" "Noto Sans Mono"];
};
};
# fontconfig is too limited here, and appling it globally is **bad**, use Home Manager instead
};
}

29
users/guanranwang/home-manager/nixos/fonts.nix Normal file
View file

@ -0,0 +1,29 @@
{pkgs, ...}: {
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"
];
})
];
}

1
users/guanranwang/home-manager/nixos/presets/desktop.nix
View file

@ -4,6 +4,7 @@
../home.nix
../dotfiles.nix
../fonts.nix
../i18n.nix
../sway.nix
../waybar.nix