mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-05 08:17:01 +00:00
Code Activity

Move programs.brew-bundle to homebrew

Browse source
This commit is contained in:
Malo Bourgon 2020-12-17 13:03:57 -08:00
parent a2146feaf6
commit e1425db70d
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/programs/brew-bundle.nix → modules/homebrew.nix
View file

@ -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}

2
modules/module-list.nix
View file

@ -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
]

2
modules/system/activation-scripts.nix
View file

@ -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}