diff --git a/flake.lock b/flake.lock index cfe7cf3d7..79c1f493e 100644 --- a/flake.lock +++ b/flake.lock @@ -39,22 +39,22 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-rkVbviFmYYmbbVfvFRtOM95IjETbNu3I517Hrxp8EF4=", - "path": "/nix/store/8azr0ivnzf0y1sh2r7alxaxab3w49ggx-source/nixpatches", + "narHash": "sha256-FTUAvxSeQToawyfVP9/S2143D5EgCbk88qI2PePLQQ8=", + "path": "/nix/store/s9v0l913m4drrddglbjqa384nxxwhxca-source/nixpatches", "type": "path" }, "original": { - "path": "/nix/store/8azr0ivnzf0y1sh2r7alxaxab3w49ggx-source/nixpatches", + "path": "/nix/store/s9v0l913m4drrddglbjqa384nxxwhxca-source/nixpatches", "type": "path" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1675265860, - "narHash": "sha256-PZNqc4ZnTRT34NsHJYbXn+Yhghh56l8HEXn39SMpGNc=", + "lastModified": 1675556398, + "narHash": "sha256-5Gf5KlmFXfIGVQb2hmiiE7FQHoLd4UtEhIolLQvNB/A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3a1400571e3b9ccc270c2e8d36194cf05aab6ce", + "rev": "e32c33811815ca4a535a16faf1c83eeb4493145b", "type": "github" }, "original": { @@ -66,11 +66,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1675273418, - "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", + "lastModified": 1675942811, + "narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", + "rev": "724bfc0892363087709bd3a5a1666296759154b1", "type": "github" }, "original": { @@ -97,11 +97,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1675288837, - "narHash": "sha256-76s8TLENa4PzWDeuIpEF78gqeUrXi6rEJJaKEAaJsXw=", + "lastModified": 1675872570, + "narHash": "sha256-RPH3CeTv7ixC2WcYiKyhmIgoH/9tur4Kr+3Vg/pleQk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a81ce6c961480b3b93498507074000c589bd9d60", + "rev": "8fec29b009c19538e68d5d814ec74e04f662fbd1", "type": "github" }, "original": { diff --git a/hosts/common/home/firefox.nix b/hosts/common/home/firefox.nix index d5f05e522..7a3927584 100644 --- a/hosts/common/home/firefox.nix +++ b/hosts/common/home/firefox.nix @@ -125,7 +125,8 @@ in # `wget ...xpi`; `unar ...xpi`; `cat */manifest.json | jq '.browser_specific_settings.gecko.id'` # browserpass-ce.package = addon "browserpass-ce" "browserpass@maximbaz.com" "sha256-sXgUBbRvMnRpeIW1MTkmTcoqtW/8RDXAkxAq1evFkpc="; browserpass-extension.package = localAddon pkgs.browserpass-extension; - bypass-paywalls-clean.package = addon "bypass-paywalls-clean" "{d133e097-46d9-4ecc-9903-fa6a722a6e0e}" "sha256-oUwdqdAwV3DezaTtOMx7A/s4lzIws+t2f08mwk+325k="; + # TODO: build bypass-paywalls from source? it's mysteriously disappeared from the Mozilla store. + # bypass-paywalls-clean.package = addon "bypass-paywalls-clean" "{d133e097-46d9-4ecc-9903-fa6a722a6e0e}" "sha256-oUwdqdAwV3DezaTtOMx7A/s4lzIws+t2f08mwk+324k="; ether-metamask.package = addon "ether-metamask" "webextension@metamask.io" "sha256-G+MwJDOcsaxYSUXjahHJmkWnjLeQ0Wven8DU/lGeMzA="; i2p-in-private-browsing.package = addon "i2p-in-private-browsing" "i2ppb@eyedeekay.github.io" "sha256-dJcJ3jxeAeAkRvhODeIVrCflvX+S4E0wT/PyYzQBQWs="; sidebery.package = addon "sidebery" "{3c078156-979c-498b-8990-85f7987dd929}" "sha256-YONfK/rIjlsrTgRHIt3km07Q7KnpIW89Z9r92ZSCc6w="; @@ -134,7 +135,7 @@ in ublock-origin.package = addon "ublock-origin" "uBlock0@raymondhill.net" "sha256-a/ivUmY1P6teq9x0dt4CbgHt+3kBsEMMXlOfZ5Hx7cg="; browserpass-extension.enable = lib.mkDefault true; - bypass-paywalls-clean.enable = lib.mkDefault true; + # bypass-paywalls-clean.enable = lib.mkDefault true; ether-metamask.enable = lib.mkDefault true; i2p-in-private-browsing.enable = lib.mkDefault config.services.i2p.enable; sidebery.enable = lib.mkDefault true; diff --git a/hosts/common/ids.nix b/hosts/common/ids.nix index c9cb1db44..0ad3b33c8 100644 --- a/hosts/common/ids.nix +++ b/hosts/common/ids.nix @@ -1,3 +1,4 @@ +# TODO: migrate to nixpkgs `config.ids.uids` { ... }: { @@ -35,7 +36,7 @@ sane.ids.sshd.uid = 2001; # 997 sane.ids.sshd.gid = 2001; # 997 sane.ids.polkituser.gid = 2002; # 998 - sane.ids.systemd-coredump.gid = 2003; # 996 + # sane.ids.systemd-coredump.gid = 2003; # 996 # 2023/02/12: upstream now specifies this as 151 sane.ids.nscd.uid = 2004; sane.ids.nscd.gid = 2004; sane.ids.systemd-oom.uid = 2005; diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 186c3e935..af694d0f7 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -15,11 +15,11 @@ # fix handbrake build by: handbrake: 1.5.1 -> 1.6.1 # PR opened 2023/01/23 - (fetchpatch { - # see alternate fix: - url = "https://github.com/NixOS/nixpkgs/pull/212306.diff"; - hash = "sha256-PnPzvJymafa+zjkauQW0LzFsJC7S+7D9JRszTE3in+w="; - }) + # (fetchpatch { + # # see alternate fix: + # url = "https://github.com/NixOS/nixpkgs/pull/212306.diff"; + # hash = "sha256-PnPzvJymafa+zjkauQW0LzFsJC7S+7D9JRszTE3in+w="; + # }) ./2022-12-19-i2p-aarch64.patch