From 986a9c55510514aa5f41dc35c9a297d653635480 Mon Sep 17 00:00:00 2001 From: Elec3137 Date: Mon, 23 Mar 2026 21:04:37 -0700 Subject: [PATCH] toplevel: cleanup --- default.nix | 26 ++------------------------ nvidia.nix | 4 ++-- 2 files changed, 4 insertions(+), 26 deletions(-) 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; };