From e9028bf2bcc3600a5e4450ffe9a4a39850bfcfb6 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 1 Jun 2022 00:52:49 +0200
Subject: [PATCH] 22.05 compat

---
 nixos/roles/default.nix         | 2 +-
 overlays/pkgSets.nix            | 3 +--
 overlays/writeHaskellScript.nix | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix
index 23940238..9512c10f 100644
--- a/nixos/roles/default.nix
+++ b/nixos/roles/default.nix
@@ -30,7 +30,7 @@
     );
   };
 
-  security.acme = {
+  security.acme.defaults = {
     email = "security@maralorn.de";
     acceptTerms = true;
   };
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index d9103b0f..4ba46cd6 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -10,7 +10,7 @@ self: super: {
       file
       wget
       curl
-      wireguard
+      wireguard-tools
       gnupg
       mutt
       bind
@@ -47,7 +47,6 @@ self: super: {
       tig
       exa
       fzf
-      ag
       fd
       bat
       ripgrep
diff --git a/overlays/writeHaskellScript.nix b/overlays/writeHaskellScript.nix
index 810b2ef7..59b2fb8e 100644
--- a/overlays/writeHaskellScript.nix
+++ b/overlays/writeHaskellScript.nix
@@ -78,7 +78,7 @@ in {
       import qualified Data.ByteString.Lazy as LBS
       import qualified Data.ByteString as BS
       import qualified Data.Text as Text
-      import System.Environment (getArgs, setEnv)
+      import System.Environment (setEnv)
       import Control.Exception (bracket, try)
       import Data.String.Interpolate (i)
       import Control.Concurrent.Async