Renamed unstable to unstablePkgs to avoid confusion with nixos-unstable flake

flake.nix

@@ -18,20 +18,22 @@
       wrapPkgsSystem = { system }:
         import nixpkgs rec {
           inherit system;
-          unstable = wrapUnstablePkgsSystem { inherit system; };
+          
+          unstablePkgs = wrapUnstablePkgsSystem { inherit system; };
           config.allowUnfree = true;
           overlays = [
-            (final: prev: { inherit unstable; })
+            (final: prev: { inherit unstablePkgs; })
           ];
         };
 
       wrapUnstablePkgsSystem = { system }:
         import nixos-unstable {
           inherit system;
+          
           config.allowUnfree = true;
         };
 
-      wrapUtils = { pkgs, unstable, system }:
+      wrapUtils = { pkgs, unstablePkgs, system }:
         let
           inherit (pkgs.lib) makeScope;
           inherit (pkgs) newScope;
@@ -48,15 +50,15 @@
 
       pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; };
       unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX64; };
-      utilsLinuxX64 = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64; unstable = unstableLinuxX64; };
+      utilsLinuxX64 = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64; unstablePkgs = unstableLinuxX64; };
 
       pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; };
       unstableLinuxAarch = wrapUnstablePkgsSystem { system = sysLinuxAarch; };
-      utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; unstable = unstableLinuxAarch; };
+      utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; unstablePkgs = unstableLinuxAarch; };
 
       pkgsDarwin = wrapPkgsSystem { system = sysDarwin; };
       unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwin; };
-      utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; unstable = unstableDarwin; };
+      utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; unstablePkgs = unstableDarwin; };
     in
     {
       nixosConfigurations = {

hosts/architect/invidious.nix

@@ -9,7 +9,7 @@ in
     invidious = {
       enable = true;
       port = 9092;
-      package = pkgs.unstable.invidious;
+      package = pkgs.unstablePkgs.invidious;
     };
 
     nginx.virtualHosts.${domain} = {

hosts/architect/jellyfin.nix

@@ -13,7 +13,7 @@ in
     jellyfin = {
       enable = true;
       group = "media";
-      package = pkgs.unstable.jellyfin;
+      package = pkgs.unstablePkgs.jellyfin;
     };
 
     nginx.virtualHosts.${domain} = {

hosts/architect/minecraft.nix

@@ -9,7 +9,7 @@ in
     enable = true;
     eula = true;
     declarative = true;
-    package = pkgs.unstable.minecraft-server;
+    package = pkgs.unstablePkgs.minecraft-server;
     serverProperties = { motd = "Welcome on the RuNas server!"; };
   };
 

hosts/architect/nextcloud.nix

@@ -9,7 +9,7 @@ in
   services = {
     mysql = {
       enable = true;
-      package = pkgs.unstable.mysql80;
+      package = pkgs.unstablePkgs.mysql80;
     };
 
     redis = {
@@ -24,7 +24,7 @@ in
       enable = true;
       hostName = domain;
       https = true;
-      package = pkgs.unstable.nextcloud25;
+      package = pkgs.unstablePkgs.nextcloud25;
       datadir = "/services/nextcloud";
       caching = {
         redis = true;

hosts/architect/nitter.nix

@@ -12,7 +12,7 @@ in
       server = {
         port = 9093;
         hostname = domain;
-        staticDir = "${pkgs.unstable.nitter}/share/nitter/public";
+        staticDir = "${pkgs.unstablePkgs.nitter}/share/nitter/public";
       };
       preferences = {
         replaceYouTube = "tube.giugl.io";

hosts/architect/plex.nix

@@ -7,7 +7,7 @@ in
 {
   services.plex = {
     enable = true;
-    package = pkgs.unstable.plex;
+    package = pkgs.unstablePkgs.plex;
     dataDir = "/plex";
   };
 

lib/host.nix

@@ -1,7 +1,7 @@
 { pkgs
 , nixpkgs
 , nixos-unstable
-, unstable
+, unstablePkgs
 , home-manager
 , system
 , mkHomeRole
@@ -50,7 +50,7 @@
 
           home-manager = {
             users.root.imports = pkgs.lib.singleton (mkHomeRole "common");
-            extraSpecialArgs.unstable = unstable;
+            extraSpecialArgs.unstablePkgs = unstablePkgs;
             useGlobalPkgs = true;
           };
 

roles/gnome.nix

@@ -22,7 +22,7 @@
   environment.systemPackages = with pkgs; [
     gnomeExtensions.appindicator
     gnomeExtensions.sound-output-device-chooser
-    pkgs.unstable.gnomeExtensions.pop-shell
+    pkgs.unstablePkgs.gnomeExtensions.pop-shell
   ];
   security.pam.services.gdm.enableGnomeKeyring = true;
 }

roles/home/helix.nix

@@ -33,7 +33,7 @@
       formatter = { command = "nixpkgs-fmt" }
     '';
 
-    packages = with pkgs.unstable; [
+    packages = with pkgs.unstablePkgsPkgs; [
       helix
       clang-tools
       rust-analyzer