From 2ef92b69dfef3d227550da72f967fd921c5cb88a Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 12:11:58 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 15 ++++++++++++--- Droidnix/generated/modules/desktop/fonts.nix | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 2f013942d..0ed33b258 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -979,10 +979,19 @@ This file installs and configures fonts { lib, pkgs, ... }: { - # Optional toggle for enabling fonts - options.enableFonts = lib.mkEnableOption "Enable nerd-fonts"; + # Top-level option (toggle) + options = { + mySystem = { + desktop = { + fonts = { + enable = lib.mkEnableOption "Enable nerd-fonts"; + }; + }; + }; + }; - config = lib.mkIf (config.enableFonts or false) { + # Apply configuration if enabled + config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) { fonts.packages = with pkgs; [ nerd-fonts.iosevka nerd-fonts.fira-code diff --git a/Droidnix/generated/modules/desktop/fonts.nix b/Droidnix/generated/modules/desktop/fonts.nix index c767bda0f..2204025ab 100644 --- a/Droidnix/generated/modules/desktop/fonts.nix +++ b/Droidnix/generated/modules/desktop/fonts.nix @@ -1,10 +1,19 @@ { lib, pkgs, ... }: { - # Optional toggle for enabling fonts - options.enableFonts = lib.mkEnableOption "Enable nerd-fonts"; + # Top-level option (toggle) + options = { + mySystem = { + desktop = { + fonts = { + enable = lib.mkEnableOption "Enable nerd-fonts"; + }; + }; + }; + }; - config = lib.mkIf (config.enableFonts or false) { + # Apply configuration if enabled + config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) { fonts.packages = with pkgs; [ nerd-fonts.iosevka nerd-fonts.fira-code