From 7715a89401c35cdfc4a00c2cbbbd959163bea0ec Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 15 Sep 2023 12:13:47 +0200
Subject: [PATCH] Fix deploy-rs, use flake binary again

Can be reverted once deploy-rs nixpkgs binary is up-to-date
See: https://github.com/serokell/deploy-rs/issues/232
---
 flake.nix       | 10 +---------
 shell/devos.nix |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index 71f94dad..4563cf4b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,14 +69,6 @@
       channels = {
         nixos = {
           imports = [(digga.lib.importOverlays ./overlays)];
-          overlays = [
-            (self: super: {
-              deploy-rs = {
-                inherit (inputs.nixos.legacyPackages.x86_64-linux) deploy-rs;
-                lib = inputs.deploy.lib.x86_64-linux;
-              };
-            })
-          ];
         };
         latest = {};
         fork = {};
@@ -182,7 +174,7 @@
           profilesOrder = ["system" "direnv"];
           profiles.direnv = {
             user = "barkeeper";
-            path = self.pkgs.x86_64-linux.nixos.deploy-rs.lib.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.barkeeper;
+            path = deploy.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.barkeeper;
           };
         };
         #example = {
diff --git a/shell/devos.nix b/shell/devos.nix
index 3a61ec3c..fd6a18c6 100644
--- a/shell/devos.nix
+++ b/shell/devos.nix
@@ -59,6 +59,6 @@ in {
     ]
     ++ lib.optionals (pkgs.stdenv.hostPlatform.isLinux && !pkgs.stdenv.buildPlatform.isDarwin) [
       (devos nixos-generators)
-      (devos deploy-rs.deploy-rs)
+      (devos inputs.deploy.packages.${pkgs.system}.deploy-rs)
     ];
 }