Revert "Merge pull request 'switch to nixpkgs-mozilla' (#114) from add-nixpkgs-mozilla into main"

This reverts commit 192f407416, reversing
changes made to e04aa66025.
This commit is contained in:
Charlotte 🦝 Delenk 2023-06-22 07:47:59 +01:00
parent 192f407416
commit f114cb8be7
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
4 changed files with 3 additions and 36 deletions

View file

@ -1,6 +1,6 @@
{pkgs, ...}: {
programs.firefox = {
package = pkgs.latest.firefox-nightly-bin;
package = pkgs.firefox-wayland;
enable = true;
profiles = {
unhardened = {
@ -36,7 +36,7 @@
keepassxc-browser
privacy-badger
privacy-possum
sponsorblock
#sponsorblock
stylus
tree-style-tab
ublock-origin

View file

@ -90,22 +90,7 @@ in {
];
};
networking.firewall.interfaces."wg0".allowedTCPPorts = [9199];
nix.settings.allowed-uris = [
"https://github.com/"
"https://git.chir.rs/"
"https://darkkirb.de/"
"https://git.neo-layout.org/"
"https://static.darkkirb.de/"
"https://gist.github.com/"
"https://git.kescher.at/"
"https://akkoma.dev/"
"https://gitlab.com/"
"https://api.github.com/"
"https://git.sr.ht/"
"https://product-details.mozilla.org/"
"https://download.cdn.mozilla.net/"
"https://archive.mozilla.org/"
];
nix.settings.allowed-uris = ["https://github.com/" "https://git.chir.rs/" "https://darkkirb.de/" "https://git.neo-layout.org/" "https://static.darkkirb.de/" "https://gist.github.com/" "https://git.kescher.at/" "https://akkoma.dev/" "https://gitlab.com/" "https://api.github.com/" "https://git.sr.ht/"];
sops.secrets."services/hydra/gitea_token" = {};
sops.secrets."services/hydra/github_token" = {};
sops.secrets."services/hydra/cache-key" = {

View file

@ -1439,21 +1439,6 @@
"type": "github"
}
},
"nixpkgs-mozilla": {
"locked": {
"lastModified": 1684487559,
"narHash": "sha256-SZcJEM+NnLr8ctzeQf1BGAqBHzJ3jn+tdSeO7lszIJc=",
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"rev": "e6ca26fe8b9df914d4567604e426fbc185d9ef3e",
"type": "github"
},
"original": {
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"type": "github"
}
},
"nixpkgs-noto-variable": {
"locked": {
"lastModified": 1648877644,
@ -1632,7 +1617,6 @@
"nixos-hardware": "nixos-hardware_2",
"nixpkgs": "nixpkgs_5",
"nixpkgs-for-crane": "nixpkgs-for-crane_2",
"nixpkgs-mozilla": "nixpkgs-mozilla",
"nur": "nur_2",
"rust-overlay": "rust-overlay_2",
"sops-nix": "sops-nix_2",

View file

@ -82,7 +82,6 @@ rec {
nixos-hardware.url = "github:NixOS/nixos-hardware";
nixpkgs.url = "github:NixOS/nixpkgs";
nixpkgs-for-crane.url = "github:NixOS/nixpkgs/3ae365afb80773c3bb67e52294a82e329a9e5be0";
nixpkgs-mozilla.url = "github:mozilla/nixpkgs-mozilla";
nur.url = "github:nix-community/NUR";
rust-overlay = {
url = "github:oxalica/rust-overlay";
@ -167,7 +166,6 @@ rec {
({pkgs, ...}: {
nixpkgs.overlays = [
nur.overlay
args.nixpkgs-mozilla.overlay
];
home-manager.extraSpecialArgs = args // {inherit system;};
})