From addca4712fd456a1c39781d128e7673ac3cd97d1 Mon Sep 17 00:00:00 2001 From: Chris Toph Date: Mon, 17 Mar 2025 16:36:58 -0400 Subject: [PATCH] Flake update and changed Zen Browser flake --- flake.lock | 46 +++++++++++----------- flake.nix | 2 +- home/toph/common/optional/browsers/zen.nix | 16 ++++---- home/toph/common/optional/xdg.nix | 2 +- 4 files changed, 32 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 8421865..a6a407d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "hardware": { "locked": { - "lastModified": 1740646007, - "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", + "lastModified": 1741792691, + "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", + "rev": "e1f12151258b12c567f456d8248e4694e9390613", "type": "github" }, "original": { @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1741128660, - "narHash": "sha256-GWaZ+KGxWYbOB15CSqktwngq0ccA1l2Ov3aUfl9jeY4=", + "lastModified": 1741955947, + "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "b1b964ea9348aef08cab514fa88e9c99def6fd63", + "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1740932899, - "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=", + "lastModified": 1741862977, + "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347", + "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "type": "github" }, "original": { @@ -85,11 +85,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -151,15 +151,15 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1740554227, - "narHash": "sha256-xpwZeMw2gGenixGQDyVv+ja+epcR+EJ1BPuGFdgFS18=", - "owner": "0xc000022070", + "lastModified": 1741838758, + "narHash": "sha256-nGTC/y9e+1+QIVCzIbiSpPiXM2HfS8YwIDCp52CcOQ4=", + "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "7de16ae319e6f6852274fa90b0d41c00049767c9", + "rev": "03a7fc89bc48344aed00e01b409c1d6ffc4c52ce", "type": "github" }, "original": { - "owner": "0xc000022070", + "owner": "youwen5", "repo": "zen-browser-flake", "type": "github" } diff --git a/flake.nix b/flake.nix index 5236da2..ab3c85d 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ inputs.nixpkgs.follows = "nixpkgs-stable"; }; zen-browser = { - url = "github:0xc000022070/zen-browser-flake"; + url = "github:youwen5/zen-browser-flake"; }; # TODO: theming # stylix.url = "github:danth/stylix/release-24.11"; diff --git a/home/toph/common/optional/browsers/zen.nix b/home/toph/common/optional/browsers/zen.nix index 9eb1dbc..928a866 100644 --- a/home/toph/common/optional/browsers/zen.nix +++ b/home/toph/common/optional/browsers/zen.nix @@ -5,16 +5,14 @@ ... }: { - home.packages = builtins.attrValues { - inherit (inputs.zen-browser.packages."${pkgs.system}") - twilight - ; - }; + home.packages = [ + inputs.zen-browser.packages.${pkgs.system}.default + ]; xdg.mimeApps.defaultApplications = { - "text/html" = [ "zen_twilight.desktop" ]; - "text/xml" = [ "zen_twilight.desktop" ]; - "x-scheme-handler/http" = [ "zen_twilight.desktop" ]; - "x-scheme-handler/https" = [ "zen_twilight.desktop" ]; + "text/html" = [ "zen.desktop" ]; + "text/xml" = [ "zen.desktop" ]; + "x-scheme-handler/http" = [ "zen.desktop" ]; + "x-scheme-handler/https" = [ "zen.desktop" ]; }; } diff --git a/home/toph/common/optional/xdg.nix b/home/toph/common/optional/xdg.nix index 0c20123..e62bf52 100644 --- a/home/toph/common/optional/xdg.nix +++ b/home/toph/common/optional/xdg.nix @@ -5,7 +5,7 @@ }: let # FIXME(xdg): That should use config options and just reference whatever is configured as the default - browser = [ "zen_twilight.desktop" ]; + browser = [ "zen.desktop" ]; editor = [ "code.desktop" ]; # Extensive list of associations here: # https://github.com/iggut/GamiNiX/blob/8070528de419703e13b4d234ef39f05966a7fafb/system/desktop/home-main.nix#L77