From a9e4478903a00c279bd09bab76c224c476f3f2fa Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 6 Jul 2024 16:43:48 -0400 Subject: modules: better document options --- modules/nixos/traits/containers.nix | 11 ++++++++--- modules/nixos/traits/tailscale.nix | 5 +++-- modules/nixos/traits/users/seth.nix | 3 ++- modules/nixos/traits/zram.nix | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) (limited to 'modules/nixos/traits') diff --git a/modules/nixos/traits/containers.nix b/modules/nixos/traits/containers.nix index 1399dbf..407ee51 100644 --- a/modules/nixos/traits/containers.nix +++ b/modules/nixos/traits/containers.nix @@ -6,11 +6,16 @@ }: let cfg = config.traits.containers; - enableNvidia = lib.elem "nvidia" (config.services.xserver.videoDrivers or [ ]); in { options.traits.containers = { - enable = lib.mkEnableOption "containers support"; + enable = lib.mkEnableOption "support for containers"; + enableNvidia = lib.mkEnableOption "the use of nvidia-container-toolkit" // { + default = lib.elem "nvidia" config.services.xserver.videoDrivers; + defaultText = lib.literalExpression '' + lib.elem "nvidia" config.services.xserver.videoDrivers + ''; + }; }; config = lib.mkIf cfg.enable ( @@ -27,7 +32,7 @@ in }; } - (lib.mkIf enableNvidia { hardware.nvidia-container-toolkit.enable = true; }) + (lib.mkIf cfg.enableNvidia { hardware.nvidia-container-toolkit.enable = true; }) ] ); } diff --git a/modules/nixos/traits/tailscale.nix b/modules/nixos/traits/tailscale.nix index 73c74e3..bc70431 100644 --- a/modules/nixos/traits/tailscale.nix +++ b/modules/nixos/traits/tailscale.nix @@ -11,8 +11,9 @@ in options.traits.tailscale = { enable = lib.mkEnableOption "Tailscale"; ssh.enable = lib.mkEnableOption "Tailscale SSH"; - manageSecrets = lib.mkEnableOption "automatic secrets management" // { - default = config.traits.secrets.enable && cfg.ssh.enable; + manageSecrets = lib.mkEnableOption "automatic management of secrets" // { + default = config.traits.secrets.enable; + defaultText = lib.literalExpression "config.traits.secrets.enable"; }; }; diff --git a/modules/nixos/traits/users/seth.nix b/modules/nixos/traits/users/seth.nix index 4b84892..102dbad 100644 --- a/modules/nixos/traits/users/seth.nix +++ b/modules/nixos/traits/users/seth.nix @@ -9,8 +9,9 @@ let in { options.traits.users.seth = { - manageSecrets = lib.mkEnableOption "automatic secrets management" // { + manageSecrets = lib.mkEnableOption "automatic management of secrets" // { default = config.traits.secrets.enable; + defaultText = lib.literalExpression "config.traits.secrets.enable"; }; }; diff --git a/modules/nixos/traits/zram.nix b/modules/nixos/traits/zram.nix index d0c6a36..f5ba2a9 100644 --- a/modules/nixos/traits/zram.nix +++ b/modules/nixos/traits/zram.nix @@ -4,7 +4,7 @@ let in { options.traits.zram = { - enable = lib.mkEnableOption "zram setup & configuration"; + enable = lib.mkEnableOption "zram and sysctl optimizations"; }; config = lib.mkIf cfg.enable { -- cgit v1.2.3