diff --git a/Droidnix/README.org b/Droidnix/README.org index f40c2d357..2a4f08a12 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -718,7 +718,7 @@ let value = { source = "${assetPath}/${f}"; }; }); - # Optional stylix.conf contents + # Optional stylix.conf stylixConfFile = "${assetPath}/stylix.conf"; stylixConf = if builtins.pathExists stylixConfFile @@ -741,14 +741,14 @@ in ############################ # Home Manager user-level configuration ############################ - # Follow the hyprland pattern to avoid "option does not exist" _module.args.hmUsers = { "${username}" = { - # Merge all Stylix asset files into ~/.config/stylix/ - home.file = lib.mkMerge stylixFiles; - - # Include stylix.conf if it exists - home.file."${moduleName}/stylix.conf".text = stylixConf; + # Merge all Stylix files + optional stylix.conf + home.file = lib.mkMerge ( + stylixFiles // { + "${moduleName}/stylix.conf".text = stylixConf; + } + ); # Session variables for Stylix & cursors home.sessionVariables = { diff --git a/Droidnix/generated/modules/traveldroid/desktop/stylix.nix b/Droidnix/generated/modules/traveldroid/desktop/stylix.nix index 314d4f6ba..1922eccfa 100644 --- a/Droidnix/generated/modules/traveldroid/desktop/stylix.nix +++ b/Droidnix/generated/modules/traveldroid/desktop/stylix.nix @@ -16,7 +16,7 @@ let value = { source = "${assetPath}/${f}"; }; }); - # Optional stylix.conf contents + # Optional stylix.conf stylixConfFile = "${assetPath}/stylix.conf"; stylixConf = if builtins.pathExists stylixConfFile @@ -39,14 +39,14 @@ in ############################ # Home Manager user-level configuration ############################ - # Follow the hyprland pattern to avoid "option does not exist" _module.args.hmUsers = { "${username}" = { - # Merge all Stylix asset files into ~/.config/stylix/ - home.file = lib.mkMerge stylixFiles; - - # Include stylix.conf if it exists - home.file."${moduleName}/stylix.conf".text = stylixConf; + # Merge all Stylix files + optional stylix.conf + home.file = lib.mkMerge ( + stylixFiles // { + "${moduleName}/stylix.conf".text = stylixConf; + } + ); # Session variables for Stylix & cursors home.sessionVariables = {