From 9a60f9d4b2a27946f565fe0f55867cc861f78e8b Mon Sep 17 00:00:00 2001 From: Jonni Liljamo Date: Thu, 5 Sep 2024 17:13:46 +0300 Subject: [PATCH] feat: move fonts to profiles/common --- systems/hosts/alice/default.nix | 6 ------ systems/hosts/arwen/default.nix | 6 ------ systems/profiles/common/fonts.nix | 14 ++++++++++++++ systems/profiles/desktop/default.nix | 2 ++ systems/profiles/laptop/default.nix | 2 ++ 5 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 systems/profiles/common/fonts.nix diff --git a/systems/hosts/alice/default.nix b/systems/hosts/alice/default.nix index 67e9b51..c6a55af 100644 --- a/systems/hosts/alice/default.nix +++ b/systems/hosts/alice/default.nix @@ -29,12 +29,6 @@ inputs.nvim-flake.packages.x86_64-linux.nvim wget - font-awesome - liberation_ttf - (nerdfonts.override { - fonts = ["FiraCode" "VictorMono"]; - }) - keepassxc firefox jellyfin-mpv-shim diff --git a/systems/hosts/arwen/default.nix b/systems/hosts/arwen/default.nix index d38c367..b5c7d3d 100644 --- a/systems/hosts/arwen/default.nix +++ b/systems/hosts/arwen/default.nix @@ -31,12 +31,6 @@ inputs.nvim-flake.packages.x86_64-linux.nvim wget - font-awesome - liberation_ttf - (nerdfonts.override { - fonts = ["FiraCode" "VictorMono"]; - }) - keepassxc jellyfin-mpv-shim libreoffice-qt6-fresh diff --git a/systems/profiles/common/fonts.nix b/systems/profiles/common/fonts.nix new file mode 100644 index 0000000..d3621a6 --- /dev/null +++ b/systems/profiles/common/fonts.nix @@ -0,0 +1,14 @@ +{pkgs, ...}: let + fonts = with pkgs; [ + font-awesome + + liberation_ttf + + (nerdfonts.override { + fonts = ["FiraCode" "VictorMono"]; + }) + ]; +in { + environment.systemPackages = fonts; + fonts.packages = fonts; +} diff --git a/systems/profiles/desktop/default.nix b/systems/profiles/desktop/default.nix index 226476e..edc9c74 100644 --- a/systems/profiles/desktop/default.nix +++ b/systems/profiles/desktop/default.nix @@ -9,6 +9,8 @@ inputs @ { impermanence.nixosModules.impermanence home-manager.nixosModules.home-manager + ../common/fonts.nix + ../../../modules ../../../roles ]; diff --git a/systems/profiles/laptop/default.nix b/systems/profiles/laptop/default.nix index 45827fb..6dd8bde 100644 --- a/systems/profiles/laptop/default.nix +++ b/systems/profiles/laptop/default.nix @@ -9,6 +9,8 @@ inputs @ { impermanence.nixosModules.impermanence home-manager.nixosModules.home-manager + ../common/fonts.nix + ../../../modules ../../../roles -- 2.44.1