Upgrade

flake.nix

@@ -4,8 +4,7 @@
   inputs = {
     # Packages
     nixpkgs.url = "nixpkgs/nixos-24.11";
-    jjuinixpkgs.url = "github:Adda0/nixpkgs/jjui"; # Testing PR
-    labellenixpkgs.url = "github:FabianRig/nixpkgs/update-labelle-1.3.2"; # Current 24.11 version doesn't match dependencies
+    unixpkgs.url = "nixpkgs/master";
     # OS
     disko = {
       url = "disko";
@@ -40,6 +39,7 @@
     {
       self,
       nixpkgs,
+      unixpkgs,
       disko,
       nix-on-droid,
       flake-utils,
@@ -56,6 +56,17 @@
         overlays = [
           (import ./common/update-local-flakes/overlay.nix)
           nur.overlays.default
+          (
+            # Cherry-pick packages from future
+            self: super:
+            let
+              upkgs = import unixpkgs { inherit (super) system; };
+            in
+            {
+              jjui = upkgs.jjui;
+              labelle = upkgs.labelle;
+            }
+          )
         ];
       };
       homeManagerConfig = {
@@ -70,7 +81,11 @@
           }:
           nixpkgs.lib.nixosSystem {
             inherit system;
-            specialArgs = attrs;
+            specialArgs = attrs // {
+              upkgs = import unixpkgs {
+                inherit system;
+              };
+            };
             modules = modules ++ [
               self.nixosModules.dotfiles
               # nur.modules.nixos.default