From ca941e19f3e25f2f4ed2f92d1297792b9267143e Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sat, 24 Aug 2024 22:05:36 +0200
Subject: [PATCH] nixos/services.matrix-appservice-irc: remove `with lib;`

---
 .../services/matrix/appservice-irc.nix        | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/matrix/appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix
index f4539a90f2e6..55a04059abe4 100644
--- a/nixos/modules/services/matrix/appservice-irc.nix
+++ b/nixos/modules/services/matrix/appservice-irc.nix
@@ -1,7 +1,4 @@
 { config, pkgs, lib, ... }:
-
-with lib;
-
 let
   cfg = config.services.matrix-appservice-irc;
 
@@ -25,29 +22,29 @@ let
   '';
   registrationFile = "/var/lib/matrix-appservice-irc/registration.yml";
 in {
-  options.services.matrix-appservice-irc = with types; {
-    enable = mkEnableOption "the Matrix/IRC bridge";
+  options.services.matrix-appservice-irc = with lib.types; {
+    enable = lib.mkEnableOption "the Matrix/IRC bridge";
 
-    port = mkOption {
+    port = lib.mkOption {
       type = port;
       description = "The port to listen on";
       default = 8009;
     };
 
-    needBindingCap = mkOption {
+    needBindingCap = lib.mkOption {
       type = bool;
       description = "Whether the daemon needs to bind to ports below 1024 (e.g. for the ident service)";
       default = false;
     };
 
-    passwordEncryptionKeyLength = mkOption {
+    passwordEncryptionKeyLength = lib.mkOption {
       type = ints.unsigned;
       description = "Length of the key to encrypt IRC passwords with";
       default = 4096;
       example = 8192;
     };
 
-    registrationUrl = mkOption {
+    registrationUrl = lib.mkOption {
       type = str;
       description = ''
         The URL where the application service is listening for homeserver requests,
@@ -56,13 +53,13 @@ in {
       example = "http://localhost:8009";
     };
 
-    localpart = mkOption {
+    localpart = lib.mkOption {
       type = str;
       description = "The user_id localpart to assign to the appservice";
       default = "appservice-irc";
     };
 
-    settings = mkOption {
+    settings = lib.mkOption {
       description = ''
         Configuration for the appservice, see
         <https://github.com/matrix-org/matrix-appservice-irc/blob/${pkgs.matrix-appservice-irc.version}/config.sample.yaml>
@@ -73,19 +70,19 @@ in {
         freeformType = jsonType;
 
         options = {
-          homeserver = mkOption {
+          homeserver = lib.mkOption {
             description = "Homeserver configuration";
             default = {};
             type = submodule {
               freeformType = jsonType;
 
               options = {
-                url = mkOption {
+                url = lib.mkOption {
                   type = str;
                   description = "The URL to the home server for client-server API calls";
                 };
 
-                domain = mkOption {
+                domain = lib.mkOption {
                   type = str;
                   description = ''
                     The 'domain' part for user IDs on this home server. Usually
@@ -96,21 +93,21 @@ in {
             };
           };
 
-          database = mkOption {
+          database = lib.mkOption {
             default = {};
             description = "Configuration for the database";
             type = submodule {
               freeformType = jsonType;
 
               options = {
-                engine = mkOption {
+                engine = lib.mkOption {
                   type = str;
                   description = "Which database engine to use";
                   default = "nedb";
                   example = "postgres";
                 };
 
-                connectionString = mkOption {
+                connectionString = lib.mkOption {
                   type = str;
                   description = "The database connection string";
                   default = "nedb://var/lib/matrix-appservice-irc/data";
@@ -120,14 +117,14 @@ in {
             };
           };
 
-          ircService = mkOption {
+          ircService = lib.mkOption {
             default = {};
             description = "IRC bridge configuration";
             type = submodule {
               freeformType = jsonType;
 
               options = {
-                passwordEncryptionKeyPath = mkOption {
+                passwordEncryptionKeyPath = lib.mkOption {
                   type = str;
                   description = ''
                     Location of the key with which IRC passwords are encrypted
@@ -136,7 +133,7 @@ in {
                   default = "/var/lib/matrix-appservice-irc/passkey.pem";
                 };
 
-                servers = mkOption {
+                servers = lib.mkOption {
                   type = submodule { freeformType = jsonType; };
                   description = "IRC servers to connect to";
                 };
@@ -147,7 +144,7 @@ in {
       };
     };
   };
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.services.matrix-appservice-irc = {
       description = "Matrix-IRC bridge";
       before = [ "matrix-synapse.service" ]; # So the registration can be used by Synapse
@@ -206,7 +203,7 @@ in {
         User = "matrix-appservice-irc";
         Group = "matrix-appservice-irc";
 
-        CapabilityBoundingSet = [ "CAP_CHOWN" ] ++ optional (cfg.needBindingCap) "CAP_NET_BIND_SERVICE";
+        CapabilityBoundingSet = [ "CAP_CHOWN" ] ++ lib.optional (cfg.needBindingCap) "CAP_NET_BIND_SERVICE";
         AmbientCapabilities = CapabilityBoundingSet;
         NoNewPrivileges = true;