From f30255086560370804eef93829f29f70dfa0172d Mon Sep 17 00:00:00 2001 From: damidoug Date: Fri, 14 Nov 2025 20:16:08 +0100 Subject: [PATCH] =?UTF-8?q?aerospace:=20rename=20userSettings=20=E2=86=92?= =?UTF-8?q?=20settings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/programs/aerospace.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/programs/aerospace.nix b/modules/programs/aerospace.nix index 5db064f10..8260baad3 100644 --- a/modules/programs/aerospace.nix +++ b/modules/programs/aerospace.nix @@ -39,6 +39,13 @@ in { meta.maintainers = with lib.maintainers; [ damidoug ]; + imports = [ + (lib.mkRenamedOptionModule + [ "programs" "aerospace" "userSettings" ] + [ "programs" "aerospace" "settings" ] + ) + ]; + options.programs.aerospace = { enable = lib.mkEnableOption "AeroSpace window manager"; @@ -98,7 +105,7 @@ in ''; }; - userSettings = mkOption { + settings = mkOption { inherit (tomlFormat) type; default = { }; example = lib.literalExpression '' @@ -137,7 +144,7 @@ in let generatedConfig = tomlFormat.generate "aerospace" ( filterNulls ( - cfg.userSettings + cfg.settings // lib.optionalAttrs cfg.launchd.enable { # Override these to avoid launchd conflicts start-at-login = false;