darwin/desktop: streamline

3 files changed, 7 insertions, 9 deletions

diff --git a/modules/darwin/desktop/fonts.nix b/modules/darwin/desktop/fonts.nix
index a26f774..790f4ba 100644
--- a/modules/darwin/desktop/fonts.nix
+++ b/modules/darwin/desktop/fonts.nix
@@ -6,16 +6,15 @@
 }:
 let
   cfg = config.desktop.fonts;
-  enable = config.desktop.enable && cfg.enable;
 in
 {
   options.desktop.fonts = {
     enable = lib.mkEnableOption "desktop fonts" // {
-      default = true;
+      default = config.desktop.enable;
     };
   };
 
-  config = lib.mkIf enable {
+  config = lib.mkIf cfg.enable {
     fonts.packages = [ (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
   };
 }
diff --git a/modules/darwin/desktop/homebrew.nix b/modules/darwin/desktop/homebrew.nix
index 2371f57..93fe4ad 100644
--- a/modules/darwin/desktop/homebrew.nix
+++ b/modules/darwin/desktop/homebrew.nix
@@ -1,16 +1,15 @@
 { config, lib, ... }:
 let
   cfg = config.desktop.homebrew;
-  enable = config.desktop.enable && cfg.enable;
 in
 {
   options.desktop.homebrew = {
     enable = lib.mkEnableOption "Homebrew integration" // {
-      default = true;
+      default = config.desktop.enable;
     };
   };
 
-  config = lib.mkIf enable {
+  config = lib.mkIf cfg.enable {
     homebrew = {
       enable = true;
 
diff --git a/modules/darwin/desktop/programs.nix b/modules/darwin/desktop/programs.nix
index 75a86e3..fd635da 100644
--- a/modules/darwin/desktop/programs.nix
+++ b/modules/darwin/desktop/programs.nix
@@ -1,20 +1,20 @@
 { config, lib, ... }:
 let
   cfg = config.desktop.defaultPrograms;
-  enable = config.desktop.enable && cfg.enable;
 in
 {
   options.desktop.defaultPrograms = {
     enable = lib.mkEnableOption "default desktop programs" // {
-      default = true;
+      default = config.desktop.enable;
     };
   };
 
-  config = lib.mkIf enable {
+  config = lib.mkIf cfg.enable {
     homebrew.casks = [
       "chromium"
       "iterm2"
     ];
+
     programs.gnupg.agent.enable = lib.mkDefault true;
   };
 }