diff --git a/common/default.nix b/common/default.nix index 8760f5d..7e37bf9 100644 --- a/common/default.nix +++ b/common/default.nix @@ -64,6 +64,7 @@ else vacu.shortHostName = mkOption { type = types.nullOr types.str; default = config.vacu.hostName; + defaultText = "{option}`vacu.hostName`"; }; vacu.vnopnCA = mkOption { readOnly = true; diff --git a/common/remapCapsLock.nix b/common/remapCapsLock.nix index fcb0f11..a843fcc 100644 --- a/common/remapCapsLock.nix +++ b/common/remapCapsLock.nix @@ -12,6 +12,7 @@ lib.optionalAttrs (vacuModuleType == "nixos") { options.vacu.enableCapsLockRemap = mkOption { type = types.bool; default = config.vacu.isGui; + defaultText = "{option}`vacu.isGui`"; }; config = lib.mkIf config.vacu.enableCapsLockRemap { # https://discourse.nixos.org/t/best-way-to-remap-caps-lock-to-esc-with-wayland/39707/6 diff --git a/common/units-impl.nix b/common/units-impl.nix index e747a44..34c4426 100644 --- a/common/units-impl.nix +++ b/common/units-impl.nix @@ -49,6 +49,7 @@ in originalPackage = mkOption { type = types.package; default = pkgs.units.override { enableCurrenciesUpdater = false; }; + defaultText = "pkgs.units.override { ... }"; }; finalPackage = mkOption { type = types.package; diff --git a/common/verify-system/default.nix b/common/verify-system/default.nix index edc4d3a..c921edf 100644 --- a/common/verify-system/default.nix +++ b/common/verify-system/default.nix @@ -29,6 +29,7 @@ in script = mkOption { type = types.lines; default = "## system ident check ${config.name}"; + defaultText = lib.literalText ''## system ident check ${name}''; }; }; } @@ -56,6 +57,7 @@ in mkOption { readOnly = true; default = scriptFile; + defaultText = "vacu-verify-system-all.sh package"; }; }; } diff --git a/fw/sops.nix b/fw/sops.nix index 8a7f2da..dd0bd80 100644 --- a/fw/sops.nix +++ b/fw/sops.nix @@ -10,6 +10,7 @@ options.vacu.secretsFolder = lib.mkOption { type = lib.types.path; default = ../secrets; + defaultText = "/secrets"; }; config = { diff --git a/liam/backup.nix b/liam/backup.nix index 58f47d7..872f48f 100644 --- a/liam/backup.nix +++ b/liam/backup.nix @@ -53,10 +53,22 @@ in options.vacu.liam.backup = { user = mkOption { default = "autoborger"; }; rsyncUser = mkOption { default = "fm2382"; }; - rsyncHost = mkOption { default = "${cfg.rsyncUser}.rsync.net"; }; - repo = mkOption { default = "${cfg.rsyncUser}@${cfg.rsyncHost}:borg-repos/liam-backup"; }; - package = mkOption { default = pkgs.borgbackup; }; - cmd = mkOption { default = lib.getExe cfg.package; }; + rsyncHost = mkOption { + default = "${cfg.rsyncUser}.rsync.net"; + defaultText = "(output)"; + }; + repo = mkOption { + default = "${cfg.rsyncUser}@${cfg.rsyncHost}:borg-repos/liam-backup"; + defaultText = "(output)"; + }; + package = mkOption { + default = pkgs.borgbackup; + defaultText = "pkgs.borgbackup"; + }; + cmd = mkOption { + default = lib.getExe cfg.package; + defaultText = "lib.getExe cfg.package"; + }; paths = mkOption { default = [ "/var/lib/mail" @@ -64,7 +76,10 @@ in "/var/log" ]; }; - keyPath = mkOption { default = config.sops.secrets.liam-borg-key.path; }; + keyPath = mkOption { + default = config.sops.secrets.liam-borg-key.path; + defaultText = "TODO"; + }; }; config = { vacu.assertions = lib.singleton { diff --git a/liam/sieve.nix b/liam/sieve.nix index 46a9a8a..0e2fbdd 100644 --- a/liam/sieve.nix +++ b/liam/sieve.nix @@ -926,10 +926,12 @@ in "/dev/null" ]} ''; + defaultText = "check-liam-sieve package"; }; options.vacu.liam-sieve-script = lib.mkOption { readOnly = true; default = pkgs.writeText "mainsieve" sieve_text; + defaultText = "mainsieve text package"; }; config = { vacu.packages = [ pigeonhole_pkg ]; diff --git a/liam/sops.nix b/liam/sops.nix index 9bde107..275c222 100644 --- a/liam/sops.nix +++ b/liam/sops.nix @@ -10,6 +10,7 @@ options.vacu.secretsFolder = lib.mkOption { type = lib.types.path; default = ../secrets; + defaultText = "/secrets"; }; config.sops = { diff --git a/modules/git/module.nix b/modules/git/module.nix index 47cecbb..a0aa72e 100644 --- a/modules/git/module.nix +++ b/modules/git/module.nix @@ -69,6 +69,7 @@ in readOnly = true; type = types.str; default = lib.concatMapStringsSep "\n" lib.generators.toGitINI cfg.config; + defaultText = "(output config)"; }; }; diff --git a/modules/hath/module.nix b/modules/hath/module.nix index 6dc50e2..d1f245c 100644 --- a/modules/hath/module.nix +++ b/modules/hath/module.nix @@ -48,6 +48,7 @@ in package = mkOption { type = types.package; default = pkgs.hentai-at-home; + defaultText = "´pkgs.hentai-at-home`"; }; user = mkOption { type = types.passwdEntry types.str; @@ -65,7 +66,8 @@ in }; allowPrivilegedPort = mkOption { type = types.bool; - default = if cfg.port == null then true else cfg.port < 1024; + default = cfg.port == null || cfg.port < 1024; + defaultText = "`cfg.port == null || cfg.port < 1024`"; }; credentials = mkOption { type = types.nullOr credentialsType; diff --git a/modules/knownHosts/module.nix b/modules/knownHosts/module.nix index d4f56ce..0565edd 100644 --- a/modules/knownHosts/module.nix +++ b/modules/knownHosts/module.nix @@ -70,6 +70,7 @@ in type = types.str; readOnly = true; default = etcHostsText; + defaultText = "(output)"; }; }; config = diff --git a/modules/tf2/module.nix b/modules/tf2/module.nix index e600daf..b09f218 100644 --- a/modules/tf2/module.nix +++ b/modules/tf2/module.nix @@ -427,6 +427,7 @@ in options.tf2 = { tf2Pkgs = mkOption { default = tf2Pkgs; + defaultText = "`inputs.tf2-nix.lib.mkTf2Pkgs { ... }`"; readOnly = true; }; binds = @@ -461,20 +462,20 @@ in ); build.autoexec = mkOption { type = types.pkg; - default = pkgs.writeFile "autoexec.cfg" cfg.autoexecLines; readOnly = true; }; build.classes = mkAttrsOfClasses ( classname: mkOption { type = types.pkg; - default = pkgs.writeText "${classname}.cfg" cfg.classLines.${classname}; reaonly = true; } ); }; config.tf2 = { + build.autoexec = pkgs.writeFile "autoexec.cfg" cfg.autoexecLines; + build.classes = mkAttrsOfClasses (classname: pkgs.writeText "${classname}.cfg" cfg.classLines.${classname}); autoexecLines = lib.mkMerge ( [ '' diff --git a/nixos-modules/genieacs.nix b/nixos-modules/genieacs.nix index 70c2d32..2d6d451 100644 --- a/nixos-modules/genieacs.nix +++ b/nixos-modules/genieacs.nix @@ -6,7 +6,6 @@ }: let inherit (lib) - mkEnableOption mkOption types flip @@ -84,6 +83,7 @@ let internal = true; readOnly = true; default = environmentVars // config.extraEnv; + defaultText = "internal"; }; }; }; diff --git a/prophecy/sops.nix b/prophecy/sops.nix index e446f58..7a35fec 100644 --- a/prophecy/sops.nix +++ b/prophecy/sops.nix @@ -10,6 +10,7 @@ options.vacu.secretsFolder = lib.mkOption { type = lib.types.path; default = ../secrets; + defaultText = "/secrets"; }; config.sops = { diff --git a/triple-dezert/sops.nix b/triple-dezert/sops.nix index bb3e7bd..4901a13 100644 --- a/triple-dezert/sops.nix +++ b/triple-dezert/sops.nix @@ -10,6 +10,7 @@ options.vacu.secretsFolder = lib.mkOption { type = lib.types.path; default = ../secrets; + defaultText = "/secrets"; }; config = {