feat(modules): switch mkEnableOption to mkBoolOpt

InioX · Oct 14, 2023 · c8da653 · c8da653
1 parent 59fe910
commit c8da653
Show file tree

Hide file tree

Showing 21 changed files with 86 additions and 44 deletions.
diff --git a/modules/apps/firefox/default.nix b/modules/apps/firefox/default.nix
@@ -2,13 +2,15 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.apps.firefox;
 in {
   options.zenyte.apps.firefox = with types; {
-    enable = mkEnableOption "Whether to enable firefox.";
+    enable = mkBoolOpt false "Whether to enable firefox.";
     extensions = mkOption {
       type = nullOr (listOf package);
       description = ''

diff --git a/modules/apps/gmail/default.nix b/modules/apps/gmail/default.nix
@@ -2,10 +2,12 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   configFolder,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.apps.gmail;
 
   gmailIcon = let
@@ -31,7 +33,7 @@ with lib; let
   };
 in {
   options.zenyte.apps.gmail = {
-    enable = mkEnableOption "Whether to enable gmail as a desktop entry.";
+    enable = mkBoolOpt false "Whether to enable gmail as a desktop entry.";
   };
 
   config = mkIf cfg.enable {

diff --git a/modules/apps/prism-launcher/default.nix b/modules/apps/prism-launcher/default.nix
@@ -2,16 +2,18 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   inputs,
   system,
   configFolder,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.apps.prism-launcher;
 in {
   options.zenyte.apps.prism-launcher = with types; {
-    enable = mkEnableOption "Whether to enable Prism Launcher.";
+    enable = mkBoolOpt false "Whether to enable Prism Launcher.";
     extensions = mkOption {
       type = nullOr (listOf package);
       description = ''

diff --git a/modules/apps/vscodium/default.nix b/modules/apps/vscodium/default.nix
@@ -2,9 +2,11 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.apps.vscodium;
 
   # Modified code from https://github.com/nix-community/home-manager/issues/3507#issuecomment-1616803481
@@ -17,7 +19,7 @@ with lib; let
   '';
 in {
   options.zenyte.apps.vscodium = with types; {
-    enable = mkEnableOption "Whether to enable vscodium.";
+    enable = mkBoolOpt false "Whether to enable vscodium.";
     extensions = mkOption {
       type = nullOr (listOf package);
       description = ''
@@ -117,7 +119,7 @@ in {
               "    cfg = config.zenyte.$1.$2;"
               "  in {"
               "    options.zenyte.$1.$2 = {"
-              "      enable = mkEnableOption \"Whether to enable $2.\";"
+              "      enable = mkBoolOpt false  \"Whether to enable $2.\";"
               "    };"
               ""
               "    config = mkIf cfg.enable {"

diff --git a/modules/cli/bash/default.nix b/modules/cli/bash/default.nix
@@ -2,15 +2,17 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   inputs,
   username,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.cli.bash;
 in {
   options.zenyte.cli.bash = with types; {
-    enable = mkEnableOption "Whether to set bash as the default shell.";
+    enable = mkBoolOpt false "Whether to set bash as the default shell.";
   };
   config = mkIf cfg.enable {
     zenyte.home.programs.bash = {

diff --git a/modules/cli/git/default.nix b/modules/cli/git/default.nix
@@ -2,15 +2,17 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   inputs,
   username,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.cli.git;
 in {
   options.zenyte.cli.git = with types; {
-    enable = mkEnableOption "Whether to enable git.";
+    enable = mkBoolOpt false "Whether to enable git.";
     email = mkOption {
       type = str;
       default = "";

diff --git a/modules/cli/neofetch/default.nix b/modules/cli/neofetch/default.nix
@@ -2,15 +2,17 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   inputs,
   configFolder,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.cli.neofetch;
 in {
   options.zenyte.cli.neofetch = with types; {
-    enable = mkEnableOption "Whether to enable neofetch.";
+    enable = mkBoolOpt false "Whether to enable neofetch.";
   };
 
   config = mkIf cfg.enable {

diff --git a/modules/cli/starship/default.nix b/modules/cli/starship/default.nix
@@ -2,15 +2,17 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   inputs,
   configFolder,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.cli.starship;
 in {
   options.zenyte.cli.starship = with types; {
-    enable = mkEnableOption "Whether to enable starship.";
+    enable = mkBoolOpt false "Whether to enable starship.";
   };
 
   config = mkIf cfg.enable {

diff --git a/modules/cli/zsh/default.nix b/modules/cli/zsh/default.nix
@@ -2,15 +2,17 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   inputs,
   username,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.cli.zsh;
 in {
   options.zenyte.cli.zsh = with types; {
-    enable = mkEnableOption "Whether to set zsh as the default shell.";
+    enable = mkBoolOpt false "Whether to set zsh as the default shell.";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [

diff --git a/modules/desktop/addons/ags/default.nix b/modules/desktop/addons/ags/default.nix
@@ -2,16 +2,18 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   configFolder,
   system,
   inputs,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.desktop.addons.ags;
 in {
   options.zenyte.desktop.addons.ags = {
-    enable = mkEnableOption "Whether to enable ags.";
+    enable = mkBoolOpt false "Whether to enable ags.";
   };
 
   config = mkIf cfg.enable {

diff --git a/modules/desktop/addons/alacritty/default.nix b/modules/desktop/addons/alacritty/default.nix
@@ -2,14 +2,16 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   configFolder,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.desktop.addons.alacritty;
 in {
   options.zenyte.desktop.addons.alacritty = {
-    enable = mkEnableOption "Whether to enable alacritty.";
+    enable = mkBoolOpt false "Whether to enable alacritty.";
   };
 
   config = mkIf cfg.enable {

diff --git a/modules/desktop/addons/dunst/default.nix b/modules/desktop/addons/dunst/default.nix
@@ -2,14 +2,16 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   configFolder,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.desktop.addons.dunst;
 in {
   options.zenyte.desktop.addons.dunst = {
-    enable = mkEnableOption "Whether to enable the k-vernooy dunst fork.";
+    enable = mkBoolOpt false "Whether to enable the k-vernooy dunst fork.";
   };
 
   config = mkIf cfg.enable {

diff --git a/modules/desktop/addons/gtk/default.nix b/modules/desktop/addons/gtk/default.nix
@@ -2,10 +2,12 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   configFolder,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.desktop.addons.gtk;
 
   schema = pkgs.gsettings-desktop-schemas;
@@ -20,7 +22,7 @@ with lib; let
   '';
 in {
   options.zenyte.desktop.addons.gtk = {
-    enable = mkEnableOption "Whether to enable gtk theme.";
+    enable = mkBoolOpt false "Whether to enable gtk theme.";
   };
 
   config = mkIf cfg.enable {

diff --git a/modules/desktop/addons/kitty/default.nix b/modules/desktop/addons/kitty/default.nix
@@ -2,14 +2,16 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   configFolder,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.desktop.addons.kitty;
 in {
   options.zenyte.desktop.addons.kitty = {
-    enable = mkEnableOption "Whether to enable kitty.";
+    enable = mkBoolOpt false "Whether to enable kitty.";
   };
 
   config = mkIf cfg.enable {

diff --git a/modules/desktop/addons/matugen/default.nix b/modules/desktop/addons/matugen/default.nix
@@ -2,16 +2,18 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   configFolder,
   templateFolder,
   username,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.desktop.addons.matugen;
 in {
   options.zenyte.desktop.addons.matugen = {
-    enable = mkEnableOption "Whether to enable matugen.";
+    enable = mkBoolOpt false "Whether to enable matugen.";
   };
 
   config = mkIf cfg.enable {

diff --git a/modules/desktop/addons/rofi/default.nix b/modules/desktop/addons/rofi/default.nix
@@ -2,14 +2,16 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   configFolder,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.desktop.addons.rofi;
 in {
   options.zenyte.desktop.addons.rofi = {
-    enable = mkEnableOption "Whether to enable rofi.";
+    enable = mkBoolOpt false "Whether to enable rofi.";
   };
 
   config = mkIf cfg.enable {

diff --git a/modules/desktop/addons/sddm/default.nix b/modules/desktop/addons/sddm/default.nix
@@ -2,14 +2,16 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   configFolder,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.desktop.addons.sddm;
 in {
   options.zenyte.desktop.addons.sddm = {
-    enable = mkEnableOption "Whether to enable sddm.";
+    enable = mkBoolOpt false "Whether to enable sddm.";
   };
 
   config = mkIf cfg.enable {

diff --git a/modules/desktop/addons/waybar/default.nix b/modules/desktop/addons/waybar/default.nix
@@ -2,12 +2,14 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   inputs,
   nixpkgs,
   configFolder,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.desktop.addons.waybar;
   mediaplayer-waybar = pkgs.writeShellScriptBin "mediaplayer-waybar" ''
     while true; do
@@ -28,7 +30,7 @@ with lib; let
   '';
 in {
   options.zenyte.desktop.addons.waybar = {
-    enable = mkEnableOption "Whether to enable waybar with experimental patches.";
+    enable = mkBoolOpt false "Whether to enable waybar with experimental patches.";
   };
 
   config = mkIf cfg.enable {

diff --git a/modules/desktop/awesome/default.nix b/modules/desktop/awesome/default.nix
@@ -2,14 +2,16 @@
   config,
   pkgs,
   lib,
+  zenyte-lib,
   inputs,
   ...
 }:
-with lib; let
+with lib;
+with zenyte-lib; let
   cfg = config.zenyte.desktop.awesome;
 in {
   options.zenyte.desktop.awesome = {
-    enable = mkEnableOption "Whether to enable awesomewm.";
+    enable = mkBoolOpt false "Whether to enable awesomewm.";
   };
 
   config = mkIf cfg.enable {