Working on reshuffling

Droidnix/README.org

@@ -976,28 +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, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
-  flake.nixosModules.fonts = { config, lib, pkgs, ... }:
-
-  {
-    # Top-level toggle
   options.mySystem.desktop.fonts.enable =
     lib.mkEnableOption "Enable system fonts";
 
-    # Only apply if enabled
   config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
-
-      # Dendritic container for apps
     myApps = {
       fonts = {
         enable = true;
-
-          # Optional user
         user = config.defaultUser or "henrov";
-
-          # Font packages
         packages = [
           pkgs.nerd-fonts.iosevka
           pkgs.nerd-fonts.fira-code
@@ -1005,13 +994,11 @@ This file installs and configures fonts
       };
     };
 
-      # Actual Home Manager / NixOS config
     fonts.packages = [
       pkgs.nerd-fonts.iosevka
       pkgs.nerd-fonts.fira-code
     ];
   };
-  };
 }
 #+END_SRC
 

Droidnix/generated/modules/desktop/fonts.nix

@@ -1,25 +1,14 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
-  flake.nixosModules.fonts = { config, lib, pkgs, ... }:
-
-  {
-    # Top-level toggle
   options.mySystem.desktop.fonts.enable =
     lib.mkEnableOption "Enable system fonts";
 
-    # Only apply if enabled
   config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
-
-      # Dendritic container for apps
     myApps = {
       fonts = {
         enable = true;
-
-          # Optional user
         user = config.defaultUser or "henrov";
-
-          # Font packages
         packages = [
           pkgs.nerd-fonts.iosevka
           pkgs.nerd-fonts.fira-code
@@ -27,11 +16,9 @@
       };
     };
 
-      # Actual Home Manager / NixOS config
     fonts.packages = [
       pkgs.nerd-fonts.iosevka
       pkgs.nerd-fonts.fira-code
     ];
   };
-  };
 }