From 360fc531a9b91a5106f86ae02f97bf4aa4726276 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 09:08:58 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 19 +++++++++++++------ Droidnix/generated/modules/desktop/waybar.nix | 19 +++++++++++++------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index a5a4178c1..88a87df30 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1124,29 +1124,36 @@ in ** =generated/modules/desktop/waybar.nix= This file installs and configures waybar #+BEGIN_SRC nix :tangle generated/modules/desktop/waybar.nix :noweb tangle :mkdirp yes :eval never-html -# waybar.nix { lib, ... }: let username = "henrov"; waybarAssets = ../../../assets/system/conf/waybar; - waybarFiles = builtins.readDir waybarAssets; - waybarConfs = lib.genAttrs (builtins.attrNames waybarFiles) (name: { + waybarFiles = builtins.readDir waybarAssets; + waybarConfs = lib.genAttrs (builtins.attrNames waybarFiles) (name: { src = "${waybarAssets}/${name}"; }); enableWaybar = true; in { + # Declare a top-level option + options.myApps = lib.mkOption { + type = lib.types.attrsOf lib.types.any; + default = {}; + description = "Top-level collection of custom apps"; + }; + options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar"; + # Everything goes under config safely config = lib.mkIf enableWaybar { myApps = { waybar = { - enable = true; - user = username; + enable = true; + user = username; assetsDir = waybarAssets; - files = waybarConfs; + files = waybarConfs; }; }; }; diff --git a/Droidnix/generated/modules/desktop/waybar.nix b/Droidnix/generated/modules/desktop/waybar.nix index 98859d5a9..c155ca4c8 100644 --- a/Droidnix/generated/modules/desktop/waybar.nix +++ b/Droidnix/generated/modules/desktop/waybar.nix @@ -1,26 +1,33 @@ -# waybar.nix { lib, ... }: let username = "henrov"; waybarAssets = ../../../assets/system/conf/waybar; - waybarFiles = builtins.readDir waybarAssets; - waybarConfs = lib.genAttrs (builtins.attrNames waybarFiles) (name: { + waybarFiles = builtins.readDir waybarAssets; + waybarConfs = lib.genAttrs (builtins.attrNames waybarFiles) (name: { src = "${waybarAssets}/${name}"; }); enableWaybar = true; in { + # Declare a top-level option + options.myApps = lib.mkOption { + type = lib.types.attrsOf lib.types.any; + default = {}; + description = "Top-level collection of custom apps"; + }; + options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar"; + # Everything goes under config safely config = lib.mkIf enableWaybar { myApps = { waybar = { - enable = true; - user = username; + enable = true; + user = username; assetsDir = waybarAssets; - files = waybarConfs; + files = waybarConfs; }; }; };