From 5eaee95ba1b6f41979eb66cd85bb1173241b93e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 30 Mar 2021 23:18:56 +0200
Subject: [PATCH] feat: update krops and ease toum deployment

---
 .versions/krops.json | 8 ++++----
 deploy.nix           | 6 ++++--
 shell.nix            | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.versions/krops.json b/.versions/krops.json
index 0211ca0..4048ac7 100644
--- a/.versions/krops.json
+++ b/.versions/krops.json
@@ -1,9 +1,9 @@
 {
   "url": "https://cgit.krebsco.de/krops",
-  "rev": "55aa2c77ce8183f3d2b24f54efa33ab6a42e1e02",
-  "date": "2020-04-19T01:06:20+02:00",
-  "path": "/nix/store/08wg2yrcgkr6iwipjd6g0fbwb7gacqax-krops",
-  "sha256": "00rvx9h596ync8wgic6xc9srzajzm28wlp9q7mv4z0jsb27l5bj8",
+  "rev": "cccebf3ff7a53336b3f106cb96dddd5892d427ed",
+  "date": "2021-03-23T22:47:37+01:00",
+  "path": "/nix/store/mz13xxnil35lwsf90hwnrm2agir7hb51-krops",
+  "sha256": "07mg3iaqjf1w49vmwfchi7b1w55bh7rvsbgicp2m47gnj9alwdb6",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/deploy.nix b/deploy.nix
index a4fa9b9..a2060e1 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -18,7 +18,7 @@ let
       system.file = toString path;
       nixos-config.symlink = "system/configuration.nix";
 
-      nixpkgs.git = gitFromJson .versions/nixpkgs.json;
+      nixpkgs.git = gitFromJson .versions/nixpkgs.json // { shallow = true; };
       home-manager.git = gitFromJson .versions/home-manager.json;
       stockholm.git = gitFromJson .versions/stockholm.json;
       retiolum.git = gitFromJson .versions/retiolum.json;
@@ -49,7 +49,9 @@ in {
     path = systems/toum;
     name = "toum";
     address = "toum.r";
-  });
+  }) // {
+    buildTarget = "${builtins.getEnv "USER"}@localhost/${builtins.getEnv "HOME"}/.cache/krops";
+  };
   makanek = writeDeploy "deploy-makanek" (regularSystem {
     path = systems/makanek;
     name = "makanek";
diff --git a/shell.nix b/shell.nix
index 9cf7c66..921df98 100644
--- a/shell.nix
+++ b/shell.nix
@@ -16,7 +16,7 @@ let
       path = toString .versions/home-manager.json;
     };
     krops = {
-      ref = "refs/tags/v1.21.0";
+      ref = "refs/tags/v1.25.0";
       url = "https://cgit.krebsco.de/krops";
       path = toString .versions/krops.json;
     };