From eec8d6b1b2eea3d492c3df6ce90ada1d4adf2ae8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 8 Feb 2024 14:14:25 +0100
Subject: [PATCH] misc: import nixvim modules in a simpler way

---
 flake-modules/modules.nix | 20 ++++++--------------
 modules/default.nix       | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 modules/default.nix

diff --git a/flake-modules/modules.nix b/flake-modules/modules.nix
index 873508f3..3602894f 100644
--- a/flake-modules/modules.nix
+++ b/flake-modules/modules.nix
@@ -1,12 +1,5 @@
 {modules, ...}: {
-  _module.args = let
-    nixvimModules = with builtins;
-      map
-      (f: ../modules + "/${f}")
-      (
-        attrNames (readDir ../modules)
-      );
-  in {
+  _module.args = {
     modules = pkgs: let
       nixpkgsMaintainersList = pkgs.path + "/nixos/modules/misc/meta.nix";
 
@@ -21,12 +14,11 @@
           };
         };
       };
-    in
-      nixvimModules
-      ++ [
-        nixpkgsMaintainersList
-        nixvimExtraArgsModule
-      ];
+    in [
+      ../modules
+      nixpkgsMaintainersList
+      nixvimExtraArgsModule
+    ];
   };
 
   perSystem = {
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 00000000..00ab30dd
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,18 @@
+{
+  imports = [
+    ./autocmd.nix
+    ./clipboard.nix
+    ./colorscheme.nix
+    ./commands.nix
+    ./doc.nix
+    ./editorconfig.nix
+    ./filetype.nix
+    ./highlights.nix
+    ./keymaps.nix
+    ./lua-loader.nix
+    ./options.nix
+    ./output.nix
+    ./plugins.nix
+    ./warnings.nix
+  ];
+}