From 4b5de2fcff0e351262faadfd47bdc1b41ac3933d Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 12:10:50 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 38 +++++--------------- Droidnix/generated/modules/desktop/fonts.nix | 38 +++++--------------- 2 files changed, 16 insertions(+), 60 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 5f625c786..2f013942d 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -976,39 +976,17 @@ 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 -{ lib, ... }: +{ lib, pkgs, ... }: -let - # Program-specific info - programName = "fonts"; - - # Enable toggle for this module (default ON) - enableProgram = true; - - # Example symbolic references to fonts - fontPackages = [ - "nerd-fonts.iosevka" - "nerd-fonts.fira-code" - ]; -in { - # Top-level toggle - options.enableFonts = lib.mkEnableOption "Enable system fonts"; + # Optional toggle for enabling fonts + options.enableFonts = lib.mkEnableOption "Enable nerd-fonts"; - # Wrap everything in config.mkIf - config = lib.mkIf enableProgram { - - # Inside mkIf, config is defined - myApps = let - userName = config.defaultUser or "henrov"; - in - { - fonts = { - enable = true; - packages = fontPackages; - user = userName; - }; - }; + config = lib.mkIf (config.enableFonts 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 2e78bc64b..c767bda0f 100644 --- a/Droidnix/generated/modules/desktop/fonts.nix +++ b/Droidnix/generated/modules/desktop/fonts.nix @@ -1,35 +1,13 @@ -{ lib, ... }: +{ lib, pkgs, ... }: -let - # Program-specific info - programName = "fonts"; - - # Enable toggle for this module (default ON) - enableProgram = true; - - # Example symbolic references to fonts - fontPackages = [ - "nerd-fonts.iosevka" - "nerd-fonts.fira-code" - ]; -in { - # Top-level toggle - options.enableFonts = lib.mkEnableOption "Enable system fonts"; + # Optional toggle for enabling fonts + options.enableFonts = lib.mkEnableOption "Enable nerd-fonts"; - # Wrap everything in config.mkIf - config = lib.mkIf enableProgram { - - # Inside mkIf, config is defined - myApps = let - userName = config.defaultUser or "henrov"; - in - { - fonts = { - enable = true; - packages = fontPackages; - user = userName; - }; - }; + config = lib.mkIf (config.enableFonts or false) { + fonts.packages = with pkgs; [ + nerd-fonts.iosevka + nerd-fonts.fira-code + ]; }; }