From 19c29c56ff8887d5ec54d8bffd67323322745a2a Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Fri, 8 May 2020 23:34:17 +0100
Subject: [PATCH] ops/nixos: fix things

---
 ops/nixos/lib/zfs.nix          | 4 ++--
 ops/nixos/marukuru/default.nix | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ops/nixos/lib/zfs.nix b/ops/nixos/lib/zfs.nix
index 78708bf2fa..a734233f5b 100644
--- a/ops/nixos/lib/zfs.nix
+++ b/ops/nixos/lib/zfs.nix
@@ -25,8 +25,8 @@ in
     };
 
     boot.initrd.postDeviceCommands = mkIf robCfg.enable
-      mkAfter ''
+      (mkAfter ''
         zfs rollback -r ${robCfg.snapshot}
-      '';
+      '');
   };
 }
diff --git a/ops/nixos/marukuru/default.nix b/ops/nixos/marukuru/default.nix
index e638928671..1e2c7bab54 100644
--- a/ops/nixos/marukuru/default.nix
+++ b/ops/nixos/marukuru/default.nix
@@ -142,8 +142,5 @@ in {
     };
   };
 
-  boot.kernel.sysctl."net.ipv4.tcp_congestion_control" = "bbr";
-  boot.kernel.sysctl."net.core.default_qdisc" = "fq_codel";
-
   system.stateVersion = "20.03";
 }