From 7e09db3801e1d032bfeec116e3537941a729218b Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 20:54:45 -0400 Subject: [PATCH] Fonts refactor --- modules/nixos/desktop/kde.nix | 1 + modules/skyg/fonts.nix | 40 ++++++++++++++++------------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index 43837d8..9df4166 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -24,5 +24,6 @@ in kdePackages.plasma-browser-integration konsave # save configs ]; + services.desktopManager.plasma6.notoPackage = pkgs.fira-code; }; } diff --git a/modules/skyg/fonts.nix b/modules/skyg/fonts.nix index b94bf2a..dca9a71 100644 --- a/modules/skyg/fonts.nix +++ b/modules/skyg/fonts.nix @@ -1,26 +1,22 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { - config = { - fonts = { - packages = with pkgs; [ - fira-code - fira-code-symbols - font-awesome - mplus-outline-fonts.githubRelease - noto-fonts-emoji - ]; - enableDefaultPackages = true; - fontDir.enable = true; - fontconfig = { - enable = true; - defaultFonts = { - serif = [ "Fira Code" "DroidSansMono" ]; - sansSerif = [ "Fira Code" "DroidSansMono" ]; - monospace = [ "Fira Code" ]; - }; + fonts = { + packages = with pkgs; [ + fira-code + fira-code-symbols + font-awesome + mplus-outline-fonts.githubRelease + noto-fonts-emoji + ]; + enableDefaultPackages = true; + fontDir.enable = true; + fontconfig = { + enable = true; + defaultFonts = { + serif = [ "Fira Code" "DroidSansMono" ]; + sansSerif = [ "Fira Code" "DroidSansMono" ]; + monospace = [ "Fira Code" ]; }; }; - } // (if config.services.desktopManager.plasma6.enable then { - services.desktopManager.plasma6.notoPackage = pkgs.fira-code; - } else { }); + }; }