diff --git a/hosts/michaels-mbp-mozilla/configuration.nix b/hosts/michaels-mbp-mozilla/configuration.nix index 8ba1efb..776c51a 100644 --- a/hosts/michaels-mbp-mozilla/configuration.nix +++ b/hosts/michaels-mbp-mozilla/configuration.nix @@ -40,6 +40,7 @@ home-manager.users.michael = import ./home.nix inputs; + environment.systemPackages = with pkgs; [ darwin.trash git-cinnabar diff --git a/hosts/michaels-mbp-mozilla/home.nix b/hosts/michaels-mbp-mozilla/home.nix index 708dc1d..b9503dc 100644 --- a/hosts/michaels-mbp-mozilla/home.nix +++ b/hosts/michaels-mbp-mozilla/home.nix @@ -50,7 +50,7 @@ in }; programs = { - firefox.enable = true; + firefox.package = null; home-manager.enable = true; diff --git a/hosts/michaels-mbp/home.nix b/hosts/michaels-mbp/home.nix index e7fc372..b59e783 100644 --- a/hosts/michaels-mbp/home.nix +++ b/hosts/michaels-mbp/home.nix @@ -44,6 +44,8 @@ in }; programs = { + firefox.package = pkgs.firefox-bin; + sesh.enable = true; thefuck.enable = true; diff --git a/modules/home-manager/Firefox.nix b/modules/home-manager/Firefox.nix index 5f556db..10bba6b 100644 --- a/modules/home-manager/Firefox.nix +++ b/modules/home-manager/Firefox.nix @@ -1,11 +1,10 @@ { BetterFox, ... }: -{ pkgs, ... }: -{ +_: { programs.firefox = { enable = true; # Let Firefox package be managed by the system - package = pkgs.firefox-bin; + package = null; profiles.michael = { settings = {