From 4bfb254c0c572ed3787ce31a15d8c472e6288e47 Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Mon, 11 Nov 2024 23:54:23 -0800
Subject: [PATCH] chore: update to new unified zen browser flake

---
 flake.lock           | 76 ++++----------------------------------------
 flake.nix            |  5 +--
 overlays/default.nix |  8 +----
 3 files changed, 8 insertions(+), 81 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6b742a9..29d9721 100755
--- a/flake.lock
+++ b/flake.lock
@@ -289,24 +289,6 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
-      },
-      "locked": {
-        "lastModified": 1730504689,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -728,18 +710,6 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
       }
     },
-    "nixpkgs-lib_2": {
-      "locked": {
-        "lastModified": 1730504152,
-        "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1710695816,
@@ -804,22 +774,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "plugins-lsp-progress": {
       "flake": false,
       "locked": {
@@ -899,8 +853,7 @@
         "vesktop-bin": "vesktop-bin",
         "viminal": "viminal",
         "wallpapers": "wallpapers",
-        "zen-browser": "zen-browser",
-        "zen-browser-source": "zen-browser-source_2"
+        "zen-browser": "zen-browser"
       }
     },
     "rust-analyzer-src": {
@@ -1203,6 +1156,8 @@
     "zen-browser": {
       "inputs": {
         "nixpkgs": [
+          "zen-browser",
+          "zen-browser-source",
           "nixpkgs"
         ],
         "zen-browser-source": "zen-browser-source"
@@ -1223,7 +1178,9 @@
     },
     "zen-browser-source": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": [
+          "flake-parts"
+        ],
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
@@ -1239,27 +1196,6 @@
         "repo": "zen-browser-source-flake",
         "type": "github"
       }
-    },
-    "zen-browser-source_2": {
-      "inputs": {
-        "flake-parts": [
-          "flake-parts"
-        ],
-        "nixpkgs": "nixpkgs_5"
-      },
-      "locked": {
-        "lastModified": 1731292739,
-        "narHash": "sha256-c0ED1Yu1AamD3RXsH1kLvvP8gdhGp/HB8AJfzJw7Ph0=",
-        "owner": "youwen5",
-        "repo": "zen-browser-source-flake",
-        "rev": "dc72f9d9456cd732ad9eb78f8e3d676aa807d554",
-        "type": "github"
-      },
-      "original": {
-        "owner": "youwen5",
-        "repo": "zen-browser-source-flake",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 3c46e77..6d5de76 100755
--- a/flake.nix
+++ b/flake.nix
@@ -91,11 +91,8 @@
 
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.zen-browser-source.inputs.flake-parts.follows = "flake-parts";
     };
-
-    zen-browser-source.url = "github:youwen5/zen-browser-source-flake";
-    zen-browser-source.inputs.flake-parts.follows = "flake-parts";
   };
 
   outputs =
diff --git a/overlays/default.nix b/overlays/default.nix
index f05f675..e61946f 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -12,13 +12,7 @@ in
 {
   nixpkgs.overlays = [
     (self: super: {
-      zen-browser =
-        if system == "x86_64-linux" then
-          inputs.zen-browser.packages.${system}.default
-        else if system == "aarch64-linux" then
-          inputs.zen-browser-source.packages.${system}.default
-        else
-          null;
+      zen-browser = inputs.zen-browser.packages.${system}.default;
     })
   ];
 }