replace unstable stuff with overlay

flake.nix

@@ -71,26 +71,35 @@
     ...
   } @ inputs: let
     systems = {
-      x86_64 = "x86_64-linux";
+      x86_64-linux = "x86_64-linux";
-      arm64 = "aarch64-linux";
+      aarch64-linux = "aarch64-linux";
-      darwin = "aarch64-darwin";
+      aarch64-darwin = "aarch64-darwin";
     };
+    unstableOverlay = final: prev: {
+      unstable = import nixpkgs-unstable {
+        system = prev.system;
+        config.allowUnfree = true;
+      };
+    };
+    # legacy
     stable_pkgs = builtins.mapAttrs (k: v: import nixpkgs {system = v;}) systems;
     unstable_pkgs = builtins.mapAttrs (k: v: import nixpkgs-unstable {system = v;}) systems;
   in {
     nixosConfigurations = {
       snowbelle = nixpkgs.lib.nixosSystem {
-        system = systems.x86_64;
+        system = systems.x86_64-linux;
         specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
         modules = [
+           { nixpkgs.overlays = [ unstableOverlay ]; }
           ./hosts/nixos/snowbelle/configuration.nix
           inputs.home-manager.nixosModules.default
         ];
       };
       yveltal = nixpkgs-unstable.lib.nixosSystem {
-        system = systems.x86_64;
+        system = systems.x86_64-linux;
         specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
         modules = [
+           { nixpkgs.overlays = [ unstableOverlay ]; }
           ./hosts/nixos/yveltal/configuration.nix
           ./hosts/nixos/yveltal/disko.nix
           inputs.home-manager-unstable.nixosModules.default
@@ -98,9 +107,10 @@
         ];
       };
       mew = nixpkgs-unstable.lib.nixosSystem {
-        system = systems.x86_64;
+        system = systems.x86_64-linux;
         specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
         modules = [
+           { nixpkgs.overlays = [ unstableOverlay ]; }
           ./hosts/nixos/mew/configuration.nix
           ./hosts/nixos/mew/disko.nix
           inputs.home-manager-unstable.nixosModules.default
@@ -108,26 +118,29 @@
         ];
       };
       vaniville = nixpkgs.lib.nixosSystem {
-        system = systems.x86_64;
+        system = systems.x86_64-linux;
         specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
         modules = [
+           { nixpkgs.overlays = [ unstableOverlay ]; }
           ./hosts/nixos/vaniville/configuration.nix
           inputs.home-manager.nixosModules.default
         ];
       };
       lumiose = nixpkgs.lib.nixosSystem {
-        system = systems.x86_64;
+        system = systems.x86_64-linux;
         specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
         modules = [
+           { nixpkgs.overlays = [ unstableOverlay ]; }
           ./hosts/nixos/lumiose/configuration.nix
           inputs.home-manager.nixosModules.default
           inputs.disko.nixosModules.disko
         ];
       };
        wsl = nixpkgs.lib.nixosSystem {
-        system = systems.x86_64;
+        system = systems.x86_64-linux;
         specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
         modules = [
+           { nixpkgs.overlays = [ unstableOverlay ]; }
           ./hosts/nixos/wsl/configuration.nix
           nixos-wsl.nixosModules.default
           inputs.home-manager.nixosModules.default
@@ -136,9 +149,10 @@
    };
     darwinConfigurations = {
       cen-it-07 = nix-darwin.lib.darwinSystem {
-        system = systems.darwin;
+        system = systems.aarch64-darwin;
         specialArgs = {inherit inputs stable_pkgs unstable_pkgs nix-homebrew;};
         modules = [
+           { nixpkgs.overlays = [ unstableOverlay ]; }
           ./hosts/darwin/cen-it-07/configuration.nix
           inputs.home-manager.darwinModules.default
         ];

hosts/nixos/default.nix

@@ -3,6 +3,7 @@
   config,
   lib,
   inputs,
+  unstable_pkgs,
   ...
 }: {
   imports = [
@@ -75,9 +76,10 @@
     pciutils
     lm_sensors
     smartmontools
-    siomon
+    unstable.siomon
   ];
 
+
   # nice to have passwordless sudo
   security.sudo = {
     extraRules = [

modules/homelab/services/immich/default.nix

@@ -65,7 +65,7 @@ in {
     services.${service} = {
       enable = true;
       #package = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.immich;
-      package = unstable_pkgs.x86_64.immich;
+      package = pkgs.unstable.immich;
       openFirewall = true;
       user = service;
       group = service;

modules/homelab/services/vaultwarden/default.nix

@@ -62,7 +62,7 @@ in
     # enable the vaultwarden service
     services.${service} = {
       enable = true;
-      package = unstable_pkgs.x86_64.vaultwarden;
+      package = pkgs.unstable.vaultwarden;
       config = {
         DOMAIN = domain;
         ROCKET_ADDRESS = "0.0.0.0";