Regenerated

Droidnix/README.org

@@ -877,38 +877,77 @@ This file installs and configures fonts
 ** =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
-{ lib, pkgs, config, ... }:
+{ lib, config, ... }:
 
 let
-  programName = "waybar";
+  # --- Module variables ---
+  moduleName = "waybar";
+  username   = config.defaultUser or "henrov";
 
-  # Path to configuration assets
-  programAssets = ../../../assets/system/conf/${programName};
-  programFiles  = builtins.readDir programAssets;
-  files         = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    src = "${programAssets}/${name}";
+  # Assets directory
+  assetPath =
+    if builtins.pathExists ../../../assets/system/conf/${moduleName}
+    then ../../../assets/system/conf/${moduleName}
+    else null;
+
+  # Read all files if assets exist
+  programFiles =
+    if assetPath != null
+    then builtins.readDir assetPath
+    else {};
+
+  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
+    src = "${assetPath}/${name}";
   });
 
-  # Toggle variable referring to the top-level option
+  # Top-level toggle for this module
   enableProgram = config.enableWaybar or false;
-
-  # Default user fallback
-  defaultUser = "henrov";
-
-in {
-  # Top-level toggle for the module
+in
+{
+  # --- Top-level toggle option ---
   options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
 
-  # Wrap all actual configuration in mkIf(enableProgram)
+  # --- Only apply configuration if enabled ---
   config = lib.mkIf enableProgram {
-    # mySystem container for dendritic structure
-    mySystem = {
-      ${programName} = {
-        enable    = true;
-        user      = config.defaultUser or defaultUser;
-        assetsDir = programAssets;
-        files     = files;
+
+    # --- Dendritic container ---
+    waybar = {
+      enable    = true;
+      user      = username;
+      assetsDir = assetPath;
+      files     = files;
+    };
+
+    # --- 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;
+    };
+
+    # --- 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" ];
+
+      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 = [];
     };
   };
 }