From 97ed5eb33b72902e94a5548cf866e9e24a627697 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Wed, 23 Nov 2022 15:46:30 -0700
Subject: [PATCH] switch from homebrew to firefox overlay for macos

---
 flake.lock                       | 41 +++++++++++++++++++++++++++++---
 flake.nix                        |  3 +++
 hosts/macbook/default.nix        |  3 ++-
 modules/applications/firefox.nix |  1 +
 modules/darwin/homebrew.nix      |  1 -
 modules/darwin/system.nix        |  2 +-
 6 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5a442fc..6de5404 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,6 +21,24 @@
         "type": "github"
       }
     },
+    "firefox-darwin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1668992358,
+        "narHash": "sha256-24iH+wIbE1bKCFmqslwOpfrDypJ40mk1uGIqRUxDXxY=",
+        "owner": "bandithedoge",
+        "repo": "nixpkgs-firefox-darwin",
+        "rev": "066d4fd658acd075b45405eda9e3bca6a71a47b1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bandithedoge",
+        "repo": "nixpkgs-firefox-darwin",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -111,6 +129,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1639237670,
+        "narHash": "sha256-RTdL4rEQcgaZGpvtDgkp3oK/V+1LM3I53n0ACPSroAQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "edfb969386ebe6c3cf8f878775a7975cd88f926d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1666959691,
         "narHash": "sha256-TRpWA3t8ata79HOGtFd5dDCl1kJQmIE16PDF53/Hcxo=",
@@ -126,7 +160,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1660318005,
         "narHash": "sha256-g9WCa9lVUmOV6dYRbEPjv/TLOR5hamjeCcKExVGS3OQ=",
@@ -159,9 +193,10 @@
     "root": {
       "inputs": {
         "darwin": "darwin",
+        "firefox-darwin": "firefox-darwin",
         "home-manager": "home-manager",
         "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nur": "nur",
         "wallpapers": "wallpapers",
         "wsl": "wsl"
@@ -202,7 +237,7 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1666720338,
diff --git a/flake.nix b/flake.nix
index 76be6fb..f8aa770 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,6 +26,9 @@
     # Community packages; used for Firefox extensions
     nur.url = "github:nix-community/nur";
 
+    # Use official Firefox binary for macOS
+    firefox-darwin.url = "github:bandithedoge/nixpkgs-firefox-darwin";
+
     # Wallpapers
     wallpapers = {
       url = "gitlab:exorcist365/wallpapers";
diff --git a/hosts/macbook/default.nix b/hosts/macbook/default.nix
index ed6c624..74e2f90 100644
--- a/hosts/macbook/default.nix
+++ b/hosts/macbook/default.nix
@@ -22,7 +22,7 @@ darwin.lib.darwinSystem {
       };
       mailUser = globals.user;
       networking.hostName = "noah-masur-mac";
-      nixpkgs.overlays = [ nur.overlay ];
+      nixpkgs.overlays = [ nur.overlay firefox-darwin.overlay ];
       # Set registry to flake packages, used for nix X commands
       nix.registry.nixpkgs.flake = nixpkgs;
     }
@@ -32,6 +32,7 @@ darwin.lib.darwinSystem {
     ../../modules/applications/alacritty.nix
     ../../modules/applications/kitty.nix
     ../../modules/applications/discord.nix
+    ../../modules/applications/firefox.nix
     ../../modules/repositories/notes.nix
     ../../modules/programming/nix.nix
     ../../modules/programming/terraform.nix
diff --git a/modules/applications/firefox.nix b/modules/applications/firefox.nix
index 570e890..3b1a246 100644
--- a/modules/applications/firefox.nix
+++ b/modules/applications/firefox.nix
@@ -9,6 +9,7 @@
 
       programs.firefox = {
         enable = true;
+        package = lib.mkIf pkgs.stdenv.isDarwin pkgs.firefox-bin;
         extensions = with pkgs.nur.repos.rycee.firefox-addons; [
           ublock-origin
           vimium
diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix
index b6ffb64..317cd27 100644
--- a/modules/darwin/homebrew.nix
+++ b/modules/darwin/homebrew.nix
@@ -32,7 +32,6 @@
       "openjdk" # Required by Apache Directory Studio
     ];
     casks = [
-      "firefox" # Firefox packaging on Nix is broken for macOS
       "1password" # 1Password packaging on Nix is broken for macOS
       "scroll-reverser" # Different scroll style for mouse vs. trackpad
       "meetingbar" # Show meetings in menu bar
diff --git a/modules/darwin/system.nix b/modules/darwin/system.nix
index ff474a2..0294446 100644
--- a/modules/darwin/system.nix
+++ b/modules/darwin/system.nix
@@ -166,7 +166,7 @@
           "$(__dock_item /Applications/1Password.app)" \
           "$(__dock_item /Applications/Slack.app)" \
           "$(__dock_item /System/Applications/Calendar.app)" \
-          "$(__dock_item /Applications/Firefox.app)" \
+          "$(__dock_item ${pkgs.firefox-bin}/Applications/Firefox.app)" \
           "$(__dock_item /System/Applications/Messages.app)" \
           "$(__dock_item /System/Applications/Mail.app)" \
           "$(__dock_item /Applications/Mimestream.app)" \