diff --git a/common/users.nix b/common/users.nix index 42330a3..4ce99b0 100644 --- a/common/users.nix +++ b/common/users.nix @@ -6,6 +6,18 @@ let usrPwdFile = "users/${usr}/password"; in { + fonts = { + fontconfig.defaultFonts = { + serif = [ "Sarasa UI SC" ]; + sansSerif = [ "Sarasa UI SC" ]; + monospace = [ "Sarasa Mono SC" ]; + }; + packages = with pkgs; [ + sarasa-gothic + noto-fonts-emoji + ]; + }; + home-manager = { useGlobalPkgs = true; users.${usr} = { diff --git a/linux/blitzar/locale.nix b/linux/blitzar/locale.nix index 286df59..bebcf11 100644 --- a/linux/blitzar/locale.nix +++ b/linux/blitzar/locale.nix @@ -1,23 +1,6 @@ { pkgs, ... }: { - # Configure default fonts - fonts = { - fontconfig.defaultFonts = { - serif = [ "Noto Serif" "Noto Serif CJK SC" ]; - sansSerif = [ "Inter" "Noto Sans CJK SC" ]; - monospace = [ "Iosevka" "Noto Sans Mono CJK SC" ]; - }; - packages = with pkgs; [ - inter - iosevka - noto-fonts - noto-fonts-cjk - noto-fonts-cjk-serif - noto-fonts-emoji - ]; - }; - # Configure input methods i18n = { defaultLocale = "en_US.UTF-8"; diff --git a/linux/protostar/default.nix b/linux/protostar/default.nix index de1930a..b3f447e 100644 --- a/linux/protostar/default.nix +++ b/linux/protostar/default.nix @@ -9,7 +9,6 @@ ./disko.nix ./gui.nix ./hardware-configuration.nix - ./locale.nix ./network.nix ./syncthing.nix ./tailscale.nix diff --git a/linux/protostar/locale.nix b/linux/protostar/locale.nix deleted file mode 100644 index a73b7dd..0000000 --- a/linux/protostar/locale.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: - -{ - # Configure default fonts - fonts = { - fontconfig.defaultFonts = { - serif = [ "Noto Serif" "Noto Serif CJK SC" ]; - sansSerif = [ "Inter" "Noto Sans CJK SC" ]; - monospace = [ "Iosevka" "Noto Sans Mono CJK SC" ]; - }; - packages = with pkgs; [ - sarasa-gothic - noto-fonts-emoji - ]; - }; -}