From 7b26c45fb82f0bdea6742cdcc32435c29d9e69a5 Mon Sep 17 00:00:00 2001 From: oddlama Date: Tue, 5 Sep 2023 00:14:21 +0200 Subject: [PATCH] feat: use Segoe-UI fonts --- modules/optional/graphical/fonts.nix | 55 +++++++--------------------- pkgs/default.nix | 1 + pkgs/segoe-ui-ttf.nix | 20 ++++++++++ 3 files changed, 34 insertions(+), 42 deletions(-) create mode 100644 pkgs/segoe-ui-ttf.nix diff --git a/modules/optional/graphical/fonts.nix b/modules/optional/graphical/fonts.nix index 187dbab..dbdb768 100644 --- a/modules/optional/graphical/fonts.nix +++ b/modules/optional/graphical/fonts.nix @@ -1,53 +1,24 @@ -{pkgs, ...}: { +{ + lib, + pkgs, + ... +}: { fonts = { - enableDefaultFonts = false; - enableGhostscriptFonts = false; - fontDir.enable = false; - fontconfig = { - defaultFonts = { - sansSerif = ["IBM Plex Sans"]; - serif = ["IBM Plex Sans"]; - monospace = ["FiraCode Nerd Font"]; - emoji = ["Noto Color Emoji"]; - }; - localConf = '' - - - - - monospace - - emoji - - - - sans-serif - - emoji - - - - serif - - emoji - - - - ''; + fontconfig.defaultFonts = { + sansSerif = lib.mkBefore ["Segoe UI"]; + #serif = []; + monospace = ["FiraCode Nerd Font"]; + emoji = ["Segoe UI Emoji" "Noto Fonts Emoji"]; }; - fonts = with pkgs; [ + + packages = with pkgs; [ (nerdfonts.override {fonts = ["FiraCode"];}) - ibm-plex - dejavu_fonts - unifont - freefont_ttf - gyre-fonts # TrueType substitutes for standard PostScript fonts - liberation_ttf noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-emoji noto-fonts-extra + segoe-ui-ttf ]; }; } diff --git a/pkgs/default.nix b/pkgs/default.nix index 9230539..7535e7e 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,6 +3,7 @@ (import ./oauth2-proxy) (_self: super: { kanidm-secret-manipulator = super.callPackage ./kanidm-secret-manipulator.nix {}; + segoe-ui-ttf = super.callPackage ./segoe-ui-ttf.nix {}; kanidm = super.kanidm.overrideAttrs (_finalAttrs: _previousAttrs: { patches = [ (super.fetchpatch { diff --git a/pkgs/segoe-ui-ttf.nix b/pkgs/segoe-ui-ttf.nix new file mode 100644 index 0000000..49411ea --- /dev/null +++ b/pkgs/segoe-ui-ttf.nix @@ -0,0 +1,20 @@ +{ + stdenv, + fetchFromGitHub, +}: +stdenv.mkDerivation rec { + pname = "segoe-ui"; + version = "unstable-2023-09-04"; + + src = fetchFromGitHub { + owner = "mrbvrz"; + repo = "segoe-ui-linux"; + rev = "73b3a40c6c433d3b8149d945d4c441d4497d5f79"; + hash = "sha256-EwsoX6Rz1uaysCIxL11AHTKb2hfwKi/hNIKgG4MzR5o="; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + install -m644 $src/font/*.ttf $out/share/fonts/truetype/ + ''; +}