From 7a6ef913b71e54bdf79d497dfe5c952632775fb5 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sat, 24 Aug 2024 22:05:41 +0200
Subject: [PATCH] nixos/services.disnix: remove `with lib;`

---
 nixos/modules/services/misc/disnix.nix | 51 ++++++++++++--------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 80e749204993..619fbcf92308 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -1,8 +1,5 @@
 # Disnix server
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
 
   cfg = config.services.disnix;
@@ -17,22 +14,22 @@ in
 
     services.disnix = {
 
-      enable = mkEnableOption "Disnix";
+      enable = lib.mkEnableOption "Disnix";
 
-      enableMultiUser = mkOption {
-        type = types.bool;
+      enableMultiUser = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = "Whether to support multi-user mode by enabling the Disnix D-Bus service";
       };
 
-      useWebServiceInterface = mkEnableOption "the DisnixWebService interface running on Apache Tomcat";
+      useWebServiceInterface = lib.mkEnableOption "the DisnixWebService interface running on Apache Tomcat";
 
-      package = mkPackageOption pkgs "disnix" {};
+      package = lib.mkPackageOption pkgs "disnix" {};
 
-      enableProfilePath = mkEnableOption "exposing the Disnix profiles in the system's PATH";
+      enableProfilePath = lib.mkEnableOption "exposing the Disnix profiles in the system's PATH";
 
-      profiles = mkOption {
-        type = types.listOf types.str;
+      profiles = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
         default = [ "default" ];
         description = "Names of the Disnix profiles to expose in the system's PATH";
       };
@@ -42,10 +39,10 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     dysnomia.enable = true;
 
-    environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+    environment.systemPackages = [ pkgs.disnix ] ++ lib.optional cfg.useWebServiceInterface pkgs.DisnixWebService;
     environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles);
     environment.variables.DISNIX_REMOTE_CLIENT = lib.optionalString (cfg.enableMultiUser) "disnix-client";
 
@@ -54,26 +51,26 @@ in
 
     services.tomcat.enable = cfg.useWebServiceInterface;
     services.tomcat.extraGroups = [ "disnix" ];
-    services.tomcat.javaOpts = "${optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} ";
-    services.tomcat.sharedLibs = optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar"
-      ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
-    services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+    services.tomcat.javaOpts = "${lib.optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} ";
+    services.tomcat.sharedLibs = lib.optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar"
+      ++ lib.optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
+    services.tomcat.webapps = lib.optional cfg.useWebServiceInterface pkgs.DisnixWebService;
 
     users.groups.disnix.gid = config.ids.gids.disnix;
 
     systemd.services = {
-      disnix = mkIf cfg.enableMultiUser {
+      disnix = lib.mkIf cfg.enableMultiUser {
         description = "Disnix server";
         wants = [ "dysnomia.target" ];
         wantedBy = [ "multi-user.target" ];
         after = [ "dbus.service" ]
-          ++ optional config.services.httpd.enable "httpd.service"
-          ++ optional config.services.mysql.enable "mysql.service"
-          ++ optional config.services.postgresql.enable "postgresql.service"
-          ++ optional config.services.tomcat.enable "tomcat.service"
-          ++ optional config.services.svnserve.enable "svnserve.service"
-          ++ optional config.services.mongodb.enable "mongodb.service"
-          ++ optional config.services.influxdb.enable "influxdb.service";
+          ++ lib.optional config.services.httpd.enable "httpd.service"
+          ++ lib.optional config.services.mysql.enable "mysql.service"
+          ++ lib.optional config.services.postgresql.enable "postgresql.service"
+          ++ lib.optional config.services.tomcat.enable "tomcat.service"
+          ++ lib.optional config.services.svnserve.enable "svnserve.service"
+          ++ lib.optional config.services.mongodb.enable "mongodb.service"
+          ++ lib.optional config.services.influxdb.enable "influxdb.service";
 
         restartIfChanged = false;
 
@@ -82,8 +79,8 @@ in
         environment = {
           HOME = "/root";
         }
-        // (optionalAttrs (config.environment.variables ? DYSNOMIA_CONTAINERS_PATH) { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; })
-        // (optionalAttrs (config.environment.variables ? DYSNOMIA_MODULES_PATH) { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; });
+        // (lib.optionalAttrs (config.environment.variables ? DYSNOMIA_CONTAINERS_PATH) { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; })
+        // (lib.optionalAttrs (config.environment.variables ? DYSNOMIA_MODULES_PATH) { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; });
 
         serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service";
       };