diff --git a/catppuccin.nix b/catppuccin.nix
index 0e4aa39..51352b6 100644
--- a/catppuccin.nix
+++ b/catppuccin.nix
@@ -49,10 +49,9 @@ in
         };
       }
     ];
-  };
-
-  nixvimModules.default.colorschemes.catppuccin = {
-    enable = true;
-    settings.flavour = flavor;
+    nixvimModules.default.colorschemes.catppuccin = {
+      enable = true;
+      settings.flavour = flavor;
+    };
   };
 }
diff --git a/nixvim/default.nix b/nixvim/default.nix
index b35ef6f..b325489 100644
--- a/nixvim/default.nix
+++ b/nixvim/default.nix
@@ -1,19 +1,15 @@
 {
   lib,
   self,
-  config,
   ...
 }:
 {
-  options.nixvimModules = lib.mkOption {
+  options.flake.nixvimModules = lib.mkOption {
     type = lib.types.attrsOf lib.types.anything;
   };
-  config.flake = {
-    inherit (config) nixvimModules;
-  };
 
   config = {
-    nixvimModules.default = {
+    flake.nixvimModules.default = {
       imports = [
         ./autoread.nix
         ./clipboard.nix