From 320dd89e65a507ac09af92df6550e68b1a416d1b Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 3 Dec 2021 01:48:01 +0100
Subject: [PATCH] Bump to nixos 21.11

---
 channels.nix                | 10 +++-------
 overlays/10-previews.nix    |  5 +----
 overlays/mumble/default.nix |  4 ++--
 overlays/pkgSets.nix        |  2 +-
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/channels.nix b/channels.nix
index 201a3140..b52c17e9 100644
--- a/channels.nix
+++ b/channels.nix
@@ -1,10 +1,6 @@
 let
-  nixos-21-05 = {
-    nixpkgs-channel = "nixos-21.05";
-    home-manager-channel = "home-manager-21.05";
-  };
   nixos-21-11 = {
-    nixpkgs-channel = "nixos-unstable";
+    nixpkgs-channel = "nixos-21.11";
     home-manager-channel = "home-manager-21.11";
   };
   unstable = {
@@ -13,8 +9,8 @@ let
   };
 in
 rec {
-  hera = nixos-21-05;
-  apollo = nixos-21-05;
+  hera = nixos-21-11;
+  apollo = nixos-21-11;
   zeus = nixos-21-11;
   chor-cloud = hera;
 }
diff --git a/overlays/10-previews.nix b/overlays/10-previews.nix
index 153c5e7e..8d4c68a4 100644
--- a/overlays/10-previews.nix
+++ b/overlays/10-previews.nix
@@ -5,11 +5,8 @@ in
 {
   inherit unstable;
   inherit (unstable) cachix nix-output-monitor cabal2nix;
-  nix = unstable.nix;
-  nix-du = unstable.nix-du;
+  nix = self.nix_2_4;
   unstableHaskellPackages = unstable.haskellPackages;
   unstableGhc = unstable.ghc;
-  mautrix-signal = unstable.mautrix-signal;
-  signald = unstable.signald;
   home-assistant = unstable.home-assistant;
 }
diff --git a/overlays/mumble/default.nix b/overlays/mumble/default.nix
index 1f32c3bd..fcf843d9 100644
--- a/overlays/mumble/default.nix
+++ b/overlays/mumble/default.nix
@@ -1,6 +1,6 @@
 final: prev: {
-  inherit (final.unstable.callPackage ./package.nix {
-    avahi = final.unstable.avahi-compat;
+  inherit (final.callPackage ./package.nix {
+    avahi = final.avahi-compat;
     jackSupport = false;
     speechdSupport = false;
     pulseSupport = true;
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index be810bf7..112d0030 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -1,6 +1,6 @@
 self: super: {
   # pkgs assumed to be present on a non nixos host
-  nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.unstable.nix}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"'';
+  nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.nix}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"'';
   core-system-pkgs = {
     inherit (self)
       gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping