From 3ed58a04639b860b8572d25d9199f5688367035c Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 23 Jun 2024 23:20:57 +0800 Subject: [PATCH] flake: update lock file --- flake.lock | 72 +++++++++++++-------------- home/applications/firefox/default.nix | 18 ++++--- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index c720231..c3bb7e3 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1718735045, - "narHash": "sha256-5PaPrMjQu0ojps12ecRO6qFntCU+pkUCrJIjDUFJknE=", + "lastModified": 1719088950, + "narHash": "sha256-g6eIW4pqWtDNryOuhqRPGhUnkSmwwWG0GB+IrObmbh0=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "2d4d6c0f286bd6901c8eab5e2d08593ca3394d6c", + "rev": "81e7515e70e6dcc24060abb41f7777932bfa6b82", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1718788307, - "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", + "lastModified": 1719037157, + "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", + "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "impermanence": { "locked": { - "lastModified": 1717932370, - "narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=", + "lastModified": 1719091691, + "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", "owner": "nix-community", "repo": "impermanence", - "rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f", + "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", "type": "github" }, "original": { @@ -270,11 +270,11 @@ ] }, "locked": { - "lastModified": 1718662658, - "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", + "lastModified": 1719128254, + "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", + "rev": "50581970f37f06a4719001735828519925ef8310", "type": "github" }, "original": { @@ -352,11 +352,11 @@ ] }, "locked": { - "lastModified": 1718833139, - "narHash": "sha256-m+7obxxZ6Fgjz/Cs3mkax8xec+0cDwnxb4Ti6jAP/ik=", + "lastModified": 1719092336, + "narHash": "sha256-GMvU34c+2Yd4O2Sklo/7UIka1hzGzIk3p+3CY1Mn1Qo=", "owner": "jacekszymanski", "repo": "nixcasks", - "rev": "592abedb3df4d8d10107065c12632ce08d972d71", + "rev": "50998b7aa6f602f0be13fdba05c5d5abf5d0eda1", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718806950, - "narHash": "sha256-E+W/kbedZAiOuPtT+KQRposLaXGDLd7lyK7oL3IH/5U=", + "lastModified": 1719145664, + "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "acb4f0e9bfa8ca2d6fca5e692307b5c994e7dbda", + "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718710757, - "narHash": "sha256-zzHTI7iQByeuGDto16eRwPflCf3xfVOJJSB0/cnEd2s=", + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56fc115880db6498245adecda277ccdb33025bc2", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", "type": "github" }, "original": { @@ -413,11 +413,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1718447546, - "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", + "lastModified": 1718811006, + "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "842253bf992c3a7157b67600c2857193f126563a", + "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", "type": "github" }, "original": { @@ -468,11 +468,11 @@ }, "nur": { "locked": { - "lastModified": 1718873190, - "narHash": "sha256-puGZxr3LWT5DuHbpesgb8Hi2w0D07S7iJD92InUPU7c=", + "lastModified": 1719153056, + "narHash": "sha256-nIp6HOIrPTMeIoaaj8MavebUI1HBeq1iz9P0nzWq1CI=", "owner": "nix-community", "repo": "NUR", - "rev": "57f88b637d41f8f1f7c4a6d827ead6d9c4347e50", + "rev": "46ab9f286d5546781726537039455867a59c19a3", "type": "github" }, "original": { @@ -523,11 +523,11 @@ ] }, "locked": { - "lastModified": 1718872830, - "narHash": "sha256-1EIYImP6ROTu2IuQtTG1aVcbXli+CgIXP7NpHqt7EXY=", + "lastModified": 1718879355, + "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e4ea49a8c0c35b5bea2d033263c6c6b4b2a19a41", + "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "type": "github" }, "original": { @@ -578,11 +578,11 @@ ] }, "locked": { - "lastModified": 1718849885, - "narHash": "sha256-Qfc5HKpQvGhWXox0WJVzLqrAcFm3uy6xtWRvVmrkLYc=", + "lastModified": 1719109180, + "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bc1a236757cd5f6622f73838e551fb2035afa44a", + "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", "type": "github" }, "original": { @@ -617,11 +617,11 @@ ] }, "locked": { - "lastModified": 1718506969, - "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", + "lastModified": 1719111739, + "narHash": "sha256-kr2QzRrplzlCP87ddayCZQS+dhGW98kw2zy7+jUXtF4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", + "rev": "5e2e9421e9ed2b918be0a441c4535cfa45e04811", "type": "github" }, "original": { diff --git a/home/applications/firefox/default.nix b/home/applications/firefox/default.nix index e4bf348..7075e24 100644 --- a/home/applications/firefox/default.nix +++ b/home/applications/firefox/default.nix @@ -1,14 +1,16 @@ {pkgs, ...}: { programs.firefox = { enable = true; - profiles."default" = { - extraConfig = '' - ${builtins.readFile (builtins.fetchurl { - url = "https://raw.githubusercontent.com/arkenfox/user.js/126.1/user.js"; - sha256 = "sha256-XRtG0iLKh8uqbeX7Rc2H6VJwZYJoNZPBlAfZEfrSCP4="; - })} - ${builtins.readFile ./user-overrides.js} - ''; + package = pkgs.firefox.override { + extraPrefsFiles = [ + "${pkgs.arkenfox-userjs}/user.cfg" + (pkgs.runCommandLocal "userjs" {} '' + install -Dm644 ${./user-overrides.js} $out + substituteInPlace $out \ + --replace-fail "user_pref" "defaultPref" + '') + ]; }; + profiles."default" = {}; }; }