From e48dda4fe4ae7ac22ba718467202f5785a7ee2fc Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 23 Jan 2025 20:02:06 -0600 Subject: [PATCH] plugins/dap: remove with lib --- plugins/by-name/dap/dap-go.nix | 7 ++++--- plugins/by-name/dap/dap-python.nix | 9 +++++---- plugins/by-name/dap/dap-ui.nix | 9 +++++---- plugins/by-name/dap/dap-virtual-text.nix | 7 +++---- plugins/by-name/dap/dapHelpers.nix | 10 ++++++---- plugins/by-name/dap/default.nix | 18 +++++++++++++----- 6 files changed, 36 insertions(+), 24 deletions(-) diff --git a/plugins/by-name/dap/dap-go.nix b/plugins/by-name/dap/dap-go.nix index f254ca71..91db8d7d 100644 --- a/plugins/by-name/dap/dap-go.nix +++ b/plugins/by-name/dap/dap-go.nix @@ -5,14 +5,15 @@ pkgs, ... }: -with lib; let + inherit (lib) types; + cfg = config.plugins.dap.extensions.dap-go; dapHelpers = import ./dapHelpers.nix { inherit lib helpers; }; in { options.plugins.dap.extensions.dap-go = { - enable = mkEnableOption "dap-go"; + enable = lib.mkEnableOption "dap-go"; package = lib.mkPackageOption pkgs "dap-go" { default = [ @@ -55,7 +56,7 @@ in }; }; in - mkIf cfg.enable { + lib.mkIf cfg.enable { extraPlugins = [ cfg.package ]; plugins.dap = { diff --git a/plugins/by-name/dap/dap-python.nix b/plugins/by-name/dap/dap-python.nix index 8c9668d5..9fdaef97 100644 --- a/plugins/by-name/dap/dap-python.nix +++ b/plugins/by-name/dap/dap-python.nix @@ -5,14 +5,15 @@ pkgs, ... }: -with lib; let + inherit (lib) types; + cfg = config.plugins.dap.extensions.dap-python; dapHelpers = import ./dapHelpers.nix { inherit lib helpers; }; in { options.plugins.dap.extensions.dap-python = { - enable = mkEnableOption "dap-python"; + enable = lib.mkEnableOption "dap-python"; package = lib.mkPackageOption pkgs "dap-python" { default = [ @@ -21,7 +22,7 @@ in ]; }; - adapterPythonPath = mkOption { + adapterPythonPath = lib.mkOption { default = lib.getExe (pkgs.python3.withPackages (ps: with ps; [ debugpy ])); defaultText = lib.literalExpression '' lib.getExe (pkgs.python3.withPackages (ps: with ps; [ debugpy ])) @@ -67,7 +68,7 @@ in include_configs = includeConfigs; }; in - mkIf cfg.enable { + lib.mkIf cfg.enable { extraPlugins = [ cfg.package ]; plugins.dap = { diff --git a/plugins/by-name/dap/dap-ui.nix b/plugins/by-name/dap/dap-ui.nix index 606f10e3..f0151772 100644 --- a/plugins/by-name/dap/dap-ui.nix +++ b/plugins/by-name/dap/dap-ui.nix @@ -5,15 +5,16 @@ pkgs, ... }: -with lib; let + inherit (lib) mkOption types; + cfg = config.plugins.dap.extensions.dap-ui; mkSizeOption = helpers.mkNullOrOption (with types; either int (numbers.between 0.0 1.0)); mkKeymapOptions = name: - mapAttrs ( + lib.mapAttrs ( key: default: helpers.defaultNullOpts.mkNullable ( with types; either str (listOf str) @@ -57,7 +58,7 @@ let in { options.plugins.dap.extensions.dap-ui = lib.nixvim.plugins.neovim.extraOptionsOptions // { - enable = mkEnableOption "dap-ui"; + enable = lib.mkEnableOption "dap-ui"; package = lib.mkPackageOption pkgs "dap-ui" { default = [ @@ -232,7 +233,7 @@ in } // cfg.extraOptions; in - mkIf cfg.enable { + lib.mkIf cfg.enable { extraPlugins = [ cfg.package ]; plugins.dap = { diff --git a/plugins/by-name/dap/dap-virtual-text.nix b/plugins/by-name/dap/dap-virtual-text.nix index 60048f61..5c89005e 100644 --- a/plugins/by-name/dap/dap-virtual-text.nix +++ b/plugins/by-name/dap/dap-virtual-text.nix @@ -5,13 +5,12 @@ pkgs, ... }: -with lib; let cfg = config.plugins.dap.extensions.dap-virtual-text; in { options.plugins.dap.extensions.dap-virtual-text = { - enable = mkEnableOption "dap-virtual-text"; + enable = lib.mkEnableOption "dap-virtual-text"; package = lib.mkPackageOption pkgs "dap-virtual-text" { default = [ @@ -62,7 +61,7 @@ in virtLines = helpers.defaultNullOpts.mkBool false "Show virtual lines instead of virtual text (will flicker!)."; - virtTextWinCol = helpers.mkNullOrOption types.int '' + virtTextWinCol = helpers.mkNullOrOption lib.types.int '' Position the virtual text at a fixed window column (starting from the first text column). See `:h nvim_buf_set_extmark()`. ''; @@ -87,7 +86,7 @@ in virt_text_win_col = virtTextWinCol; }; in - mkIf cfg.enable { + lib.mkIf cfg.enable { extraPlugins = [ cfg.package ]; plugins.dap = { diff --git a/plugins/by-name/dap/dapHelpers.nix b/plugins/by-name/dap/dapHelpers.nix index 54b0b100..d1f5084c 100644 --- a/plugins/by-name/dap/dapHelpers.nix +++ b/plugins/by-name/dap/dapHelpers.nix @@ -1,5 +1,7 @@ { lib, helpers }: -with lib; +let + inherit (lib) types; +in rec { mkAdapterType = attrs: @@ -92,12 +94,12 @@ rec { freeformType = types.attrs; options = { - type = mkOption { + type = lib.mkOption { description = "Which debug adapter to use."; type = types.str; }; - request = mkOption { + request = lib.mkOption { type = types.enum [ "attach" "launch" @@ -107,7 +109,7 @@ rec { ''; }; - name = mkOption { + name = lib.mkOption { type = types.str; description = "A user readable name for the configuration."; }; diff --git a/plugins/by-name/dap/default.nix b/plugins/by-name/dap/default.nix index 3cac28bd..b77a3b63 100644 --- a/plugins/by-name/dap/default.nix +++ b/plugins/by-name/dap/default.nix @@ -5,12 +5,20 @@ pkgs, ... }: -with lib; let + inherit (lib) + mkAdapterOption + mkEnableOption + mkOption + mkSignOption + optionalString + types + ; + cfg = config.plugins.dap; + dapHelpers = import ./dapHelpers.nix { inherit lib helpers; }; in -with dapHelpers; { imports = [ ./dap-go.nix @@ -30,8 +38,8 @@ with dapHelpers; }; adapters = helpers.mkCompositeOption "Dap adapters." { - executables = mkAdapterOption "executable" executableAdapterOption; - servers = mkAdapterOption "server" serverAdapterOption; + executables = mkAdapterOption "executable" dapHelpers.executableAdapterOption; + servers = mkAdapterOption "server" dapHelpers.serverAdapterOption; }; configurations = @@ -85,7 +93,7 @@ with dapHelpers; } // cfg.extraOptions; in - mkIf cfg.enable { + lib.mkIf cfg.enable { extraPlugins = [ cfg.package ]; extraConfigLua =