os-profile: changes to fonts

This commit is contained in:
Mateusz Słodkowicz 2023-06-10 00:22:32 +02:00
parent 7fec0a28bb
commit 126ff7bf0d
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
2 changed files with 15 additions and 13 deletions

View File

@ -1,5 +1,13 @@
{ pkgs, lib, ... }:
let
defaultFonts = [
pkgs.dejavu_fonts
pkgs.freefont_ttf
pkgs.gyre-fonts
pkgs.liberation_ttf
pkgs.unifont
];
fonts = [
pkgs.noto-fonts
pkgs.noto-fonts-extra
@ -7,13 +15,15 @@ let
pkgs.noto-fonts-cjk-sans
pkgs.noto-fonts-cjk-serif
pkgs.wqy_zenhei
(pkgs.nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "Meslo" "ProFont" ]; })
];
pkgs.corefonts
] ++ defaultFonts;
moreFonts = [
pkgs.ubuntu_font_family
pkgs.monocraft
pkgs.dejavu_fonts
pkgs.hack-font
(pkgs.nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "Meslo" "ProFont" ]; })
];
in
{

View File

@ -1,15 +1,6 @@
{ config, pkgs, lib, materusPkgs, inputs, ... }:
let
pkgsGlbic = import
(pkgs.fetchzip {
url = "https://github.com/NixOS/nixpkgs/archive/22.11.tar.gz";
sha256 = "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=";
})
{ system = pkgs.system; };
steamPkg = pkgs.steam.override {
extraPkgs = pkgs: [
config.materus.profile.packages.firefox
@ -42,7 +33,8 @@ let
pkgs.samba4Full
pkgs.tdb
];
config.materus.profile.packages.firefox
] ++ config.materus.profile.packages.list.fonts;
extraLibraries = pkgs: [
pkgs.libkrb5