diff --git a/system/flakes/adsb-antenna.nix b/system/flakes/adsb-antenna.nix
index 996a494..96f832f 100644
--- a/system/flakes/adsb-antenna.nix
+++ b/system/flakes/adsb-antenna.nix
@@ -4,11 +4,13 @@ let
   default-system = "aarch64-linux";
 
   overlay-attic = inputs.attic.overlays.default;
+  overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       overlay-attic
+      overlay-deploy-rs
       overlay-nifoc
     ];
 
@@ -36,9 +38,12 @@ rec {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
         nix.registry.nixpkgs.flake = nixpkgs;
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.users.daniel = import ../../home/hosts/adsb-antenna.nix;
+
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.daniel = import ../../home/hosts/adsb-antenna.nix;
+        };
       }
     ];
   };
diff --git a/system/flakes/argon.nix b/system/flakes/argon.nix
index 086aee7..19ecb48 100644
--- a/system/flakes/argon.nix
+++ b/system/flakes/argon.nix
@@ -4,11 +4,13 @@ let
   default-system = "aarch64-linux";
 
   overlay-attic = inputs.attic.overlays.default;
+  overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       overlay-attic
+      overlay-deploy-rs
       overlay-nifoc
     ];
 
@@ -38,9 +40,12 @@ rec {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
         nix.registry.nixpkgs.flake = nixpkgs;
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.users.daniel = import ../../home/hosts/argon.nix;
+
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.daniel = import ../../home/hosts/argon.nix;
+        };
       }
     ];
   };
diff --git a/system/flakes/mediaserver.nix b/system/flakes/mediaserver.nix
index 1efeb95..4705ff4 100644
--- a/system/flakes/mediaserver.nix
+++ b/system/flakes/mediaserver.nix
@@ -4,11 +4,13 @@ let
   default-system = "x86_64-linux";
 
   overlay-attic = inputs.attic.overlays.default;
+  overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       overlay-attic
+      overlay-deploy-rs
       overlay-nifoc
     ];
 
@@ -36,9 +38,12 @@ rec {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
         nix.registry.nixpkgs.flake = nixpkgs;
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.users.daniel = import ../../home/hosts/mediaserver.nix;
+
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.daniel = import ../../home/hosts/mediaserver.nix;
+        };
       }
     ];
   };
diff --git a/system/flakes/tanker.nix b/system/flakes/tanker.nix
index 6288896..9014f4e 100644
--- a/system/flakes/tanker.nix
+++ b/system/flakes/tanker.nix
@@ -4,11 +4,13 @@ let
   default-system = "x86_64-linux";
 
   # overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
+  overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       # overlay-master
+      overlay-deploy-rs
       overlay-nifoc
     ];
 
@@ -40,9 +42,12 @@ rec {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
         nix.registry.nixpkgs.flake = nixpkgs;
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.users.daniel = import ../../home/hosts/tanker.nix;
+
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.daniel = import ../../home/hosts/tanker.nix;
+        };
       }
     ];
   };
diff --git a/system/flakes/weather-sdr.nix b/system/flakes/weather-sdr.nix
index bf9e644..209cccb 100644
--- a/system/flakes/weather-sdr.nix
+++ b/system/flakes/weather-sdr.nix
@@ -4,11 +4,13 @@ let
   default-system = "aarch64-linux";
 
   overlay-attic = inputs.attic.overlays.default;
+  overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       overlay-attic
+      overlay-deploy-rs
       overlay-nifoc
     ];
 
@@ -36,9 +38,12 @@ rec {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
         nix.registry.nixpkgs.flake = nixpkgs;
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.users.daniel = import ../../home/hosts/weather-sdr.nix;
+
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.daniel = import ../../home/hosts/weather-sdr.nix;
+        };
       }
     ];
   };