Regenerated

Droidnix/README.org

@@ -897,70 +897,41 @@ let
   moduleName = "waybar";
   username   = config.defaultUser or "henrov";
 
-  # Assets directory
-  assetPath =
-    if builtins.pathExists ../../../assets/system/conf/${moduleName}
-    then ../../../assets/system/conf/${moduleName}
-    else null;
+  # Assets directory (self-contained)
+  assetPath = ../../../assets/system/conf/${moduleName};
 
-  # Read all files if assets exist
-  programFiles =
-    if assetPath != null
-    then builtins.readDir assetPath
-    else {};
+  # Read required config files
+  waybarConfig = "${assetPath}/waybar.conf";
+  waybarStyle  = "${assetPath}/style.css";
 
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    src = "${assetPath}/${name}";
-  });
-
-  # Top-level toggle for this module
+  # Top-level toggle
   enableProgram = config.enableWaybar or false;
 in
 {
-  # --- Top-level toggle option ---
-  options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
+  # --- Option ---
+  options.enableWaybar =
+    lib.mkEnableOption "Enable Waybar status bar";
 
-  # --- Only apply configuration if enabled ---
+  # --- Config ---
   config = lib.mkIf enableProgram {
 
-    # --- Dendritic container ---
-    waybar = {
-      enable    = true;
-      user      = username;
-      assetsDir = assetPath;
-      files     = files;
-    };
+    # Install Waybar (symbolic reference expected to be resolved elsewhere)
+    environment.systemPackages = [
+      "waybar"
+    ];
 
-    # --- Deploy configuration to ~/.config/waybar ---
-    home-manager.users.${username} = lib.mkIf assetPath != null {
-      xdg.configFile =
-        lib.mapAttrs' (name: value: {
-          name  = "${moduleName}/${name}";
-          value.source = value.src;
-        }) files;
-    };
+    # Deploy only required files to ~/.config/waybar
+    home-manager.users.${username}.xdg.configFile = {
 
-    # --- Optional systemd service to sync configs ---
-    systemd.services."${moduleName}-sync" = {
-      description = "Sync ${moduleName} configuration";
-      wantedBy    = [ "multi-user.target" ];
-      wants       = [ "network-online.target" ];
-      after       = [ "network-online.target" ];
+      "waybar/config".source =
+        if builtins.pathExists waybarConfig
+        then waybarConfig
+        else null;
 
-      serviceConfig = {
-        Type = "oneshot";
-        ExecStart = ''
-          set -euo pipefail
-          if [ -d "${assetPath}" ]; then
-            for f in ${lib.concatStringsSep " " (builtins.attrNames files)}; do
-              cp -u "${assetPath}/$f" "/home/${username}/.config/${moduleName}/$f"
-            done
-          fi
-        '';
-      };
-
-      restartTriggers = [ assetPath ];
-      path = [];
+      "waybar/style.css".source =
+        if builtins.pathExists waybarStyle
+        then waybarStyle
+        else null;
     };
   };
 }