Working on reshuffling

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

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
+    ];
   };
 }