From 708eeb84753cfc34959b49f28cdb1f96cd728bab Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 12:13:46 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 26 +++++++++----------- Droidnix/generated/modules/desktop/fonts.nix | 26 +++++++++----------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 3aa71e659..ab7df6496 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -976,23 +976,19 @@ 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, pkgs, ... }: +{ config, lib, pkgs, ... }: -{ # The function defining the NixOS module - flake.nixosModules.fonts = { config, lib, pkgs, ... }: +{ + # Define enable option + options.mySystem.desktop.fonts.enable = + lib.mkEnableOption "Enable nerd-fonts"; - { - # Define an enable option - options.mySystem.desktop.fonts.enable = - lib.mkEnableOption "Enable nerd-fonts"; - - # Only apply config if enabled - config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) { - fonts.packages = with pkgs; [ - nerd-fonts.iosevka - nerd-fonts.fira-code - ]; - }; + # Apply only if enabled + 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 2d49fa54d..eee5705d7 100644 --- a/Droidnix/generated/modules/desktop/fonts.nix +++ b/Droidnix/generated/modules/desktop/fonts.nix @@ -1,19 +1,15 @@ -{ lib, pkgs, ... }: +{ config, lib, pkgs, ... }: -{ # The function defining the NixOS module - flake.nixosModules.fonts = { config, lib, pkgs, ... }: +{ + # Define enable option + options.mySystem.desktop.fonts.enable = + lib.mkEnableOption "Enable nerd-fonts"; - { - # Define an enable option - options.mySystem.desktop.fonts.enable = - lib.mkEnableOption "Enable nerd-fonts"; - - # Only apply config if enabled - config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) { - fonts.packages = with pkgs; [ - nerd-fonts.iosevka - nerd-fonts.fira-code - ]; - }; + # Apply only if enabled + config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) { + fonts.packages = with pkgs; [ + nerd-fonts.iosevka + nerd-fonts.fira-code + ]; }; }