From 541c14c3d14361a0aa00ded80f2354740259431a Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 07:57:18 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 9 +++++---- Droidnix/generated/modules/apps/wofi.nix | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 2bd36a67c..e17635fda 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1989,20 +1989,21 @@ 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, pkgs, ... }: +{ config, pkgs, lib, ... }: let - # relative path from this module wofiAssets = ../../../assets/system/conf/wofi; in { - # Declare an option to enable Wofi + # Option to enable Wofi options.enableWofi = lib.mkEnableOption "Enable Wofi terminal launcher"; - # Apply config if enabled + # Config applied when module is evaluated config = { + # Add Wofi to systemPackages if enabled environment.systemPackages = lib.mkIf (config.enableWofi) [ pkgs.wofi ]; + # Install wofi config files environment.etc."xdg/wofi".source = lib.mkIf (config.enableWofi) wofiAssets; }; } diff --git a/Droidnix/generated/modules/apps/wofi.nix b/Droidnix/generated/modules/apps/wofi.nix index 0b8e8aed4..c9c96c1bc 100644 --- a/Droidnix/generated/modules/apps/wofi.nix +++ b/Droidnix/generated/modules/apps/wofi.nix @@ -1,17 +1,18 @@ -{ lib, pkgs, ... }: +{ config, pkgs, lib, ... }: let - # relative path from this module wofiAssets = ../../../assets/system/conf/wofi; in { - # Declare an option to enable Wofi + # Option to enable Wofi options.enableWofi = lib.mkEnableOption "Enable Wofi terminal launcher"; - # Apply config if enabled + # Config applied when module is evaluated config = { + # Add Wofi to systemPackages if enabled environment.systemPackages = lib.mkIf (config.enableWofi) [ pkgs.wofi ]; + # Install wofi config files environment.etc."xdg/wofi".source = lib.mkIf (config.enableWofi) wofiAssets; }; }