refactor: move fonts to common

This commit is contained in:
matt1432 2023-10-15 16:47:26 -04:00
parent be74ce41cc
commit 90a632afb1
3 changed files with 41 additions and 44 deletions

View file

@ -1,16 +1,12 @@
{ config, home-manager, lib, nixpkgs, nur, nix-melt, nurl, pkgs, ... }: { { config, home-manager, lib, nixpkgs, nur, nix-melt, nurl, pkgs, ... }: {
imports = [ imports = [
home-manager.nixosModules.default home-manager.nixosModules.default
./modules/programs.nix ./modules/programs.nix
./modules/locale.nix
./overlays/list.nix ./overlays/list.nix
]; ];
# Select internationalisation properties.
i18n.defaultLocale = "en_CA.UTF-8";
console = {
keyMap = "ca";
};
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix = { nix = {
@ -53,6 +49,7 @@
]) ++ ]) ++
(with pkgs; [ (with pkgs; [
dracula-theme
neofetch neofetch
progress progress
wget wget

38
common/modules/locale.nix Normal file
View file

@ -0,0 +1,38 @@
{ pkgs, ... }: {
fonts = {
fontconfig = {
enable = true;
defaultFonts = {
emoji = [ "Noto Color Emoji" ];
monospace = [ "JetBrainsMono Nerd Font" ];
sansSerif = [ "JetBrainsMono Nerd Font" ];
serif = [ "JetBrainsMono Nerd Font" ];
};
};
packages = with pkgs; [
(nerdfonts.override { fonts = [
"JetBrainsMono"
"Go-Mono"
"Iosevka"
"NerdFontsSymbolsOnly"
"SpaceMono"
"Ubuntu"
]; })
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
liberation_ttf
font-awesome
meslo-lgs-nf
jetbrains-mono
ubuntu_font_family
];
};
# Select internationalisation properties.
i18n.defaultLocale = "en_CA.UTF-8";
console = {
keyMap = "ca";
};
}

View file

@ -83,52 +83,14 @@
# List packages in root user PATH # List packages in root user PATH
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# for sddm # for sddm
dracula-theme
plasma5Packages.plasma-framework plasma5Packages.plasma-framework
plasma5Packages.plasma-workspace plasma5Packages.plasma-workspace
qemu qemu
wl-clipboard wl-clipboard
alsa-utils alsa-utils
wget
tree
rsync
killall
imagemagick
usbutils
evtest evtest
plasma5Packages.kio-admin plasma5Packages.kio-admin
plasma5Packages.ksshaskpass plasma5Packages.ksshaskpass
]; ];
fonts = {
fontconfig = {
enable = true;
/*defaultFonts = {
emoji = [ "Noto Color Emoji" ];
monospace = [ "MesloLGS Nerd Font" ];
sansSerif = [ "MesloLGS Nerd Font" ];
serif = [ "MesloLGS Nerd Font" ];
};*/
};
packages = with pkgs; [
(nerdfonts.override { fonts = [
"JetBrainsMono"
"Go-Mono"
"Iosevka"
"NerdFontsSymbolsOnly"
"SpaceMono"
"Ubuntu"
]; })
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
liberation_ttf
font-awesome
meslo-lgs-nf
jetbrains-mono
ubuntu_font_family
];
};
} }