diff --git a/lib/deprecation.nix b/lib/deprecation.nix
index 9a36822b..c1677003 100644
--- a/lib/deprecation.nix
+++ b/lib/deprecation.nix
@@ -129,7 +129,10 @@ rec {
       packageName,
       oldPackageName ? packageName,
     }:
-    lib.mkRemovedOptionModule [ "plugins" plugin "${oldPackageName}Package" ] ''
+    let
+      optionPath = [ "plugins" ] ++ (lib.toList plugin) ++ [ "${oldPackageName}Package" ];
+    in
+    lib.mkRemovedOptionModule optionPath ''
       Please use the `dependencies.${packageName}` top-level option instead:
       - `dependencies.${packageName}.enable = false` to disable installing `${packageName}`
       - `dependencies.${packageName}.package` to choose which package to install for `${packageName}`.
diff --git a/modules/dependencies.nix b/modules/dependencies.nix
index 5cf1a48f..31798981 100644
--- a/modules/dependencies.nix
+++ b/modules/dependencies.nix
@@ -15,6 +15,7 @@ let
       default = "git";
       example = [ "gitMinimal" ];
     };
+    go.default = "go";
     nodejs = {
       default = "nodejs";
       example = "pkgs.nodejs_22";
diff --git a/plugins/lsp/language-servers/default.nix b/plugins/lsp/language-servers/default.nix
index bbc3a2e5..97aae537 100644
--- a/plugins/lsp/language-servers/default.nix
+++ b/plugins/lsp/language-servers/default.nix
@@ -14,13 +14,19 @@ let
       settings = cfg: { dart = cfg; };
     };
     gopls = {
-      extraOptions = {
-        goPackage = lib.mkPackageOption pkgs "go" {
-          nullable = true;
-        };
-      };
-      extraConfig = cfg: {
-        extraPackages = [ cfg.goPackage ];
+      imports = [
+        # TODO: added 2025-04-07, remove after 25.05
+        (lib.nixvim.mkRemovedPackageOptionModule {
+          plugin = [
+            "lsp"
+            "servers"
+            "gopls"
+          ];
+          packageName = "go";
+        })
+      ];
+      extraConfig = {
+        dependencies.go.enable = lib.mkDefault true;
       };
     };
     idris2_lsp = {