diff --git a/home/david/modules/wallpaper/default.nix b/home/david/modules/wallpaper/default.nix index 2abc878..10cd699 100644 --- a/home/david/modules/wallpaper/default.nix +++ b/home/david/modules/wallpaper/default.nix @@ -10,11 +10,7 @@ in { options = { david.wallpaper = { - enable = lib.mkOption { - type = lib.types.bool; - default = true; - example = false; - }; + enable = lib.mkEnableOption "wallpaper"; }; }; config = lib.mkIf cfg.enable { diff --git a/home/modules/foot/default.nix b/home/modules/foot/default.nix index ec0490c..f4920af 100644 --- a/home/modules/foot/default.nix +++ b/home/modules/foot/default.nix @@ -5,14 +5,7 @@ in { options = { youthlic.programs.foot = { - enable = lib.mkOption { - type = lib.types.bool; - default = true; - example = false; - description = '' - whether use foot terminal - ''; - }; + enable = lib.mkEnableOption "foot"; }; }; config = lib.mkIf cfg.enable { diff --git a/home/modules/ghostty.nix b/home/modules/ghostty.nix index b243c10..4bf535d 100644 --- a/home/modules/ghostty.nix +++ b/home/modules/ghostty.nix @@ -7,14 +7,7 @@ { options = { youthlic.programs.ghostty = { - enable = lib.mkOption { - type = lib.types.bool; - example = false; - default = true; - description = '' - whether enable ghostty - ''; - }; + enable = lib.mkEnableOption "ghostty"; }; }; config = diff --git a/home/modules/gpg/default.nix b/home/modules/gpg/default.nix index 34642d5..f5a0448 100644 --- a/home/modules/gpg/default.nix +++ b/home/modules/gpg/default.nix @@ -8,14 +8,7 @@ { options = { youthlic.programs.gpg = { - enable = lib.mkOption { - type = lib.types.bool; - default = true; - example = false; - description = '' - whether enable gpg - ''; - }; + enable = lib.mkEnableOption "gpg"; }; }; config = diff --git a/home/modules/helix/default.nix b/home/modules/helix/default.nix index 79fb106..267407c 100644 --- a/home/modules/helix/default.nix +++ b/home/modules/helix/default.nix @@ -7,14 +7,7 @@ { options = { youthlic.programs.helix = { - enable = lib.mkOption { - type = lib.types.bool; - default = true; - example = false; - description = '' - enable helix editor - ''; - }; + enable = lib.mkEnableOption "helix"; extraPackages = lib.mkOption { type = lib.types.listOf lib.types.package; default = [ ]; diff --git a/home/modules/shell/default.nix b/home/modules/shell/default.nix index 85e5a7e..daa448e 100644 --- a/home/modules/shell/default.nix +++ b/home/modules/shell/default.nix @@ -1,7 +1,6 @@ { config, lib, ... }: let - inherit (lib) mkOption mkIf mkMerge; - inherit (lib.types) bool; + inherit (lib) mkEnableOption mkIf mkMerge; fish-cfg = config.youthlic.programs.fish; bash-cfg = config.youthlic.programs.bash; cfg-helper = @@ -20,24 +19,10 @@ in options = { youthlic.programs = { fish = { - enable = mkOption { - type = bool; - default = true; - description = '' - whether to use fish shell - ''; - example = false; - }; + enable =mkEnableOption "fish"; }; bash = { - enable = mkOption { - type = bool; - default = true; - description = '' - whether to use bash shell - ''; - example = false; - }; + enable = mkEnableOption "bash"; }; }; }; diff --git a/home/modules/starship/default.nix b/home/modules/starship/default.nix index cf8691e..4cd547d 100644 --- a/home/modules/starship/default.nix +++ b/home/modules/starship/default.nix @@ -5,14 +5,7 @@ in { options = { youthlic.programs.starship = { - enable = lib.mkOption { - type = lib.types.bool; - default = true; - example = false; - description = '' - whether enable starship - ''; - }; + enable = lib.mkEnableOption "starship"; }; }; config = lib.mkIf cfg.enable {