refactor(config): auto-import config files

config/colorscheme.nix

@@ -1,5 +1,5 @@
-# Use catppuccin mocha variant
 {
+  colorschemes = {
     catppuccin = {
       enable = true;
 
@@ -10,4 +10,5 @@
         transparent_background = true;
       };
     };
+  };
 }

config/default.nix

@@ -0,0 +1,13 @@
+{ lib, ... }@args:
+
+let
+  definitions = lib.attrNames (
+    lib.filterAttrs
+      (filename: kind:
+        filename != "default.nix"
+        && (kind == "regular" || kind == "directory")
+      )
+      (builtins.readDir ./.)
+  );
+in
+lib.mkMerge (map (file: import ./${file}) definitions)

config/keymaps.nix

@@ -4,7 +4,8 @@ let
     options.desc = "Force write";
   };
 in
-[
+{
+  keymaps = [
     {
       key = "<leader>n";
       action = "<cmd>enew<cr>";
@@ -30,4 +31,5 @@ in
       action = "<cmd>split<cr>";
       options.desc = "Split horizontally";
     }
-]
+  ];
+}

config/options.nix

@@ -2,6 +2,7 @@
 # Use :options to get the list of all options
 # Use :h <option> to load help for given <option>
 {
+  opts = {
     # Hide command line unless needed
     cmdheight = 0;
 
@@ -100,4 +101,5 @@
 
     # Disable line wrapping
     wrap = false;
+  };
 }

default.nix

@@ -1,13 +1,12 @@
-{ pkgs, ... }:
+_:
 
 {
-  imports = [ ./plugins ];
+  imports = [
+    ./config
+    ./plugins
+  ];
 
   config = {
-    colorschemes = import ./config/colorscheme.nix;
-    keymaps = import ./config/keymaps.nix;
-    opts = import ./config/options.nix;
-
     # Needed for telescope live grep
     extraPackages = [ pkgs.ripgrep ];