Working on reshuffling

Droidnix/README.org

@@ -1124,6 +1124,7 @@ 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
@@ -1137,16 +1138,16 @@ let
   enableWaybar = true;
 in
 {
-  # Declare a top-level module option
   options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
 
-  # All actual module configuration wrapped safely
   config = lib.mkIf enableWaybar {
-    waybar = {
-      enable = true;           # symbolic enable flag
-      user = username;
-      assetsDir = waybarAssets;
-      files = waybarConfs;     # contains "config" and "style.css" keys
+    myApps = {
+      waybar = {
+        enable = true;
+        user = username;
+        assetsDir = waybarAssets;
+        files = waybarConfs;
+      };
     };
   };
 }
@@ -1998,6 +1999,7 @@ the top of the file."
 ** =generated/modules/apps/wofi.nix=
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 #+BEGIN_SRC nix :tangle generated/modules/apps/wofi.nix :noweb tangle :mkdirp yes :eval never-html
+# wofi.nix
 { lib, ... }:
 
 let
@@ -2007,18 +2009,18 @@ let
     src = "${wofiAssets}/${name}";
   });
 
-  enableWofi = true; # toggle on/off
+  enableWofi = true;
 in
 {
   options.enableWofi = lib.mkEnableOption "Enable Wofi terminal launcher";
 
-  # Everything is wrapped safely in config
   config = lib.mkIf enableWofi {
-    # Just symbolic references to files, no pkgs or recursive config
-    programs.wofi = {
-      enable = true;
-      assetsDir = wofiAssets;
-      files = wofiConfs;
+    myApps = {
+      wofi = {
+        enable = true;
+        assetsDir = wofiAssets;
+        files = wofiConfs;
+      };
     };
   };
 }

Droidnix/generated/modules/apps/wofi.nix

@@ -1,3 +1,4 @@
+# wofi.nix
 { lib, ... }:
 
 let
@@ -7,18 +8,18 @@ let
     src = "${wofiAssets}/${name}";
   });
 
-  enableWofi = true; # toggle on/off
+  enableWofi = true;
 in
 {
   options.enableWofi = lib.mkEnableOption "Enable Wofi terminal launcher";
 
-  # Everything is wrapped safely in config
   config = lib.mkIf enableWofi {
-    # Just symbolic references to files, no pkgs or recursive config
-    programs.wofi = {
-      enable = true;
-      assetsDir = wofiAssets;
-      files = wofiConfs;
+    myApps = {
+      wofi = {
+        enable = true;
+        assetsDir = wofiAssets;
+        files = wofiConfs;
+      };
     };
   };
 }

Droidnix/generated/modules/desktop/waybar.nix

@@ -1,3 +1,4 @@
+# waybar.nix
 { lib, ... }:
 
 let
@@ -11,16 +12,16 @@ let
   enableWaybar = true;
 in
 {
-  # Declare a top-level module option
   options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
 
-  # All actual module configuration wrapped safely
   config = lib.mkIf enableWaybar {
-    waybar = {
-      enable = true;           # symbolic enable flag
-      user = username;
-      assetsDir = waybarAssets;
-      files = waybarConfs;     # contains "config" and "style.css" keys
+    myApps = {
+      waybar = {
+        enable = true;
+        user = username;
+        assetsDir = waybarAssets;
+        files = waybarConfs;
+      };
     };
   };
 }