From 5046fc76e524160343049dbcba1b66146f74d0f7 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Fri, 18 Apr 2025 11:29:07 -0400 Subject: [PATCH] Move fonts.nix to hephaestus --- flake.nix | 1 - fonts.nix | 24 ------------------------ hosts/hephaestus.nix | 22 ++++++++++++++++++++++ 3 files changed, 22 insertions(+), 25 deletions(-) delete mode 100644 fonts.nix diff --git a/flake.nix b/flake.nix index 42f84b5..4fdc9e4 100644 --- a/flake.nix +++ b/flake.nix @@ -73,7 +73,6 @@ inherit vpngate; }; modules = [ - ./fonts.nix ./hosts/hephaestus.nix ./common-packages.nix ./upgrade-diff.nix diff --git a/fonts.nix b/fonts.nix deleted file mode 100644 index ea1d043..0000000 --- a/fonts.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, ... }: -{ - fonts.packages = with pkgs; [ - dejavu_fonts - fira-code - fira-code-symbols - fira-mono - font-awesome - google-fonts - liberation_ttf - nerdfonts - noto-fonts - noto-fonts-cjk-sans - noto-fonts-emoji - noto-fonts-extra - ]; - - fonts.fontconfig.defaultFonts = { - sansSerif = [ "Noto Sans" ]; - serif = [ "Noto Serif" ]; - monospace = [ "Noto Sans Mono" ]; - emoji = [ "Noto Color Emoji" ]; - }; -} diff --git a/hosts/hephaestus.nix b/hosts/hephaestus.nix index 6d45ff2..7b4b2dd 100644 --- a/hosts/hephaestus.nix +++ b/hosts/hephaestus.nix @@ -146,6 +146,28 @@ in }; }; + fonts.packages = with pkgs; [ + dejavu_fonts + fira-code + fira-code-symbols + fira-mono + font-awesome + google-fonts + liberation_ttf + nerdfonts + noto-fonts + noto-fonts-cjk-sans + noto-fonts-emoji + noto-fonts-extra + ]; + + fonts.fontconfig.defaultFonts = { + sansSerif = [ "Noto Sans" ]; + serif = [ "Noto Serif" ]; + monospace = [ "Noto Sans Mono" ]; + emoji = [ "Noto Color Emoji" ]; + }; + nixpkgs = { hostPlatform = "x86_64-linux"; config = {