From d46fde5bf28ab80ecc91538558e568ae32fd5616 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 1 Dec 2021 22:09:51 +0800
Subject: [PATCH] nixops: nixos 21.11 WIP

---
 nixops/any-nix-shell.nix | 27 ---------------------------
 nixops/desktop.nix       |  4 ++--
 nixops/light.nix         |  7 ++++++-
 nixops/nixops.nix        |  4 ++++
 nixops/rpi-server.nix    |  5 +++++
 nixops/rpi.nix           |  5 +++++
 6 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100644 nixops/any-nix-shell.nix

diff --git a/nixops/any-nix-shell.nix b/nixops/any-nix-shell.nix
deleted file mode 100644
index 3bd41a5..0000000
--- a/nixops/any-nix-shell.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  pname = "any-nix-shell";
-  version = "1.2.1";
-
-  src = fetchFromGitHub {
-    owner = "haslersn";
-    repo = "any-nix-shell";
-    rev = "v${version}";
-    sha256 = "0q27rhjhh7k0qgcdcfm8ly5za6wm4rckh633d0sjz87faffkp90k";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -r bin $out
-    wrapProgram $out/bin/any-nix-shell --prefix PATH ":" $out/bin
-  '';
-
-  meta = with lib; {
-    description = "fish and zsh support for nix-shell";
-    license = licenses.mit;
-    homepage = "https://github.com/haslersn/any-nix-shell";
-    maintainers = with maintainers; [ haslersn ];
-  };
-}
diff --git a/nixops/desktop.nix b/nixops/desktop.nix
index 2ea9d40..686a399 100644
--- a/nixops/desktop.nix
+++ b/nixops/desktop.nix
@@ -60,7 +60,7 @@ in
     })
     pkgs-unstable.joplin-desktop
     virt-manager spice-gtk
-    (callPackage ./any-nix-shell.nix {})
+    any-nix-shell
   ];
   programs.wireshark.enable = true;
   programs.wireshark.package = pkgs.wireshark;
@@ -159,7 +159,7 @@ in
   nix.binaryCaches = ["https://nixbld.m-labs.hk" "https://cache.nixos.org"];
   nix.sandboxPaths = ["/opt"];
 
-  nix.package = pkgs.nixUnstable;
+  nix.package = pkgs.nix_2_4;
   nix.extraOptions = ''
     experimental-features = nix-command flakes
   '';
diff --git a/nixops/light.nix b/nixops/light.nix
index 9b2dc0d..d55afd0 100644
--- a/nixops/light.nix
+++ b/nixops/light.nix
@@ -42,7 +42,7 @@ in
     telnet unzip zip gnupg
     sublime3 rink
     tmux screen tigervnc
-    (callPackage ./any-nix-shell.nix {})
+    any-nix-shell
   ];
   programs.wireshark.enable = true;
 
@@ -133,4 +133,9 @@ in
   nix.binaryCachePublicKeys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="];
   nix.binaryCaches = ["https://nixbld.m-labs.hk" "https://cache.nixos.org"];
   nix.sandboxPaths = ["/opt"];
+
+  nix.package = pkgs.nix_2_4;
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
 }
diff --git a/nixops/nixops.nix b/nixops/nixops.nix
index 230e822..24b9364 100644
--- a/nixops/nixops.nix
+++ b/nixops/nixops.nix
@@ -1,4 +1,8 @@
 {
+  network.storage.legacy = {
+     databasefile = "~/.nixops/deployments.nixops";
+  };
+
   network.enableRollback = true;
 
   rpi-1 = import ./rpi.nix { host = "rpi-1"; rpi4 = true; };
diff --git a/nixops/rpi-server.nix b/nixops/rpi-server.nix
index 728f506..d02c663 100644
--- a/nixops/rpi-server.nix
+++ b/nixops/rpi-server.nix
@@ -145,4 +145,9 @@
   nix.binaryCachePublicKeys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="];
   nix.binaryCaches = ["https://cache.nixos.org" "https://nixbld.m-labs.hk"];
   nix.trustedUsers = ["root" "nix"];
+
+  nix.package = pkgs.nix_2_4;
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
 }
diff --git a/nixops/rpi.nix b/nixops/rpi.nix
index dad6963..ed3fd60 100644
--- a/nixops/rpi.nix
+++ b/nixops/rpi.nix
@@ -80,4 +80,9 @@ in
   nix.binaryCachePublicKeys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="];
   nix.binaryCaches = ["https://cache.nixos.org" "https://nixbld.m-labs.hk"];
   nix.trustedUsers = ["root" "nix" "sb"];
+
+  nix.package = pkgs.nix_2_4;
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
 }