Refactor and add firefox nightly

flake.lock

@@ -83,7 +83,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-fOVKLoIteoafLvI6Mt1SFudGbKWzeL1U9cvKygl72xU=",
+        "narHash": "sha256-YiCIlI7ZJHG3PiAWrdbsWWVVsvaLImzLCw6FRvU0KHA=",
         "path": "./pkgs",
         "type": "path"
       },
@@ -108,6 +108,21 @@
         "type": "github"
       }
     },
+    "mozilla_2": {
+      "locked": {
+        "lastModified": 1687771476,
+        "narHash": "sha256-TSpqz6qYVRoqkEdOCawEQ4/cWt/4pracmvw17HK1tgE=",
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "rev": "3a44b8783514e7d6db4b63df96071b6c2b014b07",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1687729501,
@@ -160,6 +175,7 @@
       "inputs": {
         "atuinRepo": "atuinRepo",
         "idyllsPkgs": "idyllsPkgs",
+        "mozilla": "mozilla_2",
         "nixpkgs": "nixpkgs",
         "nixpkgsUnstable": "nixpkgsUnstable"
       }

flake.nix

@@ -10,13 +10,12 @@
       url = "github:ellie/atuin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    mozilla.url = "github:mozilla/nixpkgs-mozilla";
   };
 
-  outputs = { self, nixpkgs, nixpkgsUnstable, idyllsPkgs, atuinRepo }:
+  outputs = inputs:
     let mkhost = import ./machines/mkhost.nix;
-        mkhost' = system: args: mkhost system ({
-          inherit nixpkgs nixpkgsUnstable idyllsPkgs atuinRepo;
-        } // args);
+        mkhost' = name: args: mkhost inputs name args;
     in {
       nixosConfigurations.hera = mkhost' "hera" {
         system = "x86_64-linux";

machines/mkhost.nix

@@ -1,12 +1,14 @@
-name: { nixpkgs, idyllsPkgs, nixpkgsUnstable, atuinRepo, system, user }@inputs:
+inputs: name: { user, system }:
 
-let pkgs = import nixpkgs {
+let inherit (inputs) nixpkgs idyllsPkgs nixpkgsUnstable atuinRepo mozilla;
+    pkgs = import nixpkgs {
       inherit system;
       config.allowUnfree = true;
     };
-    pkgsUnstable = nixpkgsUnstable.legacyPackages.${system};
-    pkgsIdylls = idyllsPkgs.packages.${system};
-    pkgsAtuin = atuinRepo.packages.${system};
+    unstablePkgs = nixpkgsUnstable.legacyPackages.${system};
+    idyllsPkgs' = idyllsPkgs.packages.${system};
+    atuinPkgs = atuinRepo.packages.${system};
+    mozillaPkgs = pkgs.extend mozilla.overlays.firefox;
 in nixpkgs.lib.nixosSystem {
   modules = [
     ./${name}/configuration.nix
@@ -15,7 +17,8 @@ in nixpkgs.lib.nixosSystem {
 
     {
       config._module.args = {
-        inherit pkgsUnstable pkgsIdylls pkgsAtuin;
+        inherit unstablePkgs atuinPkgs mozillaPkgs;
+        idyllsPkgs = idyllsPkgs';
 
         pkgs = nixpkgs.lib.mkForce pkgs;
 

pkgs/packages.nix

@@ -1,7 +1,7 @@
 { nixpkgs, rustOverlay, nixpkgsDevel }: system:
 
 let pkgs = nixpkgs.legacyPackages.${system};
-    pkgsDevel = nixpkgsDevel.legacyPackages.${system};
+    develPkgs = nixpkgsDevel.legacyPackages.${system};
     rustPkgs = rustOverlay pkgs pkgs;
     buildRustPlatform = (import ./utils.nix).buildRustPlatform {
       inherit (rustPkgs) rustChannelOf;
@@ -10,5 +10,5 @@ let pkgs = nixpkgs.legacyPackages.${system};
 in {
   eww = pkgs.callPackage ./eww { inherit buildRustPlatform; };
   emacs = pkgs.callPackage (import ./emacs { inherit (pkgs) emacs; }) {};
-  runelite = pkgs.callPackage ./runelite { inherit (pkgsDevel) maven; };
+  runelite = pkgs.callPackage ./runelite { inherit (develPkgs) maven; };
 }

users/idylls/configuration.nix

@@ -1,4 +1,4 @@
-{ pkgs, pkgsUnstable, pkgsIdylls, pkgsAtuin, ... }:
+{ pkgs, unstablePkgs, idyllsPkgs, atuinPkgs, mozillaPkgs, ... }:
 
 {
   programs.fish.enable = true;
@@ -16,8 +16,8 @@
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
     packages = [
       # Dev Tools
-      pkgs.git pkgsIdylls.emacs pkgs.kitty pkgs.fd pkgsIdylls.eww pkgs.deno
-      pkgs.ripgrep pkgsAtuin.atuin pkgs.stow
+      pkgs.git idyllsPkgs.emacs pkgs.kitty pkgs.fd idyllsPkgs.eww pkgs.deno
+      pkgs.ripgrep atuinPkgs.atuin pkgs.stow
 
       # Desktop
       pkgs.rofi pkgs.i3 pkgs.sxhkd pkgs.keepassxc pkgs.dunst pkgs.slock
@@ -25,11 +25,25 @@
       pkgs.gnome.gnome-themes-extra pkgs.pavucontrol
 
       # Games
-      pkgsIdylls.runelite
+      idyllsPkgs.runelite
 
       # Applications
-      pkgs.firefox pkgs.discord pkgsUnstable.signal-desktop pkgs.chromium
-      pkgs.lxtask
+      (mozillaPkgs.lib.firefoxOverlay.firefoxVersion {
+        version = "116.0a1";
+        name = "Nightly";
+        release = false;
+        wmClass = "firefox-nightly";
+        info = {
+          chksum = "https://archive.mozilla.org/pub/firefox/nightly/2023/07/2023-07-02-09-24-54-mozilla-central/firefox-116.0a1.en-US.linux-x86_64.checksums";
+          chksumSig = null;
+          url = "https://ftp.mozilla.org/pub/firefox/nightly/2023/07/2023-07-02-09-24-54-mozilla-central/firefox-116.0a1.en-US.linux-x86_64.tar.bz2";
+          sha512 = "e72ce0fa09c829d3c62bc69512eb71a62ab94ad9911f375a65b1cea66549c6abbfa9c315e19ae498f931fd4c56dddfbc1fe350f4582c685030f06caa4e4b54d1";
+          sig = "https://ftp.mozilla.org/pub/firefox/nightly/2023/07/2023-07-02-09-24-54-mozilla-central/firefox-116.0a1.en-US.linux-x86_64.tar.bz2.asc";
+          sigSha512 = "1e1cc3572f4c55a7d838783438573ff268996639e1f31d292a4ad7e614ab8d4e8afdaefad7dfd6a1c0b93d96943f50044272ca53141d0792cb58d81407addd3b";
+        };
+      })
+      pkgs.discord unstablePkgs.signal-desktop
+      pkgs.chromium pkgs.lxtask
     ];
     shell = pkgs.fish;
   };