diff --git a/default.nix b/default.nix
index 5c32c13..015a3cb 100644
--- a/default.nix
+++ b/default.nix
@@ -1,32 +1,10 @@
 {
-  lib,
-  pkgs,
-  config,
   ...
 }:
 
-let
-  cfg = config.nixowos;
-in
 {
   imports = [
-    ./cli
-    ./graphical
-    ./system
+    ./defaults
+    ./nvidia.nix
   ];
-
-  options.nixowos = {
-    enable = lib.mkEnableOption "system and cli settings";
-  };
-
-  config = {
-    _module.args.owoLib = pkgs.callPackage ./lib { };
-
-    nixowos = lib.mkIf cfg.enable (
-      lib.mkDefault {
-        cli.enable = true;
-        system.enable = true;
-      }
-    );
-  };
 }
diff --git a/nvidia.nix b/nvidia.nix
index ac9f167..f35deef 100644
--- a/nvidia.nix
+++ b/nvidia.nix
@@ -6,10 +6,10 @@
 
 let
   name = "nvidia";
-  cfg = config.nixowos.graphical.${name};
+  cfg = config.nixowos.${name};
 in
 {
-  options.nixowos.graphical.${name} = {
+  options.nixowos.${name} = {
     enable = lib.mkEnableOption name;
   };