diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 710578eb..6fc28a55 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -199,7 +199,6 @@
   Inspiration from `vim.languages.clang.dap` implementation.
 - Add [leetcode.nvim] plugin under `vim.utility.leetcode-nvim`.
 - Add [codecompanion.nvim] plugin under `vim.assistant.codecompanion-nvim`.
-- Fix [codecompanion-nvim] plugin: nvim-cmp error and setupOpts defaults.
 
 [nezia1](https://github.com/nezia1):
 
diff --git a/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix b/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
index 8e5ed4cc..9ebe30c0 100644
--- a/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
+++ b/modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
@@ -9,14 +9,7 @@ in {
 
       setupOpts = mkPluginSetupOption "codecompanion-nvim" {
         opts = {
-          send_code =
-            mkEnableOption ""
-            // {
-              default = true;
-              description = ''
-                Whether to enable code being sent to the LLM.
-              '';
-            };
+          send_code = mkEnableOption "code from being sent to the LLM.";
 
           log_level = mkOption {
             type = enum ["DEBUG" "INFO" "ERROR" "TRACE"];
@@ -37,10 +30,7 @@ in {
               mkEnableOption ""
               // {
                 default = true;
-                description = ''
-                  Whether to enable a diff view
-                  to see the changes made by the LLM.
-                '';
+                description = "a diff view to see the changes made by the LLM.";
               };
 
             close_chat_at = mkOption {
@@ -74,12 +64,7 @@ in {
           };
 
           chat = {
-            auto_scroll =
-              mkEnableOption ""
-              // {
-                default = true;
-                description = "Whether to enable automatic page scrolling.";
-              };
+            auto_scroll = mkEnableOption "automatic page scrolling.";
 
             show_settings = mkEnableOption ''
               LLM settings to appear at the top of the chat buffer.
@@ -100,18 +85,14 @@ in {
               mkEnableOption ""
               // {
                 default = true;
-                description = ''
-                  Whether to enable references in the chat buffer.
-                '';
+                description = "references in the chat buffer.";
               };
 
             show_token_count =
               mkEnableOption ""
               // {
                 default = true;
-                description = ''
-                  Whether to enable the token count for each response.
-                '';
+                description = "the token count for each response.";
               };
 
             intro_message = mkOption {
@@ -174,10 +155,7 @@ in {
                 mkEnableOption ""
                 // {
                   default = true;
-                  description = ''
-                    Whether to enable showing default
-                    actions in the action palette.
-                  '';
+                  description = "showing default actions in the action palette.";
                 };
 
               show_default_prompt_library =
@@ -185,8 +163,7 @@ in {
                 // {
                   default = true;
                   description = ''
-                    Whether to enable showing default
-                    prompt library in the action palette.
+                    showing default prompt library in the action palette.
                   '';
                 };
             };
diff --git a/modules/plugins/assistant/codecompanion/config.nix b/modules/plugins/assistant/codecompanion/config.nix
index 08fc8cb2..6b427d28 100644
--- a/modules/plugins/assistant/codecompanion/config.nix
+++ b/modules/plugins/assistant/codecompanion/config.nix
@@ -22,11 +22,6 @@ in {
       };
 
       treesitter.enable = true;
-
-      autocomplete.nvim-cmp = {
-        sources = {codecompanion-nvim = "[codecompanion]";};
-        sourcePlugins = ["codecompanion-nvim"];
-      };
     };
   };
 }