diff --git a/config/colorscheme.nix b/config/colorscheme.nix
index c675a62..d9f35d1 100644
--- a/config/colorscheme.nix
+++ b/config/colorscheme.nix
@@ -1,13 +1,14 @@
-# Use catppuccin mocha variant
 {
-  catppuccin = {
-    enable = true;
+  colorschemes = {
+    catppuccin = {
+      enable = true;
 
-    settings = {
-      flavour = "mocha";
+      settings = {
+        flavour = "mocha";
 
-      # Needed to keep terminal transparency, if any
-      transparent_background = true;
+        # Needed to keep terminal transparency, if any
+        transparent_background = true;
+      };
     };
   };
 }
diff --git a/config/default.nix b/config/default.nix
new file mode 100644
index 0000000..88c0de5
--- /dev/null
+++ b/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)
diff --git a/config/keymaps.nix b/config/keymaps.nix
index e29e040..02c27a6 100644
--- a/config/keymaps.nix
+++ b/config/keymaps.nix
@@ -4,30 +4,32 @@ let
     options.desc = "Force write";
   };
 in
-[
-  {
-    key = "<leader>n";
-    action = "<cmd>enew<cr>";
-    options.desc = "New file";
-  }
-  {
-    inherit (forceWrite) action options;
-    key = "<c-s>";
-  }
-  {
-    inherit (forceWrite) options;
-    mode = [ "i" "x" ];
-    key = "<c-s>";
-    action = "<esc>${forceWrite.action}";
-  }
-  {
-    key = "|";
-    action = "<cmd>vsplit<cr>";
-    options.desc = "Split vertically";
-  }
-  {
-    key = "\\";
-    action = "<cmd>split<cr>";
-    options.desc = "Split horizontally";
-  }
-]
+{
+  keymaps = [
+    {
+      key = "<leader>n";
+      action = "<cmd>enew<cr>";
+      options.desc = "New file";
+    }
+    {
+      inherit (forceWrite) action options;
+      key = "<c-s>";
+    }
+    {
+      inherit (forceWrite) options;
+      mode = [ "i" "x" ];
+      key = "<c-s>";
+      action = "<esc>${forceWrite.action}";
+    }
+    {
+      key = "|";
+      action = "<cmd>vsplit<cr>";
+      options.desc = "Split vertically";
+    }
+    {
+      key = "\\";
+      action = "<cmd>split<cr>";
+      options.desc = "Split horizontally";
+    }
+  ];
+}
diff --git a/config/options.nix b/config/options.nix
index 8e3e4bc..988abe7 100644
--- a/config/options.nix
+++ b/config/options.nix
@@ -2,102 +2,104 @@
 # Use :options to get the list of all options
 # Use :h <option> to load help for given <option>
 {
-  # Hide command line unless needed
-  cmdheight = 0;
+  opts = {
+    # Hide command line unless needed
+    cmdheight = 0;
 
-  # Insert mode completion options
-  completeopt = [ "menu" "menuone" "noselect" ];
+    # Insert mode completion options
+    completeopt = [ "menu" "menuone" "noselect" ];
 
-  # Copy previous indentation on autoindenting
-  copyindent = true;
+    # Copy previous indentation on autoindenting
+    copyindent = true;
 
-  # Highlight current line
-  cursorline = true;
+    # Highlight current line
+    cursorline = true;
 
-  # Expand <Tab> to spaces
-  expandtab = true;
+    # Expand <Tab> to spaces
+    expandtab = true;
 
-  # Enable fold with all code unfolded
-  foldcolumn = "1";
-  foldenable = true;
-  foldlevel = 99;
-  foldlevelstart = 99;
+    # Enable fold with all code unfolded
+    foldcolumn = "1";
+    foldenable = true;
+    foldlevel = 99;
+    foldlevelstart = 99;
 
-  # Ignore case in search patterns
-  ignorecase = true;
+    # Ignore case in search patterns
+    ignorecase = true;
 
-  # Show substitution preview in split window
-  inccommand = "split";
+    # Show substitution preview in split window
+    inccommand = "split";
 
-  # Infer casing on word completion
-  infercase = true;
+    # Infer casing on word completion
+    infercase = true;
 
-  # Enable list mode
-  list = true;
+    # Enable list mode
+    list = true;
 
-  # Set custom strings for list mode
-  # - tabulations are shown as ‒▶
-  # - trailing spaces are shown as ·
-  # - multiple non-leading consecutive spaces are shown as bullets (·)
-  # - non-breakable spaces are shown as ⎕
-  listchars = "tab:‒▶,trail:·,multispace:·,lead: ,nbsp:⎕";
+    # Set custom strings for list mode
+    # - tabulations are shown as ‒▶
+    # - trailing spaces are shown as ·
+    # - multiple non-leading consecutive spaces are shown as bullets (·)
+    # - non-breakable spaces are shown as ⎕
+    listchars = "tab:‒▶,trail:·,multispace:·,lead: ,nbsp:⎕";
 
-  # Show line numbers
-  number = true;
+    # Show line numbers
+    number = true;
 
-  # Preserve indentation as much as possible
-  preserveindent = true;
+    # Preserve indentation as much as possible
+    preserveindent = true;
 
-  # Height of the popup menu
-  pumheight = 10;
+    # Height of the popup menu
+    pumheight = 10;
 
-  # Display line numbers relative to current line
-  relativenumber = true;
+    # Display line numbers relative to current line
+    relativenumber = true;
 
-  # Minimal number of lines to keep around the cursor
-  # This has the effect to move the view along with current line
-  #scrolloff = 999;
+    # Minimal number of lines to keep around the cursor
+    # This has the effect to move the view along with current line
+    #scrolloff = 999;
 
-  # Number of spaces to use for indentation
-  shiftwidth = 2;
+    # Number of spaces to use for indentation
+    shiftwidth = 2;
 
-  # Always show tabline (TODO: use with heirline?)
-  #showtabline = 2;
+    # Always show tabline (TODO: use with heirline?)
+    #showtabline = 2;
 
-  # Show signs instead of number in gutter
-  signcolumn = "number";
+    # Show signs instead of number in gutter
+    signcolumn = "number";
 
-  # Override ignorecase if search pattern contains uppercase characters
-  smartcase = true;
+    # Override ignorecase if search pattern contains uppercase characters
+    smartcase = true;
 
-  # Number of spaces input on <Tab>
-  softtabstop = 2;
+    # Number of spaces input on <Tab>
+    softtabstop = 2;
 
-  # Open horizontal split below (:split)
-  splitbelow = true;
+    # Open horizontal split below (:split)
+    splitbelow = true;
 
-  # Open vertical split to the right (:vsplit)
-  splitright = true;
+    # Open vertical split to the right (:vsplit)
+    splitright = true;
 
-  # Number of spaces to represent a <Tab>
-  tabstop = 2;
+    # Number of spaces to represent a <Tab>
+    tabstop = 2;
 
-  # Enables 24-bit RGB color
-  termguicolors = true;
+    # Enables 24-bit RGB color
+    termguicolors = true;
 
-  # Shorter timeout duration
-  timeoutlen = 500;
+    # Shorter timeout duration
+    timeoutlen = 500;
 
-  # Set window title to the filename
-  title = true;
+    # Set window title to the filename
+    title = true;
 
-  # Save undo history to undo file (in $XDG_STATE_HOME/nvim/undo)
-  undofile = true;
+    # Save undo history to undo file (in $XDG_STATE_HOME/nvim/undo)
+    undofile = true;
 
-  # Enable virtual edit in visual block mode
-  # This has the effect of selecting empty cells beyond lines boundaries
-  virtualedit = "block";
+    # Enable virtual edit in visual block mode
+    # This has the effect of selecting empty cells beyond lines boundaries
+    virtualedit = "block";
 
-  # Disable line wrapping
-  wrap = false;
+    # Disable line wrapping
+    wrap = false;
+  };
 }
diff --git a/default.nix b/default.nix
index e19c7b8..2438569 100644
--- a/default.nix
+++ b/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 ];