Working on reshuffling

Droidnix/README.org

@@ -1124,7 +1124,6 @@ in
 ** =generated/modules/desktop/waybar.nix=
 This file installs and configures waybar
 #+BEGIN_SRC nix :tangle generated/modules/desktop/waybar.nix :noweb tangle :mkdirp yes :eval never-html
-# waybar.nix
 { lib, ... }:
 
 let
@@ -1138,8 +1137,16 @@ let
   enableWaybar = true;
 in
 {
+  # Declare a top-level option
+  options.myApps = lib.mkOption {
+    type = lib.types.attrsOf lib.types.any;
+    default = {};
+    description = "Top-level collection of custom apps";
+  };
+
   options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
 
+  # Everything goes under config safely
   config = lib.mkIf enableWaybar {
     myApps = {
       waybar = {

Droidnix/generated/modules/desktop/waybar.nix

@@ -1,4 +1,3 @@
-# waybar.nix
 { lib, ... }:
 
 let
@@ -12,8 +11,16 @@ let
   enableWaybar = true;
 in
 {
+  # Declare a top-level option
+  options.myApps = lib.mkOption {
+    type = lib.types.attrsOf lib.types.any;
+    default = {};
+    description = "Top-level collection of custom apps";
+  };
+
   options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
 
+  # Everything goes under config safely
   config = lib.mkIf enableWaybar {
     myApps = {
       waybar = {