From 0ce82962bba78aecdb77403f3184478e20155126 Mon Sep 17 00:00:00 2001 From: Julia Lange Date: Tue, 26 Aug 2025 08:54:57 -0700 Subject: [PATCH] OSAuto, add extraPkgs option to OS --- nixosModules/automatic/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/nixosModules/automatic/default.nix b/nixosModules/automatic/default.nix index 7a680f6..2f80ace 100644 --- a/nixosModules/automatic/default.nix +++ b/nixosModules/automatic/default.nix @@ -1,12 +1,13 @@ { config, pkgs, lib, hostname, usernameList, ... }: { - options = { - system.timezone = lib.mkOption { default = "America/Los_Angeles"; }; - system.extraFonts = lib.mkOption { default = []; }; - system.isNonEFI = lib.mkEnableOption + options.system = { + timezone = lib.mkOption { default = "America/Los_Angeles"; }; + extraFonts = lib.mkOption { default = []; }; + extraPkgs = lib.mkOption { default = []; }; + isNonEFI = lib.mkEnableOption "Enable if you are running a non-EFI system"; - system.users.bigWheels = lib.mkOption { default = []; }; + users.bigWheels = lib.mkOption { default = []; }; }; config = lib.mkMerge [ @@ -33,7 +34,7 @@ git neovim xdg-user-dirs - ]; + ] ++ config.system.extraPkgs; # XDG Compliance nix.settings.use-xdg-base-directories = true;