Merge pull request 'remove-nixpkgs-mozilla' (#115) from remove-nixpkgs-mozilla into main

Reviewed-on: #115

config/programs/firefox.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   programs.firefox = {
-    package = pkgs.latest.firefox-nightly-bin;
+    package = pkgs.firefox-wayland;
     enable = true;
     profiles = {
       unhardened = {

config/services/hydra.nix

@@ -90,22 +90,7 @@ in {
     ];
   };
   networking.firewall.interfaces."wg0".allowedTCPPorts = [9199];
-  nix.settings.allowed-uris = [
+  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://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/"
-  ];
   sops.secrets."services/hydra/gitea_token" = {};
   sops.secrets."services/hydra/github_token" = {};
   sops.secrets."services/hydra/cache-key" = {

flake.lock

@@ -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",

flake.nix

@@ -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;};
               })