From 61be6cf4053537b1d0cf709b3283143e1f1b4b65 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Mon, 5 May 2025 22:30:27 +0200
Subject: [PATCH 1/3] cmp: use normal priority for default values

After this change, user configs should be "appended" to default ones
instead of overriding them
---
 modules/plugins/completion/nvim-cmp/config.nix   | 5 +++++
 modules/plugins/completion/nvim-cmp/nvim-cmp.nix | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/plugins/completion/nvim-cmp/config.nix b/modules/plugins/completion/nvim-cmp/config.nix
index 749ebb7c..cf27caaf 100644
--- a/modules/plugins/completion/nvim-cmp/config.nix
+++ b/modules/plugins/completion/nvim-cmp/config.nix
@@ -60,6 +60,11 @@ in {
         enableSharedCmpSources = true;
 
         nvim-cmp = {
+          sources = {
+            nvim-cmp = null;
+            buffer = "[Buffer]";
+            path = "[Path]";
+          };
           sourcePlugins = ["cmp-buffer" "cmp-path"];
 
           setupOpts = {
diff --git a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
index 2c8c77d3..8105ed00 100644
--- a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
+++ b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
@@ -98,11 +98,15 @@ in {
 
     sources = mkOption {
       type = attrsOf (nullOr str);
-      default = {
+      defaultText = literalMD ''
+        These sources are included by default:
+
+        ```nix
         nvim-cmp = null;
         buffer = "[Buffer]";
         path = "[Path]";
-      };
+        ```
+      '';
       example = {
         nvim-cmp = null;
         buffer = "[Buffer]";

From 99f1200c8db9295e556255e49175a6d2a5c02fbd Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 6 May 2025 20:58:31 +0300
Subject: [PATCH 2/3] revert "Merge pull request #884 from
 horriblename/cmp-sources-normal-prio"

Reverts commit d3c7f7125c5302721d711d1dc4e025c63c5e09a4, reversing
changes made to f07468e13a994b04ec3b9cd41777429942cdc8b1.
---
 modules/plugins/completion/nvim-cmp/config.nix   | 5 -----
 modules/plugins/completion/nvim-cmp/nvim-cmp.nix | 8 ++------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/modules/plugins/completion/nvim-cmp/config.nix b/modules/plugins/completion/nvim-cmp/config.nix
index cf27caaf..749ebb7c 100644
--- a/modules/plugins/completion/nvim-cmp/config.nix
+++ b/modules/plugins/completion/nvim-cmp/config.nix
@@ -60,11 +60,6 @@ in {
         enableSharedCmpSources = true;
 
         nvim-cmp = {
-          sources = {
-            nvim-cmp = null;
-            buffer = "[Buffer]";
-            path = "[Path]";
-          };
           sourcePlugins = ["cmp-buffer" "cmp-path"];
 
           setupOpts = {
diff --git a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
index 8105ed00..2c8c77d3 100644
--- a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
+++ b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix
@@ -98,15 +98,11 @@ in {
 
     sources = mkOption {
       type = attrsOf (nullOr str);
-      defaultText = literalMD ''
-        These sources are included by default:
-
-        ```nix
+      default = {
         nvim-cmp = null;
         buffer = "[Buffer]";
         path = "[Path]";
-        ```
-      '';
+      };
       example = {
         nvim-cmp = null;
         buffer = "[Buffer]";

From edbfc120af31ab01eb92f32df6052c100ba4e218 Mon Sep 17 00:00:00 2001
From: tebro <git@tebro.simplelogin.com>
Date: Thu, 8 May 2025 20:59:27 +0300
Subject: [PATCH 3/3] Add .eslintrc.cjs as eslint config file option

---
 modules/plugins/languages/ts.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index 5a1e5889..b9971488 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -101,6 +101,7 @@
           "eslint.config.js"
           "eslint.config.mjs"
           ".eslintrc"
+          ".eslintrc.cjs"
           ".eslintrc.json"
           ".eslintrc.js"
           ".eslintrc.yml"