diff --git a/flake.nix b/flake.nix index 1007bc9..f9c24d9 100644 --- a/flake.nix +++ b/flake.nix @@ -81,24 +81,6 @@ ./modules/apps.nix ./modules/host-users.nix nix-homebrew.darwinModules.nix-homebrew - { - nix-homebrew = { - enable = true; - enableRosetta = true; - user = username; - taps = { - "homebrew/homebrew-core" = homebrew-core; - "homebrew/homebrew-cask" = homebrew-cask; - }; - mutableTaps = false; - }; - } - ( - { config, ... }: - { - homebrew.taps = builtins.attrNames config.nix-homebrew.taps; - } - ) home-manager.darwinModules.home-manager { home-manager = { diff --git a/modules/apps.nix b/modules/apps.nix index 5cd1a34..459ba0c 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -1,4 +1,11 @@ -{ pkgs, ... }: +{ + pkgs, + config, + username, + homebrew-core, + homebrew-cask, + ... +}: { nixpkgs.config.allowUnfree = true; @@ -11,6 +18,17 @@ ]; environment.variables.EDITOR = "nvim"; + nix-homebrew = { + enable = true; + enableRosetta = true; + user = username; + taps = { + "homebrew/homebrew-core" = homebrew-core; + "homebrew/homebrew-cask" = homebrew-cask; + }; + mutableTaps = false; + }; + homebrew = { enable = true; @@ -26,7 +44,7 @@ Bitwarden = 1352778147; }; - taps = [ ]; + taps = builtins.attrNames config.nix-homebrew.taps; # WARNING only include those not in nixpkgs brews = [ ];