From 29f7073384924115061df3aeb4588180e335aea6 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Tue, 7 Dec 2021 19:13:04 +0000
Subject: [PATCH] ops/nixos: compatibility with NixOS 22.05

---
 ops/nixos/lib/common.nix         | 3 +++
 ops/nixos/porcorosso/default.nix | 1 +
 ops/nixos/swann/default.nix      | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ops/nixos/lib/common.nix b/ops/nixos/lib/common.nix
index 6aee1ae919..284b1d5933 100644
--- a/ops/nixos/lib/common.nix
+++ b/ops/nixos/lib/common.nix
@@ -63,6 +63,7 @@ in
 
     nix = {
       nixPath = [ "depot=/home/lukegb/depot/" "nixpkgs=/home/lukegb/depot/third_party/nixpkgs/" ];
+      package = pkgs.nix_2_3;  # Use a working nix.
       trustedUsers = [ "root" "@wheel" "deployer" ];
       binaryCaches = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ];
       trustedBinaryCaches = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ];
@@ -73,6 +74,8 @@ in
     };
     nixpkgs.config = depot.third_party.nixpkgsConfig;
 
+    documentation.nixos.enable = false;  # I just use the website.
+
     i18n.defaultLocale = "en_GB.UTF-8";
     console.keyMap = "us";
 
diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix
index eab1fe436a..e573dd78f6 100644
--- a/ops/nixos/porcorosso/default.nix
+++ b/ops/nixos/porcorosso/default.nix
@@ -166,6 +166,7 @@ in {
   services.xserver.displayManager.gdm = {
     enable = true;
     wayland = false;
+    nvidiaWayland = false;
   };
 
   hardware.opengl.driSupport32Bit = true;
diff --git a/ops/nixos/swann/default.nix b/ops/nixos/swann/default.nix
index 6dc8904600..ec5e37e128 100644
--- a/ops/nixos/swann/default.nix
+++ b/ops/nixos/swann/default.nix
@@ -391,7 +391,7 @@ in {
     protocol = "cloudflare";
     domains = ["home.lukegb.com"];
     zone = "lukegb.com";
-    password = secrets.cloudflareCredentials.token;
+    passwordFile = pkgs.writeText "cloudflare-token" secrets.cloudflareCredentials.token;
     use = "if";
     extraConfig = ''
       if=en-virginmedia