Regenerated

Droidnix/README.org

@@ -552,9 +552,9 @@ in
 * First the nix-files that flake really needs and that do not fit wel in the hierarchical structure
 
 
-** =generated/parked/system/dbus.nix=
+** =generated/modules/system/dbus.nix=
 This sets the dbus implementation
-#+BEGIN_SRC nix :tangle generated/parked/system/dbus.nix :noweb tangle :mkdirp yes :eval never-html
+#+BEGIN_SRC nix :tangle generated/modules/system/dbus.nix :noweb tangle :mkdirp yes :eval never-html
 { config, pkgs, lib, ... }:
 {
   services.dbus = lib.mkForce {
@@ -996,53 +996,35 @@ This file installs and configures fonts
 }
 #+END_SRC
 
-** =generated/parked/desktop/waybar.nix=
+** =generated/modules/desktop/waybar.nix=
 This file installs and configures waybar
-#+BEGIN_SRC nix :tangle generated/parked/desktop/waybar.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, ... }:
+#+BEGIN_SRC nix :tangle generated/modules/desktop/waybar.nix :noweb tangle :mkdirp yes :eval never-html
+{ lib, config, pkgs, ... }:
 
 let
-  # --- Module variables ---
   moduleName = "waybar";
   username   = config.defaultUser or "henrov";
+  assetPath  = ../../../assets/system/conf/${moduleName};
 
-  # Assets directory (self-contained)
-  assetPath = ../../../assets/system/conf/${moduleName};
-
-  # Read required config files
   waybarConfig = "${assetPath}/waybar.conf";
   waybarStyle  = "${assetPath}/style.css";
-
-  # Top-level toggle
-  enableProgram = config.enableWaybar or false;
 in
 {
-  # --- Option ---
-  options.enableWaybar =
-    lib.mkEnableOption "Enable Waybar status bar";
+  # Install Waybar system-wide
+  environment.systemPackages = [
+    pkgs.waybar
+  ];
 
-  # --- Config ---
-  config = lib.mkIf enableProgram {
-
-    # Install Waybar (symbolic reference expected to be resolved elsewhere)
-    environment.systemPackages = [
-      "waybar"
-    ];
-
-    # Deploy only required files to ~/.config/waybar
-    home-manager.users.${username}.xdg.configFile = {
-
-      "waybar/config".source =
-        if builtins.pathExists waybarConfig
-        then waybarConfig
-        else null;
-
-      "waybar/style.css".source =
-        if builtins.pathExists waybarStyle
-        then waybarStyle
-        else null;
-    };
-  };
+  # Deploy config files via Home Manager
+  home-manager.users.${username}.home.file = lib.genAttrs [
+    "waybar/config"
+    "waybar/style.css"
+  ] (file: let
+      src = if file == "waybar/config" then waybarConfig else waybarStyle;
+    in {
+      source = if builtins.pathExists src then src else null;
+      target = ".config/${file}";
+    });
 }
 #+END_SRC