From 1e7cb6da53244ac72a3fc85ad2c9a64052a79051 Mon Sep 17 00:00:00 2001 From: Ethan Simmons Date: Sat, 22 Jun 2024 20:09:49 -0500 Subject: [PATCH] Update system --- flake.lock | 18 +++++++++--------- modules/nix/gui.nix | 9 ++++++--- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index bbc8844..15543d1 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1718526747, - "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", + "lastModified": 1719037157, + "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", + "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511", "type": "github" }, "original": { @@ -89,11 +89,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1718437845, - "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=", + "lastModified": 1718835956, + "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e", + "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", "type": "github" }, "original": { @@ -121,11 +121,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", "type": "github" }, "original": { diff --git a/modules/nix/gui.nix b/modules/nix/gui.nix index cca8c8a..f464ad5 100644 --- a/modules/nix/gui.nix +++ b/modules/nix/gui.nix @@ -39,6 +39,9 @@ in fonts = { packages = with pkgs; [ liberation_ttf + noto-fonts + noto-fonts-cjk + noto-fonts-extra ubuntu_font_family vazir-fonts font-awesome @@ -46,9 +49,9 @@ in fontconfig = { defaultFonts = { - serif = [ "Liberation Serif" "Vazirmatn" ]; - sansSerif = [ "Ubuntu" "Vazirmatn" ]; - monospace = [ "Ubuntu Mono" ]; + serif = [ "Noto Serif" "Noto Serif CJK JP" ]; + sansSerif = [ "Noto Sans" "Noto Sans CJK JP" ]; + monospace = [ "Ubuntu Mono" "Noto Sans Mono CJK JP" ]; }; }; };