From 084846cc2ca2822baa027cec9e1917f9c9897bff Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sat, 21 Sep 2024 17:13:24 -0400
Subject: [PATCH] lib.neovimConfiguration: deprecated extraModules and
 configuration

---
 lib/configuration.nix | 18 ------------------
 lib/default.nix       |  2 +-
 modules/default.nix   | 24 ++++++++++++++++++++----
 3 files changed, 21 insertions(+), 23 deletions(-)
 delete mode 100644 lib/configuration.nix

diff --git a/lib/configuration.nix b/lib/configuration.nix
deleted file mode 100644
index 1f3c59ac..00000000
--- a/lib/configuration.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  inputs,
-  lib,
-}: let
-  modulesWithInputs = import ../modules inputs;
-in
-  {
-    modules ? [],
-    pkgs,
-    check ? true,
-    extraSpecialArgs ? {},
-    extraModules ? [],
-    ...
-  }:
-    modulesWithInputs {
-      inherit pkgs lib check extraSpecialArgs extraModules;
-      configuration.imports = modules;
-    }
diff --git a/lib/default.nix b/lib/default.nix
index 2e4b7f85..a418cff8 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -11,5 +11,5 @@
   languages = import ./languages.nix {inherit lib;};
   lists = import ./lists.nix {inherit lib;};
   lua = import ./lua.nix {inherit lib;};
-  neovimConfiguration = import ./configuration.nix {inherit inputs lib;};
+  neovimConfiguration = import ../modules {inherit inputs lib;};
 }
diff --git a/modules/default.nix b/modules/default.nix
index 1ae3b034..459c4477 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,10 +1,14 @@
-inputs: {
-  configuration,
-  pkgs,
+{
+  inputs,
   lib,
+}: {
+  pkgs,
   check ? true,
   extraSpecialArgs ? {},
+  modules ? [],
+  # deprecated
   extraModules ? [],
+  configuration ? {},
 }: let
   inherit (pkgs) vimPlugins;
   inherit (lib.strings) isString toString;
@@ -19,7 +23,19 @@ inputs: {
   # optionally with any additional modules passed by the user
   module = lib.evalModules {
     specialArgs = extraSpecialArgs // {modulesPath = toString ./.;};
-    modules = concatLists [[configuration] nvimModules extraModules];
+    modules = concatLists [
+      nvimModules
+      modules
+      (lib.optional (configuration != {}) (lib.warn ''
+          nvf: passing 'configuration' to lib.neovimConfiguration is deprecated.
+        ''
+        configuration))
+
+      (lib.optionals (extraModules != []) (lib.warn ''
+          nvf: passing 'extraModules' to lib.neovimConfiguration is deprecated, use 'modules' instead.
+        ''
+        extraModules))
+    ];
   };
 
   # alias to the internal configuration