From 2283dd67c653f831fb5ddc437931d6bbdbe7b3fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Thu, 30 Dec 2021 03:01:26 +0100
Subject: [PATCH] feat: streamline krops experience

---
 .versions/krops.json |  8 ++--
 deploy.nix           | 89 ++++++++++++++++----------------------------
 shell.nix            |  2 +-
 3 files changed, 38 insertions(+), 61 deletions(-)

diff --git a/.versions/krops.json b/.versions/krops.json
index 9ecec29..bdb4556 100644
--- a/.versions/krops.json
+++ b/.versions/krops.json
@@ -1,9 +1,9 @@
 {
   "url": "https://cgit.krebsco.de/krops",
-  "rev": "cccebf3ff7a53336b3f106cb96dddd5892d427ed",
-  "date": "2021-03-23T22:47:37+01:00",
-  "path": "/nix/store/mz13xxnil35lwsf90hwnrm2agir7hb51-krops",
-  "sha256": "07mg3iaqjf1w49vmwfchi7b1w55bh7rvsbgicp2m47gnj9alwdb6",
+  "rev": "13ae434b140035e7e2664bd5a8ef4c475413b2e0",
+  "date": "2021-11-20T15:46:09+01:00",
+  "path": "/nix/store/ig76yx6z8wmc9papmxg5xnjhl9l22dvb-krops",
+  "sha256": "0mzn213dh3pklvdzfpwi4nin4lncdap447zvl11j81r809jll76j",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/deploy.nix b/deploy.nix
index e4dcbab..90f8092 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -1,68 +1,45 @@
 let
-  inherit (import ./lib/default.nix) sshPort;
+  krops = builtins.fetchGit (gitFromJson .versions/krops.json);
+  lib = import "${krops}/lib";
+  pkgs = import "${krops}/pkgs" {};
 
+  importJson = (import <nixpkgs> {}).lib.importJSON;
   gitFromJson = path:
-    let object = importJson path;
+    let
+      object = importJson path;
     in {
       inherit (object) url;
       ref = object.rev;
     };
-  krops = builtins.fetchGit (gitFromJson .versions/krops.json);
-  lib = import "${krops}/lib";
-  pkgs = import "${krops}/pkgs" { };
-  importJson = (import <nixpkgs> { }).lib.importJSON;
 
-  regularSystem = { path, name, address }: {
-    source = lib.evalSource [{
-      niveum.file = toString ./.;
-      system.file = toString path;
-      nixos-config.symlink = "system/configuration.nix";
+  source = name: {
+    niveum.file = toString ./.;
+    nixos-config.symlink =  "niveum/systems/${name}/configuration.nix";
 
-      nixpkgs.git = gitFromJson .versions/nixpkgs.json // { shallow = true; };
-      nixpkgs-unstable.git = gitFromJson .versions/nixpkgs-unstable.json // { shallow = true; };
-      home-manager.git = gitFromJson .versions/home-manager.json;
-      stockholm.git = gitFromJson .versions/stockholm.json;
-      nix-writers.git = gitFromJson .versions/nix-writers.json;
-      retiolum.git = gitFromJson .versions/retiolum.json;
-      nixpkgs-mozilla.git = gitFromJson .versions/nixpkgs-mozilla.json;
-      system-secrets.pass = {
-        dir = toString ~/.password-store;
-        name = "systems/${name}";
-      };
-      secrets.pass = {
-        dir = toString ~/.password-store;
-        name = "shared";
-      };
-    }];
-    target = "root@${address}:${toString sshPort}";
+    nixpkgs.git = gitFromJson .versions/nixpkgs.json // { shallow = true; };
+    nixpkgs-unstable.git = gitFromJson .versions/nixpkgs-unstable.json // { shallow = true; };
+    home-manager.git = gitFromJson .versions/home-manager.json;
+    stockholm.git = gitFromJson .versions/stockholm.json;
+    nix-writers.git = gitFromJson .versions/nix-writers.json;
+    retiolum.git = gitFromJson .versions/retiolum.json;
+    nixpkgs-mozilla.git = gitFromJson .versions/nixpkgs-mozilla.json;
+    system-secrets.pass = {
+      dir = toString ~/.password-store;
+      name = "systems/${name}";
+    };
+    secrets.pass = {
+      dir = toString ~/.password-store;
+      name = "shared";
+    };
+  };
+
+  system = {name, host}: let inherit (import ./lib/default.nix) sshPort; in pkgs.krops.writeDeploy "deploy-${name}" {
+    source = lib.evalSource [ (source name) ];
+    target = "root@${host}:${toString sshPort}";
   };
-  inherit (pkgs.krops) writeDeploy;
 in {
-  zaatar = writeDeploy "deploy-zaatar" (regularSystem {
-    path = systems/zaatar;
-    name = "zaatar";
-    address = "zaatar.r";
-  });
-  kabsa = writeDeploy "deploy-kabsa" (regularSystem {
-    path = systems/kabsa;
-    name = "kabsa";
-    address = "kabsa.r";
-  });
-  toum = writeDeploy "deploy-toum" (regularSystem {
-    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";
-    address = "makanek.r";
-  });
-  manakish = writeDeploy "deploy-manakish" (regularSystem {
-    path = systems/manakish;
-    name = "manakish";
-    address = "manakish.r";
-  });
+  zaatar = system { name = "zaatar"; host = "zaatar.r"; };
+  kabsa = system { name = "kabsa"; host = "kabsa.r"; };
+  makanek = system { name = "makanek"; host = "makanek.r"; };
+  manakish = system { name = "manakish"; host = "manakish.r"; };
 }
diff --git a/shell.nix b/shell.nix
index b5ed1b0..e69801f 100644
--- a/shell.nix
+++ b/shell.nix
@@ -26,7 +26,7 @@ let
       path = toString .versions/home-manager.json;
     };
     krops = {
-      ref = "refs/tags/v1.25.0";
+      ref = "refs/tags/1.26.2";
       url = "https://cgit.krebsco.de/krops";
       path = toString .versions/krops.json;
     };