edit the config structure to use modules rather than sets

config/colorscheme.nix

@@ -1,5 +1,24 @@
-{
+{lib, ...}:{
+  # TODO: Make colorscheme configurable
+  colorscheme = lib.mkOverride 500 "everforest";
+
   colorschemes = {
+    kanagawa.enable = true;
+    nord.enable = true;
+    tokyonight = {
+      enable = true;
+      settings = {
+        style = "storm";
+        light_style = "day";
+        transparent = false;
+      };
+    };
+    everforest = {
+      enable = true;
+      settings = {
+        enable_italic = 1;
+      };
+    };
     catppuccin = {
       enable = true;
 
@@ -8,6 +27,13 @@
 
         # Needed to keep terminal transparency, if any
         transparent_background = false;
+
+        styles = {
+          keywords = [ "italic" ];
+          conditionals = [ "italic" ];
+          functions = [ "italic" ];
+          loops = [ "italic" ];
+        };
       };
     };
   };

config/default.nix

@@ -9,5 +9,6 @@ let
       )
       (builtins.readDir ./.)
   );
-in
-lib.mkMerge (map (file: import ./${file}) definitions)
+in {
+  imports = map (file: import ./${file}) definitions;
+}

config/keymaps/default.nix

@@ -1,4 +1,4 @@
-{
+_: {
   keymaps =
     (import ./buffers.nix)
     ++ (import ./diagnostics.nix)

config/options.nix

@@ -1,7 +1,7 @@
 # Neovim options
 # Use :options to get the list of all options
 # Use :h <option> to load help for given <option>
-{
+_:{
   opts = {
     # Don't stop backspace at insert
     backspace.__raw = ''