From e164a3beeb12066c67eb0c16c7cf7384140e649d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Fri, 2 Feb 2024 15:44:59 +0200
Subject: [PATCH] remove mkDeployPkgs*

---
 flake.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index 651f72a..5c9ddce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -88,12 +88,7 @@
     ...
   } @ inputs: let
     myData = import ./data.nix;
-    mkDeployPkgs = system:
-      import nixpkgs {inherit system overlays;};
-    deployPkgsIA64 = mkDeployPkgs "x86_64-linux";
-    deployPkgsArm64 = mkDeployPkgs "aarch64-linux";
-    # accepting "system" argument in case we need to construct
-    # nixpkgs-unstable. See git log around the switch from 23.05 to 23.11.
+
     overlays = [
       nur.overlay
       e11sync.overlays.default
@@ -241,7 +236,7 @@
             system = {
               sshUser = "motiejus";
               path =
-                deployPkgsIA64.deploy-rs.lib.activate.nixos self.nixosConfigurations.vno1-oh2;
+                self.nixosConfigurations.vno1-oh2.pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.vno1-oh2;
               user = "root";
             };
           };
@@ -253,7 +248,7 @@
             system = {
               sshUser = "motiejus";
               path =
-                deployPkgsIA64.deploy-rs.lib.activate.nixos self.nixosConfigurations.fwminex;
+                self.nixosConfigurations.fwminex.pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.fwminex;
               user = "root";
             };
           };
@@ -265,7 +260,7 @@
             system = {
               sshUser = "motiejus";
               path =
-                deployPkgsArm64.deploy-rs.lib.activate.nixos self.nixosConfigurations.vno3-rp3b;
+                self.nixosConfigurations.vno3-rp3b.pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.vno3-rp3b;
               user = "root";
             };
           };
@@ -277,7 +272,7 @@
             system = {
               sshUser = "motiejus";
               path =
-                deployPkgsArm64.deploy-rs.lib.activate.nixos self.nixosConfigurations.fra1-a;
+                self.nixosConfigurations.fra1-a.pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.fra1-a;
               user = "root";
             };
           };