From 12557c5a301dcb338a4019902e36282fe01eaccb Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 06:50:13 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 26 +++++++++++++++++--- Droidnix/generated/modules/desktop/fonts.nix | 26 +++++++++++++++++--- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 2b22eef1b..288c64db3 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -978,11 +978,29 @@ Setting up GTK ** =generated/modules/desktop/fonts.nix= This file installs and configures fonts #+BEGIN_SRC nix :tangle generated/modules/desktop/fonts.nix :noweb tangle :mkdirp yes :eval never-html -{ config, pkgs, ... }: +{ lib, ... }: + { - fonts.packages = with pkgs; [ - pkgs.nerd-fonts.iosevka - ]; + flake.nixosModules.fonts = + { + config, + pkgs, + lib, + ... + }: + + { + options.mySystem.desktop.fonts.enable = lib.mkEnableOption "Enable system fonts"; + + config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) { + + fonts.packages = with pkgs; [ + nerd-fonts.iosevka + nerd-fonts.fira-code + ]; + + }; + }; } #+END_SRC diff --git a/Droidnix/generated/modules/desktop/fonts.nix b/Droidnix/generated/modules/desktop/fonts.nix index 916964572..8bd3de1cf 100644 --- a/Droidnix/generated/modules/desktop/fonts.nix +++ b/Droidnix/generated/modules/desktop/fonts.nix @@ -1,6 +1,24 @@ -{ config, pkgs, ... }: +{ lib, ... }: + { - fonts.packages = with pkgs; [ - pkgs.nerd-fonts.iosevka - ]; + flake.nixosModules.fonts = + { + config, + pkgs, + lib, + ... + }: + + { + options.mySystem.desktop.fonts.enable = lib.mkEnableOption "Enable system fonts"; + + config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) { + + fonts.packages = with pkgs; [ + nerd-fonts.iosevka + nerd-fonts.fira-code + ]; + + }; + }; }