From c2adceb166b228adc1d2dca1f3060b9ebcc718aa Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 07:52:07 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 25 ++++++++---------------- Droidnix/generated/modules/apps/wofi.nix | 25 ++++++++---------------- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 848dddfae..ac7b7814c 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1992,28 +1992,19 @@ This is top file of this level which contains just an import statement for all r { lib, pkgs, ... }: let - # Relative path to assets + # relative path from this module wofiAssets = ../../../assets/system/conf/wofi; - wofiFiles = builtins.readDir wofiAssets; - - # Map filenames to source paths - wofiConfs = lib.genAttrs (builtins.attrNames wofiFiles) (name: { - src = "${wofiAssets}/${name}"; - }); in { - # Provide a module option to enable Wofi - options.enableWofi = - lib.mkEnableOption "Enable Wofi terminal launcher"; + # Declare an option to enable Wofi + options.enableWofi = lib.mkEnableOption "Enable Wofi terminal launcher"; - # Only apply config if enabled - config = lib.mkIf (lib.getOption "enableWofi") { - # Install Wofi system-wide - environment.systemPackages = [ - pkgs.wofi - ]; + # Apply config if enabled + config = { enableWofi, ... }: lib.mkIf enableWofi { + # Install system package + environment.systemPackages = [ pkgs.wofi ]; - # Copy config files to a standard location in /etc/xdg + # Copy config files to /etc/xdg/wofi environment.etc."xdg/wofi".source = wofiAssets; }; } diff --git a/Droidnix/generated/modules/apps/wofi.nix b/Droidnix/generated/modules/apps/wofi.nix index 861fc1932..3a951890f 100644 --- a/Droidnix/generated/modules/apps/wofi.nix +++ b/Droidnix/generated/modules/apps/wofi.nix @@ -1,28 +1,19 @@ { lib, pkgs, ... }: let - # Relative path to assets + # relative path from this module wofiAssets = ../../../assets/system/conf/wofi; - wofiFiles = builtins.readDir wofiAssets; - - # Map filenames to source paths - wofiConfs = lib.genAttrs (builtins.attrNames wofiFiles) (name: { - src = "${wofiAssets}/${name}"; - }); in { - # Provide a module option to enable Wofi - options.enableWofi = - lib.mkEnableOption "Enable Wofi terminal launcher"; + # Declare an option to enable Wofi + options.enableWofi = lib.mkEnableOption "Enable Wofi terminal launcher"; - # Only apply config if enabled - config = lib.mkIf (lib.getOption "enableWofi") { - # Install Wofi system-wide - environment.systemPackages = [ - pkgs.wofi - ]; + # Apply config if enabled + config = { enableWofi, ... }: lib.mkIf enableWofi { + # Install system package + environment.systemPackages = [ pkgs.wofi ]; - # Copy config files to a standard location in /etc/xdg + # Copy config files to /etc/xdg/wofi environment.etc."xdg/wofi".source = wofiAssets; }; }