From 90cb613d8b1f0b73e493a433877391c5c70f8bd3 Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Wed, 25 Mar 2026 20:02:22 +0000
Subject: [PATCH] Regenerated

---
 Droidnix/README.org | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 30325899e..765f1e0a7 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -471,24 +471,42 @@ in
 ** =generated/modules/traveldroid/apps/wofi.nix=
 This is the install for Wofi, the launcher
 #+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/wofi.nix  :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, flakeRoot, home-manager, ... }:
 
 let
   programName = "wofi";
   username = config.defaultUser or "henrov";
-  assetPath = ../../../assets/system/conf/${programName};
+  assetPath = "${flakeRoot}/assets/traveldroid/conf/${programName}";
+
+  # Read all files in the asset directory if it exists
+  assetFiles =
+    if builtins.pathExists assetPath then
+      builtins.attrNames (builtins.readDir assetPath)
+    else
+      [];
+
+  # Convert files to Home Manager xdg config entries
+  wofiFiles = lib.genAttrs assetFiles (f: {
+    name = ".config/${programName}/${f}";
+    value = { source = "${assetPath}/${f}"; };
+  });
 in
 {
-  # Deploy assets to ~/.config/wofi via Home Manager
-  home-manager.users.${username}.home.file =
-    if builtins.pathExists assetPath then
-      lib.genAttrs (builtins.attrNames (builtins.readDir assetPath)) (name: {
-        source = "${assetPath}/${name}";
-        target = ".config/${programName}/${name}";
-      })
-    else {};
-}
+  # Install Wofi via system packages
+  environment.systemPackages = [
+    pkgs.wofi
+  ];
 
+  # Home Manager configuration
+  _module.args.hmUsers = {
+    ${username} = {
+      home.packages = [ pkgs.wofi ];
+
+      # Deploy all files to ~/.config/wofi/
+      home.file = lib.mkMerge wofiFiles;
+    };
+  };
+}
 # #+END_SRC
 
 ** =generated/modules/traveldroid/apps/zenbrowser.nix=