Regenerated

Droidnix/README.org

@@ -977,20 +977,24 @@ This file installs and configures waybar
 { lib, config, pkgs, ... }:
 
 let
-  user      = config.defaultUser or "henrov";
+  username = config.defaultUser or "henrov";
   assetPath = ../../../assets/system/conf/waybar;
 in
 {
   # Install Waybar globally
   environment.systemPackages = [ pkgs.waybar ];
 
-  # Deploy config files via Home Manager
-  home-manager.users.${user}.home.file = {
-    ".config/waybar/config" = {
-      source = "${assetPath}/config";
-    };
-    ".config/waybar/style.css" = {
-      source = "${assetPath}/style.css";
+  # Contribute to the existing hmUsers map
+  _module.args.hmUsers = lib.mkIf true {
+    ${username} = {
+      # Only define the user once in users/henrov.nix
+      # Here we just add files
+      home.file = lib.mkMerge [
+        {
+          ".config/waybar/config" = { source = "${assetPath}/config"; };
+          ".config/waybar/style.css" = { source = "${assetPath}/style.css"; };
+        }
+      ];
     };
   };
 }