From 12913d209dc1fdd2eef5ee8f72bf22099a37008e Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 21 May 2024 03:08:47 -0400 Subject: [PATCH 1/2] fix: set nixos release in mkOptionDoc --- dev/option-doc.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dev/option-doc.nix b/dev/option-doc.nix index 82e0530a..96edc0ab 100644 --- a/dev/option-doc.nix +++ b/dev/option-doc.nix @@ -7,11 +7,21 @@ }: let eval = lib.evalModules { - modules = modules ++ [{ _module.check = false; }]; + modules = modules ++ [{ + options.system.nixos.release = lib.mkOption { + type = lib.types.str; + default = lib.trivial.release; + readOnly = true; + }; + + config = { + _module.check = false; + }; + }]; }; doc = nixosOptionsDoc { - options = lib.filterAttrs (n: _: n != "_module") eval.options; + options = lib.filterAttrs (n: lib.const (!(lib.elem n [ "_module" "system" ]))) eval.options; documentType = "none"; revision = version; }; From e71210bc45210f0a5403802b0baf0d9a6ff07649 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 21 May 2024 03:10:38 -0400 Subject: [PATCH 2/2] fix(modules): shorten defaultText for `catppuccin.sources` --- modules/home-manager/globals.nix | 1 + modules/nixos/globals.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/home-manager/globals.nix b/modules/home-manager/globals.nix index 1c9b1f8e..0b627fb1 100644 --- a/modules/home-manager/globals.nix +++ b/modules/home-manager/globals.nix @@ -17,6 +17,7 @@ sources = lib.mkOption { type = lib.types.lazyAttrsOf lib.types.raw; default = defaultSources; + defaultText = "{ ... }"; # HACK! # without this, overriding one source will delete all others. -@getchoo apply = lib.recursiveUpdate defaultSources; diff --git a/modules/nixos/globals.nix b/modules/nixos/globals.nix index 1c9b1f8e..0b627fb1 100644 --- a/modules/nixos/globals.nix +++ b/modules/nixos/globals.nix @@ -17,6 +17,7 @@ sources = lib.mkOption { type = lib.types.lazyAttrsOf lib.types.raw; default = defaultSources; + defaultText = "{ ... }"; # HACK! # without this, overriding one source will delete all others. -@getchoo apply = lib.recursiveUpdate defaultSources;