From 7c912238a1f6b92b77e5f81955428a36329d63bc Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Mon, 26 Aug 2024 17:54:50 -0700
Subject: [PATCH] pkgs(zen-browser): replace with better flake

---
 flake.lock                                    | 46 +++----------------
 overlays/default.nix                          |  2 +-
 users/youwen/linux/hyprland/common.nix        |  4 +-
 .../youwen/linux/packages/x86_64/default.nix  |  8 +++-
 4 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/flake.lock b/flake.lock
index 908afba..a18ba31 100755
--- a/flake.lock
+++ b/flake.lock
@@ -325,24 +325,6 @@
         "type": "github"
       }
     },
-    "flake-utils_6": {
-      "inputs": {
-        "systems": "systems_6"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "flakey-profile": {
       "locked": {
         "lastModified": 1712898590,
@@ -776,11 +758,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1724479785,
-        "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
+        "lastModified": 1724224976,
+        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
+        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
         "type": "github"
       },
       "original": {
@@ -1064,21 +1046,6 @@
         "type": "github"
       }
     },
-    "systems_6": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -1138,15 +1105,14 @@
     },
     "zen-browser": {
       "inputs": {
-        "flake-utils": "flake-utils_6",
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1724710271,
-        "narHash": "sha256-liq52KgbV2JppCO8xiF8x8/tod+O+Im/zKArhRXDcgk=",
+        "lastModified": 1724719995,
+        "narHash": "sha256-JBBaAYaW9g/hBH/O+sEwsH2PczaRlqiiUUOi4bopGDw=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "6c1baeb25fd07dc810f75cafb59f81702e488f98",
+        "rev": "0d391c6f3a2616e070ed5a0c808c4b07e9affe27",
         "type": "github"
       },
       "original": {
diff --git a/overlays/default.nix b/overlays/default.nix
index 6efe291..6467f69 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -11,6 +11,6 @@ in {
     (self: super: {
       manga-tui = bleedingpkgs.manga-tui;
     })
-    inputs.zen-browser.overlays.default
+    # inputs.zen-browser.overlays.default
   ];
 }
diff --git a/users/youwen/linux/hyprland/common.nix b/users/youwen/linux/hyprland/common.nix
index 4706882..a0b45b7 100644
--- a/users/youwen/linux/hyprland/common.nix
+++ b/users/youwen/linux/hyprland/common.nix
@@ -41,7 +41,7 @@
         # External reserved keys: SUPER + Z and SUPER + X for zen-browser.
 
         # Application Keybinds
-        "$mod, F, exec, zen-browser || librewolf"
+        "$mod, F, exec, zen-bin || librewolf"
         "$mod, T, exec, kitty"
         "$mod, E, exec, dolphin"
         "$mod, R, exec, pavucontrol"
@@ -184,7 +184,7 @@
         "float,class:^(org.kde.dolphin)$,title:^(Copying — Dolphin)$"
         "float,title:^(Picture-in-Picture)$"
         "float,class:^(librewolf)$,title:^(Library)$"
-        "float,class:^(zen-browser)$,title:^(Library)$"
+        "float,class:^(zen-alpha)$,title:^(Library)$"
         "float,title:^(Extension: (Bitwarden Password Manager))$"
         "float,class:^(vlc)$"
         "float,class:^(kvantummanager)$"
diff --git a/users/youwen/linux/packages/x86_64/default.nix b/users/youwen/linux/packages/x86_64/default.nix
index 82cb794..92ea4e4 100644
--- a/users/youwen/linux/packages/x86_64/default.nix
+++ b/users/youwen/linux/packages/x86_64/default.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: let
+{
+  pkgs,
+  inputs,
+  ...
+}: let
   createCommon = import ../common-packages.nix;
 in {
   home.packages =
@@ -10,6 +14,6 @@ in {
       wine
       sbctl
       r2modman
-      zen-browser.default
+      inputs.zen-browser.packages.${pkgs.system}.specific
     ]);
 }