From cae4d6481bbc6e4a14962fa3f7ad983679c1f93a Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Sat, 3 Jun 2023 13:47:20 +0200
Subject: [PATCH] Use internal deploy-rs so we don't need to rebuild

---
 .github/workflows/deploy.yml | 8 ++++----
 flake.nix                    | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index de9ecf5..427d713 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -22,9 +22,6 @@ jobs:
         extra_nix_config: |
           # Enable flakes
           experimental-features = nix-command flakes
-          # Import my substituters
-          extra-substituters = "https://natsukagami.cachix.org"
-          trusted-public-keys = "natsukagami.cachix.org-1:3U6GV8i8gWEaXRUuXd2S4ASfYgdl2QFPWg4BKPbmYiQ="
     - name: Run format check
       run: |
         nix fmt
@@ -72,11 +69,14 @@ jobs:
           experimental-features = nix-command flakes
           # Deploy tokens
           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+          # Import my substituters
+          extra-substituters = "https://natsukagami.cachix.org"
+          trusted-public-keys = "natsukagami.cachix.org-1:3U6GV8i8gWEaXRUuXd2S4ASfYgdl2QFPWg4BKPbmYiQ="
     - name: Deploy with deploy-rs
       env:
         SSH_AUTH_SOCK: /tmp/ssh_agent.sock
       run: |
-        nix run github:serokell/deploy-rs -- . --hostname ${{ secrets.INSTANCE_IP }} -s -- -L
+        nix run .#deploy-rs -- . --hostname ${{ secrets.INSTANCE_IP }} -s -- -L
     - name: Notify deployment succeeding
       run: |
         git show --no-patch | curl \
diff --git a/flake.nix b/flake.nix
index 737b2d7..149ed2e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -120,6 +120,9 @@
     {
       overlays.default = lib.composeManyExtensions overlays;
 
+      packages.x86_64-linux.deploy-rs = deploy-rs.packages.x86_64-linux.default;
+      apps.x86_64-linux.deploy-rs = deploy-rs.apps.x86_64-linux.default;
+
       # MacBook configuration: nix-darwin + home-manager
       darwinConfigurations."nki-macbook" = darwin.lib.darwinSystem rec {
         system = "aarch64-darwin";