From 2fcfe478a80a868c1139a42fc7a4e44ad437a03a Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Wed, 18 Mar 2026 18:17:39 +0000
Subject: [PATCH] Reshuffling stuff

---
 Droidnix/README.org                      | 41 +++++++-----------------
 Droidnix/generated/modules/apps/wofi.nix | 41 +++++++-----------------
 2 files changed, 24 insertions(+), 58 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 4d561cf73..09d6004af 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1850,39 +1850,22 @@ the top of the file."
 ** =generated/modules/apps/wofi.nix=
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 #+BEGIN_SRC nix :tangle generated/modules/apps/wofi.nix :noweb tangle :mkdirp yes :eval never-html
-{
-  lib,
-  config,
-  pkgs,
-  flakeRoot,
-  user,
-  ...
-}:
+{ lib, config, flakeRoot, ... }:
 
 let
-  wofiConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/wofi";
-  # Dynamically read all files in assets/hyprland/conf/wofi/
-  wofiConfs =
-    lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/system/conf/wofi"))
-      (name: {
-        text = builtins.readFile "${flakeRoot}/assets/system/conf/wofi/${name}";
-      });
+  wofiAssets = "${flakeRoot}/assets/system/conf/wofi";
+  wofiFiles = builtins.readDir wofiAssets;
+  wofiConfs = lib.genAttrs (builtins.attrNames wofiFiles) (name: {
+    src = "${wofiAssets}/${name}";
+  });
 in
 {
-  environment.systemPackages = with pkgs; [
-    wofi
-  ];
-
-  home-manager.users.${user.username} = {
-    home.file = {
-      # Map the files to their target paths in ~/.config/wofi/
-      "${wofiConfigDir}/config" = wofiConfs."wofi.conf"; # Use the actual filename
-      "${wofiConfigDir}/style.css" = wofiConfs."theming.css"; # Use the actual filename
-    };
-
-    home.sessionVariables = {
-      WOFI_CONFIG = "${wofiConfigDir}/config";
-      WOFI_STYLE = "${wofiConfigDir}/style.css";
+  mySystem = {
+    apps.wofi = {
+      enable = true;
+      # symbolic references to files
+      configFile = wofiConfs."wofi.conf".src;
+      styleFile  = wofiConfs."theming.css".src;
     };
   };
 }
diff --git a/Droidnix/generated/modules/apps/wofi.nix b/Droidnix/generated/modules/apps/wofi.nix
index d151550d2..3725b9613 100644
--- a/Droidnix/generated/modules/apps/wofi.nix
+++ b/Droidnix/generated/modules/apps/wofi.nix
@@ -1,36 +1,19 @@
-{
-  lib,
-  config,
-  pkgs,
-  flakeRoot,
-  user,
-  ...
-}:
+{ lib, config, flakeRoot, ... }:
 
 let
-  wofiConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/wofi";
-  # Dynamically read all files in assets/hyprland/conf/wofi/
-  wofiConfs =
-    lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/system/conf/wofi"))
-      (name: {
-        text = builtins.readFile "${flakeRoot}/assets/system/conf/wofi/${name}";
-      });
+  wofiAssets = "${flakeRoot}/assets/system/conf/wofi";
+  wofiFiles = builtins.readDir wofiAssets;
+  wofiConfs = lib.genAttrs (builtins.attrNames wofiFiles) (name: {
+    src = "${wofiAssets}/${name}";
+  });
 in
 {
-  environment.systemPackages = with pkgs; [
-    wofi
-  ];
-
-  home-manager.users.${user.username} = {
-    home.file = {
-      # Map the files to their target paths in ~/.config/wofi/
-      "${wofiConfigDir}/config" = wofiConfs."wofi.conf"; # Use the actual filename
-      "${wofiConfigDir}/style.css" = wofiConfs."theming.css"; # Use the actual filename
-    };
-
-    home.sessionVariables = {
-      WOFI_CONFIG = "${wofiConfigDir}/config";
-      WOFI_STYLE = "${wofiConfigDir}/style.css";
+  mySystem = {
+    apps.wofi = {
+      enable = true;
+      # symbolic references to files
+      configFile = wofiConfs."wofi.conf".src;
+      styleFile  = wofiConfs."theming.css".src;
     };
   };
 }