From f40dcbf0b7289c63e26756b2f6d747120d303b6f Mon Sep 17 00:00:00 2001
From: Miguel <m.i@gmx.at>
Date: Fri, 15 Apr 2022 16:31:17 +0200
Subject: fixup/cleanup nixops

---
 nix/nixops/nixops.nix | 25 +++++--------------------
 nix/shell.nix         | 21 +++++++++++++++++++--
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/nix/nixops/nixops.nix b/nix/nixops/nixops.nix
index f6d67a0..e1d953e 100644
--- a/nix/nixops/nixops.nix
+++ b/nix/nixops/nixops.nix
@@ -1,31 +1,16 @@
 {
-  network.description = "My first NixOS cluster";
+  network.description = "My NixOS Machinas";
   network.enableRollback = true;
-
-  aquarius = {
-    imports = [ ./aquarius/configuration.nix ];
-    deployment.targetHost = "aquarius";
-  };
+  network.storage.legacy.databasefile = "~/.nixops/deployments.nixops";
 
   comet = {
     imports = [ ./comet/configuration.nix ];
     deployment.targetHost = "comet.softwarefools.com";
   };
 
-  nixos-01 = {config, pkgs,...}:
-  {
-    imports = [ ./config-extra.nix ];
-    environment.systemPackages = with pkgs; [mc];
-    deployment.targetHost = "nixos-01";
-  };
-
-  nixos-02 = {
-    imports = [ ./config-extra.nix ];
-    deployment.targetHost = "nixos-02";
+  aquarius = {
+    imports = [ ./aquarius/configuration.nix ];
+    deployment.targetHost = "aquarius";
   };
 
-  nixos-03 = {
-    imports = [ ./config-extra.nix ];
-    deployment.targetHost = "nixos-03";
-  };
 }
diff --git a/nix/shell.nix b/nix/shell.nix
index 6318285..b4d0142 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -1,6 +1,23 @@
 { pkgs ? import <nixpkgs> {} }:
+/* https://githubhot.com/repo/NixOS/nixops/issues/1490?page=2 */
 with pkgs;
-mkShell {
+let packs = [
+   (pkgs.nixopsUnstable.override {
+     ## https://github.com/NixOS/nixops/issues/1490
+     overrides = (self: super: {
+       nixops = super.nixops.overridePythonAttrs (
+         _: {
+           src = pkgs.fetchgit {
+             url = "https://github.com/nixos/nixops";
+             rev = "35ac02085169bc2372834d6be6cf4c1bdf820d09";
+             sha256 = "1jh0jrxyywjqhac2dvpj7r7isjv68ynbg7g6f6rj55raxcqc7r3j";
+           };
+         }
+       );
+     });
+   })
+ ];
+in mkShell {
     # nativeBuildInputs is usually what you want -- tools you need to run
-    nativeBuildInputs = [ nixopsUnstable nixos-generators ];
+    nativeBuildInputs = packs;  /* -- [ nixopsUnstable nixos-generators ] */
 }
-- 
cgit v1.2.3