From e2a1cb50d8c1da9df3f98ae5f6459f4e1dd867d6 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 1 Jul 2023 00:06:56 +0100 Subject: [PATCH] treewide: fix `mkEnableOption` arguments `mkEnableOption` wraps its argument in a full sentence; its argument should not include the start of a sentence or the final full stop. --- modules/programs/himalaya.nix | 11 +++++------ modules/programs/sioyek.nix | 2 +- modules/programs/wezterm.nix | 4 ++-- modules/services/twmn.nix | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix index 673bd7de5..e075c3262 100644 --- a/modules/programs/himalaya.nix +++ b/modules/programs/himalaya.nix @@ -118,7 +118,7 @@ in { options = { programs.himalaya = { - enable = lib.mkEnableOption "Enable the Himalaya email client."; + enable = lib.mkEnableOption "the Himalaya email client"; package = lib.mkPackageOption pkgs "himalaya" { }; settings = lib.mkOption { type = lib.types.submodule { freeformType = tomlFormat.type; }; @@ -132,8 +132,7 @@ in { services = { himalaya-notify = { - enable = - lib.mkEnableOption "Enable the Himalaya new emails notifier service."; + enable = lib.mkEnableOption "the Himalaya new emails notifier service"; environment = lib.mkOption { type = with lib.types; attrsOf str; @@ -171,8 +170,8 @@ in { }; himalaya-watch = { - enable = lib.mkEnableOption - "Enable the Himalaya folder changes watcher service."; + enable = + lib.mkEnableOption "the Himalaya folder changes watcher service"; environment = lib.mkOption { type = with lib.types; attrsOf str; @@ -213,7 +212,7 @@ in { accounts.email.accounts = lib.mkOption { type = lib.types.attrsOf (lib.types.submodule { options.himalaya = { - enable = lib.mkEnableOption "Enable Himalaya for this email account."; + enable = lib.mkEnableOption "Himalaya for this email account"; # TODO: remove me for the next release backend = lib.mkOption { diff --git a/modules/programs/sioyek.nix b/modules/programs/sioyek.nix index 63bf5b6f1..4c3ee5277 100644 --- a/modules/programs/sioyek.nix +++ b/modules/programs/sioyek.nix @@ -15,7 +15,7 @@ in { options = { programs.sioyek = { enable = mkEnableOption - "Sioyek is a PDF viewer designed for reading research papers and technical books."; + "Sioyek, a PDF viewer designed for reading research papers and technical books"; package = mkOption { default = pkgs.sioyek; diff --git a/modules/programs/wezterm.nix b/modules/programs/wezterm.nix index 08f7dbfcc..e7da436f6 100644 --- a/modules/programs/wezterm.nix +++ b/modules/programs/wezterm.nix @@ -83,11 +83,11 @@ in { ''; }; - enableBashIntegration = mkEnableOption "WezTerm's Bash integration." // { + enableBashIntegration = mkEnableOption "WezTerm's Bash integration" // { default = true; }; - enableZshIntegration = mkEnableOption "WezTerm's Zsh integration." // { + enableZshIntegration = mkEnableOption "WezTerm's Zsh integration" // { default = true; }; }; diff --git a/modules/services/twmn.nix b/modules/services/twmn.nix index d4c126829..1fde0ed77 100644 --- a/modules/services/twmn.nix +++ b/modules/services/twmn.nix @@ -209,7 +209,7 @@ in { bounce = { enable = mkEnableOption - "notification bounce when displaying next notification directly."; + "notification bounce when displaying next notification directly"; duration = mkOption { type = types.ints.unsigned;