From d8ad75f69d2311a01c0f187d40a6b125f7e501b2 Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Fri, 25 Oct 2024 09:15:40 +0700
Subject: [PATCH] fix(nix): Fix firefox-darwin overlay is never actually
 applied

---
 .config/nix/lib/mkSystem.nix                 | 4 ++--
 .config/nix/systems/darwin/configuration.nix | 3 ++-
 .config/nix/systems/darwin/default.nix       | 5 ++---
 .config/nix/systems/nix/default.nix          | 2 +-
 .config/nix/users/default.nix                | 5 +++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.config/nix/lib/mkSystem.nix b/.config/nix/lib/mkSystem.nix
index c06bc62..d051163 100644
--- a/.config/nix/lib/mkSystem.nix
+++ b/.config/nix/lib/mkSystem.nix
@@ -1,4 +1,4 @@
-system: nixpkgs:  # e.g. x86_64-linux
+system: nixpkgs: extraOverlays:
 
 {
   system = system;
@@ -7,7 +7,7 @@ system: nixpkgs:  # e.g. x86_64-linux
     overlays =
       [
         (import ../overlays/python.nix)
-      ];
+      ] ++ extraOverlays;
     config.allowUnfree = true;
   };
 }
diff --git a/.config/nix/systems/darwin/configuration.nix b/.config/nix/systems/darwin/configuration.nix
index a11e400..1419b88 100644
--- a/.config/nix/systems/darwin/configuration.nix
+++ b/.config/nix/systems/darwin/configuration.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, vars, common, ... }:
+{ pkgs, config, vars, common, inputs, ... }:
 
 {
   # I don't want to risk breaking my hackintosh setup in case Apple decided to
@@ -33,6 +33,7 @@
       pkgs.duti
       pkgs.pinentry_mac
       pkgs.iina
+      pkgs.floorp-bin
     ];
 
   # Auto upgrade nix package and the daemon service.
diff --git a/.config/nix/systems/darwin/default.nix b/.config/nix/systems/darwin/default.nix
index 6f174cb..48e71c5 100644
--- a/.config/nix/systems/darwin/default.nix
+++ b/.config/nix/systems/darwin/default.nix
@@ -3,7 +3,6 @@
 let
   mkCommon = import ../../lib/mkCommon.nix;
   mkSystem = import ../../lib/mkSystem.nix;
-  pkgs.overlays = pkgs.overlays ++ [ inputs.firefox-darwin.overlay ];
 in
 {
   # Host list
@@ -14,7 +13,7 @@ in
   # Lenovo ThinkPad L460; Intel Core i5-6300U
   "ThiccBook-Pro" =
     let
-      inherit (mkSystem "x86_64-darwin" nixpkgs) system pkgs;
+      inherit (mkSystem "x86_64-darwin" nixpkgs [inputs.firefox-darwin.overlay]) system pkgs;
       common = (mkCommon pkgs);
     in
     nix-darwin.lib.darwinSystem {
@@ -28,7 +27,7 @@ in
   # Imaginary M1, just for reference
   MacBookProM1 =
     let
-      inherit (mkSystem "aarch64-darwin" nixpkgs) system pkgs;
+      inherit (mkSystem "aarch64-darwin" nixpkgs [inputs.firefox-darwin.overlay]) system pkgs;
       common = (mkCommon pkgs);
     in
     nix-darwin.lib.darwinSystem {
diff --git a/.config/nix/systems/nix/default.nix b/.config/nix/systems/nix/default.nix
index f0541e5..001588e 100644
--- a/.config/nix/systems/nix/default.nix
+++ b/.config/nix/systems/nix/default.nix
@@ -7,7 +7,7 @@ in
 {
   "potato" =
     let
-      inherit (mkSystem "x86_64-linux" nixpkgs) system pkgs;
+      inherit (mkSystem "x86_64-linux" nixpkgs []) system pkgs;
       common = (mkCommon pkgs);
     in
     system-manager.lib.makeSystemConfig {
diff --git a/.config/nix/users/default.nix b/.config/nix/users/default.nix
index 3af34e6..e4b2915 100644
--- a/.config/nix/users/default.nix
+++ b/.config/nix/users/default.nix
@@ -18,7 +18,7 @@ in
 
   "ziro@ThiccBook-Pro" =
     let
-      inherit (mkSystem "x86_64-darwin" nixpkgs) system pkgs;
+      inherit (mkSystem "x86_64-darwin" nixpkgs [inputs.firefox-darwin.overlay]) system pkgs;
       vars.name = "ziro";
     in
     home-manager.lib.homeManagerConfiguration {
@@ -27,12 +27,13 @@ in
       modules = [
         ./ziro
         ./ziro/darwin.nix
+        ../modules/home-manager/floorp.nix
       ];
     };
 
   "ziro@potato" =
     let
-      inherit (mkSystem "x86_64-linux" nixpkgs) system pkgs;
+      inherit (mkSystem "x86_64-linux" nixpkgs []) system pkgs;
       vars.name = "ziro";
     in
     home-manager.lib.homeManagerConfiguration {