From 94aa0fc0fbe9ed37a7bfa156cff0bfacc3b0a8cb Mon Sep 17 00:00:00 2001 From: Daniel Thwaites Date: Tue, 6 Aug 2024 12:42:19 +0100 Subject: [PATCH] nixvim: rename transparency options to camelCase (#497) --- modules/nixvim/nixvim.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/modules/nixvim/nixvim.nix b/modules/nixvim/nixvim.nix index 050e7f85..d16a2385 100644 --- a/modules/nixvim/nixvim.nix +++ b/modules/nixvim/nixvim.nix @@ -7,12 +7,21 @@ options.stylix.targets.nixvim = { enable = config.lib.stylix.mkEnableTarget "nixvim" true; - transparent_bg = { + transparentBackground = { main = lib.mkEnableOption "background transparency for the main NeoVim window"; - sign_column = lib.mkEnableOption "background transparency for the NeoVim sign column"; + signColumn = lib.mkEnableOption "background transparency for the NeoVim sign column"; }; }; + imports = [ + (lib.mkRenamedOptionModule + [ "stylix" "targets" "nixvim" "transparent_bg" "main" ] + [ "stylix" "targets" "nixvim" "transparentBackground" "main" ]) + (lib.mkRenamedOptionModule + [ "stylix" "targets" "nixvim" "transparent_bg" "sign_column" ] + [ "stylix" "targets" "nixvim" "transparentBackground" "signColumn" ]) + ]; + config = lib.mkIf (config.stylix.enable && config.stylix.targets.nixvim.enable && (config.programs ? nixvim)) ( lib.optionalAttrs (builtins.hasAttr "nixvim" options.programs) { programs.nixvim = { @@ -33,9 +42,9 @@ ctermbg = "none"; }; in { - Normal = lib.mkIf cfg.transparent_bg.main transparent; - NonText = lib.mkIf cfg.transparent_bg.main transparent; - SignColumn = lib.mkIf cfg.transparent_bg.sign_column transparent; + Normal = lib.mkIf cfg.transparentBackground.main transparent; + NonText = lib.mkIf cfg.transparentBackground.main transparent; + SignColumn = lib.mkIf cfg.transparentBackground.signColumn transparent; }; }; }