diff --git a/flake.lock b/flake.lock
index de9936e..bb51a0c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -173,11 +173,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761878381,
-        "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=",
+        "lastModified": 1762025346,
+        "narHash": "sha256-6KR4dsNfA3Pqm6uT8j7aKjWydP/KXFqZUhOfMlfP+1E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa",
+        "rev": "87044c57222fb485974062e2dd557e7b8abd8fff",
         "type": "github"
       },
       "original": {
@@ -230,6 +230,22 @@
         "type": "gitlab"
       }
     },
+    "mozilla": {
+      "locked": {
+        "lastModified": 1750265908,
+        "narHash": "sha256-ZGo9BPm0L6kkuke6Bp5rb1XwF5Qv3/+a3mowsr0fcU4=",
+        "owner": "andersk",
+        "repo": "nixpkgs-mozilla",
+        "rev": "174a36cd95c9bed0dcbcc8a51f16d0cc8be490f3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "andersk",
+        "ref": "channel",
+        "repo": "nixpkgs-mozilla",
+        "type": "github"
+      }
+    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1739444422,
@@ -248,11 +264,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1761827175,
-        "narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=",
+        "lastModified": 1761933221,
+        "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "43ffe9ac82567512abb83187cb673de1091bdfa8",
+        "rev": "7467f155fcba189eb088a7601f44fbef7688669b",
         "type": "github"
       },
       "original": {
@@ -312,11 +328,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1761672384,
-        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
+        "lastModified": 1761907660,
+        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
+        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
         "type": "github"
       },
       "original": {
@@ -328,11 +344,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1761672384,
-        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
+        "lastModified": 1761907660,
+        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
+        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
         "type": "github"
       },
       "original": {
@@ -364,6 +380,7 @@
         "disko": "disko",
         "home-manager": "home-manager_2",
         "mailserver": "mailserver",
+        "mozilla": "mozilla",
         "nix-flatpak": "nix-flatpak",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
@@ -393,11 +410,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1761859061,
-        "narHash": "sha256-5C2x+ZQQZAAy0LowYgacT1KG83nXxjcYKMzedx89Wtw=",
+        "lastModified": 1761970869,
+        "narHash": "sha256-dlcxJTY+MwR9u3yTkBkzqfHY2+MKonDS7UzoOLlGpuw=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "26142b84460636c55bd612ae67225056c7faf134",
+        "rev": "5855db6427f25672d7f02e19af418a38fe82e26e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 3e8e6e6..ba808f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,7 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     nix-flatpak.url = "github:gmodena/nix-flatpak/latest";
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
+    mozilla.url = "github:andersk/nixpkgs-mozilla/channel";
 
     mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
 
diff --git a/modules/desktop/system.nix b/modules/desktop/system.nix
index 9b94daf..aaa110e 100644
--- a/modules/desktop/system.nix
+++ b/modules/desktop/system.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, mozilla, ... }:
 
 {
   # Boot
@@ -45,6 +45,20 @@
     # Doesn't work ?
     # languagePacks = [ "fr" "en-US" ];
   };
+  nixpkgs.overlays = [ mozilla.overlays.firefox ];
+    # let
+    #   # Change this to a rev sha to pin
+    #   moz-rev = "master";
+    #   moz-url = builtins.fetchTarball {
+    #     url = "https://github.com/mozilla/nixpkgs-mozilla/archive/${moz-rev}.tar.gz";
+    #     sha256 = "sha256:0fcfg835ly29m7m4xzhxb7lvw2ayxcv7cn7pzw4hkj2j1vzx7b2b";
+    #   };
+    #   nightlyOverlay = (import "${moz-url}/firefox-overlay.nix");
+    # in [
+    #   nightlyOverlay
+    # ];
+
+  programs.firefox.package = pkgs.latest.firefox-nightly-bin;
 
   xdg.portal.enable = true;
 
diff --git a/users/lyes/desktop/dconf.nix b/users/lyes/desktop/dconf.nix
index 52d07b1..56e12a4 100644
--- a/users/lyes/desktop/dconf.nix
+++ b/users/lyes/desktop/dconf.nix
@@ -77,7 +77,7 @@ with lib.hm.gvariant;
       disable-user-extensions = false;
       favorite-apps =
         [
-          "zen-beta.desktop"
+          "firefox.desktop"
           "thunderbird.desktop"
           "vesktop.desktop"
           "element-desktop.desktop"
diff --git a/users/lyes/desktop/home.nix b/users/lyes/desktop/home.nix
index 8893d6f..e18c574 100644
--- a/users/lyes/desktop/home.nix
+++ b/users/lyes/desktop/home.nix
@@ -49,7 +49,7 @@ in
       "text/plain" = "org.gnome.TextEditor.desktop";
       "text/markdown" = "org.gnome.TextEditor.desktop";
       "text/json" = "org.gnome.TextEditor.desktop";
-      "text/html" = "zen-beta.desktop";
+      "text/html" = "firefox.desktop";
       "text/xml" = "org.gnome.TextEditor.desktop";
       "image/avif" = "org.gnome.Loupe.desktop";
       "image/png" = "org.gnome.Loupe.desktop";
@@ -78,20 +78,20 @@ in
       "application/epub+zip" = "com.github.johnfactotum.Foliate.desktop";
       "application/ogg" = "mpv.desktop";
       "application/xml" = "org.gnome.TextEditor.desktop";
-      "application/xhtml+xml" = "zen-beta.desktop";
-      "application/x-extension-htm" = "zen-beta.desktop";
-      "application/x-extension-html" = "zen-beta.desktop";
-      "application/x-extension-shtml" = "zen-beta.desktop";
-      "application/x-extension-xhtml" = "zen-beta.desktop";
-      "application/x-extension-xht" = "zen-beta.desktop";
+      "application/xhtml+xml" = "firefox.desktop";
+      "application/x-extension-htm" = "firefox.desktop";
+      "application/x-extension-html" = "firefox.desktop";
+      "application/x-extension-shtml" = "firefox.desktop";
+      "application/x-extension-xhtml" = "firefox.desktop";
+      "application/x-extension-xht" = "firefox.desktop";
       "application/x-bittorrent" = "de.haeckerfelix.Fragments.desktop";
       "message/rfc822" = "thunderbird.desktop";
       "x-scheme-handler/mailto" = "thunderbird.desktop";
       "x-scheme-handler/mid" = "thunderbird.desktop";
       "x-scheme-handler/discord" = "vesktop.desktop";
-      "x-scheme-handler/http" = "zen-beta.desktop";
-      "x-scheme-handler/https" = "zen-beta.desktop";
-      "x-scheme-handler/chrome" = "zen-beta.desktop";
+      "x-scheme-handler/http" = "firefox.desktop";
+      "x-scheme-handler/https" = "firefox.desktop";
+      "x-scheme-handler/chrome" = "firefox.desktop";
     };
   };
 
diff --git a/users/lyes/home/shells/fish.nix b/users/lyes/home/shells/fish.nix
index f03cd6e..82fe78a 100644
--- a/users/lyes/home/shells/fish.nix
+++ b/users/lyes/home/shells/fish.nix
@@ -15,7 +15,7 @@
             owner = "BrewingWeasel";
             repo = "fishbang";
             rev = "master";
-            sha256 = "sha256-VHtjt3Xobvs0DTXJ1mFU8i84EEsNQv3yqbhjs7c1mNE=";
+            sha256 = "sha256-AJwaJ3Khu25EWEkJdv7lemO0T0gjcx9xtN6MnxQ9v6I=";
           };
         }
       ];