diff --git a/docs/manual/release-notes/rl-0.8.md b/docs/manual/release-notes/rl-0.8.md index fadb2e69..62f42638 100644 --- a/docs/manual/release-notes/rl-0.8.md +++ b/docs/manual/release-notes/rl-0.8.md @@ -621,9 +621,3 @@ [JudahZF](https://github.com/JudahZF): - Added gitFiles mapping option to telescope - -[Ring-A-Ding-Ding-Baby](https://github.com/Ring-A-Ding-Ding-Baby) - -- Aligned `codelldb` adapter setup with [rustaceanvim]’s built-in logic. -- Added `languages.rust.dap.backend` option to choose between `codelldb` and - `lldb-dap` adapters. diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix index 4dbbaa71..2cf6ee04 100644 --- a/modules/plugins/languages/astro.nix +++ b/modules/plugins/languages/astro.nix @@ -1,5 +1,5 @@ { - inputs, + self, config, pkgs, lib, @@ -43,7 +43,7 @@ defaultFormat = ["prettier"]; formats = let - parser = "${inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.prettier-plugin-astro}/index.js"; + parser = "${self.packages.${pkgs.stdenv.hostPlatform.system}.prettier-plugin-astro}/index.js"; in { prettier = { command = getExe pkgs.prettier; diff --git a/modules/plugins/languages/rust.nix b/modules/plugins/languages/rust.nix index 3c49d271..fea75305 100644 --- a/modules/plugins/languages/rust.nix +++ b/modules/plugins/languages/rust.nix @@ -87,19 +87,6 @@ in { type = package; default = pkgs.lldb; }; - - adapter = mkOption { - type = enum ["lldb-dap" "codelldb"]; - default = "codelldb"; - description = '' - Select which LLDB-based debug adapter to use: - - - "codelldb": use the CodeLLDB adapter from the vadimcn.vscode-lldb extension. - - "lldb-dap": use the LLDB DAP implementation shipped with LLVM (lldb-dap). - - The default "codelldb" backend generally provides a better debugging experience for Rust. - ''; - }; }; extensions = { @@ -204,20 +191,11 @@ in { ${optionalString cfg.dap.enable '' dap = { - adapter = ${ - if cfg.dap.adapter == "lldb-dap" - then '' - { - type = "executable", - command = "${cfg.dap.package}/bin/lldb-dap", - name = "rustacean_lldb", - }'' - else let - codelldb = pkgs.vscode-extensions.vadimcn.vscode-lldb.adapter; - codelldbPath = "${codelldb}/bin/codelldb"; - liblldbPath = "${codelldb}/share/lldb/lib/liblldb.so"; - in ''require("rustaceanvim.config").get_codelldb_adapter("${codelldbPath}", "${liblldbPath}")'' - }, + adapter = { + type = "executable", + command = "${cfg.dap.package}/bin/lldb-dap", + name = "rustacean_lldb", + }, }, ''} } diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix index a34d5212..bfe793a0 100644 --- a/modules/plugins/languages/svelte.nix +++ b/modules/plugins/languages/svelte.nix @@ -1,5 +1,5 @@ { - inputs, + self, config, pkgs, lib, @@ -56,7 +56,7 @@ defaultFormat = ["prettier"]; formats = let - prettierPlugin = inputs.self.packages.${pkgs.stdenv.system}.prettier-plugin-svelte; + prettierPlugin = self.packages.${pkgs.stdenv.system}.prettier-plugin-svelte; prettierPluginPath = "${prettierPlugin}/lib/node_modules/prettier-plugin-svelte/plugin.js"; in { prettier = {