From e1425db70d27980293623675af0ca93431edec95 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Thu, 17 Dec 2020 13:03:57 -0800
Subject: [PATCH] Move programs.brew-bundle to homebrew

---
 .../{programs/brew-bundle.nix => homebrew.nix}   | 16 ++++++++--------
 modules/module-list.nix                          |  2 +-
 modules/system/activation-scripts.nix            |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename modules/{programs/brew-bundle.nix => homebrew.nix} (94%)

diff --git a/modules/programs/brew-bundle.nix b/modules/homebrew.nix
similarity index 94%
rename from modules/programs/brew-bundle.nix
rename to modules/homebrew.nix
index d5ba88e..2d142b0 100644
--- a/modules/programs/brew-bundle.nix
+++ b/modules/homebrew.nix
@@ -5,7 +5,7 @@
 with lib;
 
 let
-  cfg = config.programs.brew-bundle;
+  cfg = config.homebrew;
 
   brewfileSection = heading: type: entries:
     if entries != [] then
@@ -37,7 +37,7 @@ let
 in
 
 {
-  options.programs.brew-bundle = {
+  options.homebrew = {
     enable = mkEnableOption ''
       configuring your Brewfile, and installing/updating the formulas therein via
       the <command>brew bundle</command> command, using <command>nix-darwin</command>.
@@ -141,12 +141,12 @@ in
         Applications to install from Mac App Store using <command>mas</command>.
 
         When this option is used, <literal>"mas"</literal> is automatically added to
-        <option>programs.brew-bundle.brews</option>.
+        <option>homebrew.brews</option>.
 
         Note that you need to be signed into the Mac App Store for <command>mas</command> to
         successfully install and upgrade applications, and that unfortunately apps removed from this
         option will not be uninstalled automatically even if
-        <option>programs.brew-bundle.cleanup</option> is set to <literal>"uninstall"</literal>
+        <option>homebrew.cleanup</option> is set to <literal>"uninstall"</literal>
         or <literal>"zap"</literal> (this is currently a limitation of Homebrew Bundle).
 
         For more information on <command>mas</command> see: https://github.com/mas-cli/mas
@@ -161,7 +161,7 @@ in
         Docker images to install using <command>whalebrew</command>.
 
         When this option is used, <literal>"whalebrew"</literal> is automatically added to
-        <option>programs.brew-bundle.brews</option>.
+        <option>homebrew.brews</option>.
 
         For more information on <command>whalebrew</command> see:
         https://github.com/whalebrew/whalebrew
@@ -199,14 +199,14 @@ in
         message = ''
           Homebrew not installed.
 
-          Please install Homebrew yourself before using the programs.brew-bundle module.
+          Please install Homebrew yourself before using the <option>homebrew</option> module.
 
           See installation instructions at: https://brew.sh
         '';
       }
     ];
 
-    programs.brew-bundle.brews =
+    homebrew.brews =
       optional (cfg.masApps != {}) "mas" ++
       optional (cfg.whalebrews != []) "whalebrew";
 
@@ -215,7 +215,7 @@ in
       (if cfg.userConfig.noLock then { HOMEBREW_BUNDLE_NO_LOCK = "1"; } else {})
     );
 
-    system.activationScripts.brew-bundle.text = mkIf cfg.enable ''
+    system.activationScripts.homebrew.text = mkIf cfg.enable ''
       # Homebrew Bundle
       echo >&2 "Homebrew bundle..."
       PATH=/usr/local/bin:$PATH ${brew-bundle-command}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index bb7459e..447d075 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -59,7 +59,6 @@
   ./services/yabai
   ./services/nextdns
   ./programs/bash
-  ./programs/brew-bundle.nix
   ./programs/fish.nix
   ./programs/gnupg.nix
   ./programs/man.nix
@@ -69,6 +68,7 @@
   ./programs/tmux.nix
   ./programs/vim.nix
   ./programs/zsh
+  ./homebrew.nix
   ./users
   ./users/nixbld
 ]
diff --git a/modules/system/activation-scripts.nix b/modules/system/activation-scripts.nix
index a194bdf..346fb97 100644
--- a/modules/system/activation-scripts.nix
+++ b/modules/system/activation-scripts.nix
@@ -105,7 +105,7 @@ in
       ${cfg.activationScripts.extraUserActivation.text}
       ${cfg.activationScripts.userDefaults.text}
       ${cfg.activationScripts.userLaunchd.text}
-      ${cfg.activationScripts.brew-bundle.text}
+      ${cfg.activationScripts.homebrew.text}
 
       ${cfg.activationScripts.postUserActivation.text}