From ee1c846b9fa76985c9dfc170d7f148c9439a452a Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Tue, 7 Jan 2025 15:18:07 -0300
Subject: [PATCH] nixos: remove with lib from meta, trivial cases

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 nixos/modules/config/stevenblack.nix                            | 2 +-
 nixos/modules/config/xdg/portal.nix                             | 2 +-
 nixos/modules/hardware/uni-sync.nix                             | 2 +-
 nixos/modules/programs/bat.nix                                  | 2 +-
 nixos/modules/programs/pay-respects.nix                         | 2 +-
 nixos/modules/security/isolate.nix                              | 2 +-
 nixos/modules/services/audio/navidrome.nix                      | 2 +-
 nixos/modules/services/continuous-integration/gitlab-runner.nix | 2 +-
 .../modules/services/desktops/gnome/gnome-browser-connector.nix | 2 +-
 nixos/modules/services/desktops/pipewire/pipewire.nix           | 2 +-
 nixos/modules/services/desktops/pipewire/wireplumber.nix        | 2 +-
 nixos/modules/services/hardware/handheld-daemon.nix             | 2 +-
 nixos/modules/services/hardware/lcd.nix                         | 2 +-
 nixos/modules/services/home-automation/esphome.nix              | 2 +-
 nixos/modules/services/matrix/synapse.nix                       | 2 +-
 nixos/modules/services/misc/anki-sync-server.nix                | 2 +-
 nixos/modules/services/misc/autosuspend.nix                     | 2 +-
 nixos/modules/services/misc/db-rest.nix                         | 2 +-
 nixos/modules/services/misc/gitlab.nix                          | 2 +-
 nixos/modules/services/misc/jellyfin.nix                        | 2 +-
 nixos/modules/services/misc/sourcehut/default.nix               | 2 +-
 nixos/modules/services/monitoring/gatus.nix                     | 2 +-
 nixos/modules/services/monitoring/gitwatch.nix                  | 2 +-
 nixos/modules/services/monitoring/glances.nix                   | 2 +-
 nixos/modules/services/monitoring/prometheus/exporters.nix      | 2 +-
 nixos/modules/services/monitoring/scrutiny.nix                  | 2 +-
 nixos/modules/services/networking/bitcoind.nix                  | 2 +-
 nixos/modules/services/networking/dnsproxy.nix                  | 2 +-
 nixos/modules/services/networking/hostapd.nix                   | 2 +-
 nixos/modules/services/networking/mtr-exporter.nix              | 2 +-
 nixos/modules/services/networking/mullvad-vpn.nix               | 2 +-
 nixos/modules/services/networking/netbird.nix                   | 2 +-
 nixos/modules/services/networking/networkmanager.nix            | 2 +-
 nixos/modules/services/networking/nix-store-gcs-proxy.nix       | 2 +-
 nixos/modules/services/networking/openconnect.nix               | 2 +-
 nixos/modules/services/networking/peroxide.nix                  | 2 +-
 nixos/modules/services/networking/pixiecore.nix                 | 2 +-
 nixos/modules/services/networking/routedns.nix                  | 2 +-
 nixos/modules/services/networking/searx.nix                     | 2 +-
 nixos/modules/services/networking/snowflake-proxy.nix           | 2 +-
 nixos/modules/services/networking/soju.nix                      | 2 +-
 nixos/modules/services/networking/tailscale-auth.nix            | 2 +-
 nixos/modules/services/networking/tailscale.nix                 | 2 +-
 nixos/modules/services/networking/tinc.nix                      | 2 +-
 nixos/modules/services/networking/tinyproxy.nix                 | 2 +-
 nixos/modules/services/networking/tmate-ssh-server.nix          | 2 +-
 nixos/modules/services/networking/trickster.nix                 | 2 +-
 nixos/modules/services/networking/v2raya.nix                    | 2 +-
 nixos/modules/services/networking/veilid.nix                    | 2 +-
 nixos/modules/services/networking/wg-netmanager.nix             | 2 +-
 nixos/modules/services/networking/zeronet.nix                   | 2 +-
 .../services/security/bitwarden-directory-connector-cli.nix     | 2 +-
 nixos/modules/services/ttys/getty.nix                           | 2 +-
 nixos/modules/services/video/wivrn.nix                          | 2 +-
 nixos/modules/services/web-apps/audiobookshelf.nix              | 2 +-
 nixos/modules/services/web-apps/bookstack.nix                   | 2 +-
 nixos/modules/services/web-apps/cloudlog.nix                    | 2 +-
 nixos/modules/services/web-apps/dokuwiki.nix                    | 2 +-
 nixos/modules/services/web-apps/freshrss.nix                    | 2 +-
 nixos/modules/services/web-apps/grocy.nix                       | 2 +-
 nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix       | 2 +-
 nixos/modules/services/web-apps/keycloak.nix                    | 2 +-
 nixos/modules/services/web-apps/komga.nix                       | 2 +-
 nixos/modules/services/web-apps/lemmy.nix                       | 2 +-
 nixos/modules/services/web-apps/phylactery.nix                  | 2 +-
 nixos/modules/services/web-apps/pict-rs.nix                     | 2 +-
 nixos/modules/services/web-apps/plausible.nix                   | 2 +-
 nixos/modules/services/web-apps/snipe-it.nix                    | 2 +-
 nixos/modules/services/web-apps/wiki-js.nix                     | 2 +-
 nixos/modules/services/web-servers/garage.nix                   | 2 +-
 nixos/modules/services/web-servers/minio.nix                    | 2 +-
 nixos/modules/services/web-servers/nginx/tailscale-auth.nix     | 2 +-
 nixos/modules/services/web-servers/rustus.nix                   | 2 +-
 nixos/modules/services/x11/desktop-managers/enlightenment.nix   | 2 +-
 nixos/modules/services/x11/desktop-managers/lumina.nix          | 2 +-
 nixos/modules/services/x11/desktop-managers/lxqt.nix            | 2 +-
 nixos/modules/services/x11/desktop-managers/pantheon.nix        | 2 +-
 nixos/modules/services/x11/desktop-managers/retroarch.nix       | 2 +-
 nixos/modules/services/x11/desktop-managers/xfce.nix            | 2 +-
 nixos/modules/services/x11/touchegg.nix                         | 2 +-
 nixos/modules/services/x11/window-managers/xmonad.nix           | 2 +-
 nixos/modules/system/boot/loader/external/external.nix          | 2 +-
 nixos/modules/virtualisation/amazon-init.nix                    | 2 +-
 nixos/modules/virtualisation/cri-o.nix                          | 2 +-
 nixos/modules/virtualisation/digital-ocean-config.nix           | 2 +-
 nixos/modules/virtualisation/digital-ocean-image.nix            | 2 +-
 nixos/modules/virtualisation/digital-ocean-init.nix             | 2 +-
 nixos/modules/virtualisation/ec2-data.nix                       | 2 +-
 nixos/modules/virtualisation/kvmgt.nix                          | 2 +-
 nixos/modules/virtualisation/linode-image.nix                   | 2 +-
 nixos/modules/virtualisation/openvswitch.nix                    | 2 +-
 nixos/modules/virtualisation/vmware-guest.nix                   | 2 +-
 nixos/tests/chromium.nix                                        | 2 +-
 nixos/tests/cri-o.nix                                           | 2 +-
 nixos/tests/forgejo.nix                                         | 2 +-
 nixos/tests/gemstash.nix                                        | 2 +-
 nixos/tests/geoserver.nix                                       | 2 +-
 nixos/tests/gitea.nix                                           | 2 +-
 nixos/tests/hadoop/hbase.nix                                    | 2 +-
 nixos/tests/matomo.nix                                          | 2 +-
 nixos/tests/qgis.nix                                            | 2 +-
 nixos/tests/redmine.nix                                         | 2 +-
 nixos/tests/rshim.nix                                           | 2 +-
 nixos/tests/systemd-boot.nix                                    | 2 +-
 104 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/nixos/modules/config/stevenblack.nix b/nixos/modules/config/stevenblack.nix
index 95f6c9e73eb3e..d49a53d82b21a 100644
--- a/nixos/modules/config/stevenblack.nix
+++ b/nixos/modules/config/stevenblack.nix
@@ -41,7 +41,7 @@ in
     networking.hostFiles = map (x: "${getOutput x cfg.package}/hosts") ([ "ads" ] ++ cfg.block);
   };
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     moni
     artturin
     frontear
diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix
index 617a342c1a70e..3433a57da1602 100644
--- a/nixos/modules/config/xdg/portal.nix
+++ b/nixos/modules/config/xdg/portal.nix
@@ -32,7 +32,7 @@ in
   ];
 
   meta = {
-    maintainers = teams.freedesktop.members;
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options.xdg.portal = {
diff --git a/nixos/modules/hardware/uni-sync.nix b/nixos/modules/hardware/uni-sync.nix
index 2fc93772562d6..cbc29ee0fd95a 100644
--- a/nixos/modules/hardware/uni-sync.nix
+++ b/nixos/modules/hardware/uni-sync.nix
@@ -9,7 +9,7 @@ let
   cfg = config.hardware.uni-sync;
 in
 {
-  meta.maintainers = with maintainers; [ yunfachi ];
+  meta.maintainers = with lib.maintainers; [ yunfachi ];
 
   options.hardware.uni-sync = {
     enable = mkEnableOption "udev rules and software for Lian Li Uni Controllers";
diff --git a/nixos/modules/programs/bat.nix b/nixos/modules/programs/bat.nix
index 5ccc87baf2c46..ea6b8ff4b3b32 100644
--- a/nixos/modules/programs/bat.nix
+++ b/nixos/modules/programs/bat.nix
@@ -118,5 +118,5 @@ in
       };
     };
   };
-  meta.maintainers = with maintainers; [ sigmasquadron ];
+  meta.maintainers = with lib.maintainers; [ sigmasquadron ];
 }
diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix
index 83822cdc2c7f7..f7a025cca3738 100644
--- a/nixos/modules/programs/pay-respects.nix
+++ b/nixos/modules/programs/pay-respects.nix
@@ -53,5 +53,5 @@ in
       zsh.interactiveShellInit = optionalString config.programs.zsh.enable (initScript "zsh");
     };
   };
-  meta.maintainers = with maintainers; [ sigmasquadron ];
+  meta.maintainers = with lib.maintainers; [ sigmasquadron ];
 }
diff --git a/nixos/modules/security/isolate.nix b/nixos/modules/security/isolate.nix
index 74274d04c6b83..1953eb8aa14f0 100644
--- a/nixos/modules/security/isolate.nix
+++ b/nixos/modules/security/isolate.nix
@@ -140,6 +140,6 @@ in
       description = "Isolate Sandbox Slice";
     };
 
-    meta.maintainers = with maintainers; [ virchau13 ];
+    meta.maintainers = with lib.maintainers; [ virchau13 ];
   };
 }
diff --git a/nixos/modules/services/audio/navidrome.nix b/nixos/modules/services/audio/navidrome.nix
index e69bfef484386..51d6f6cbf5fd5 100644
--- a/nixos/modules/services/audio/navidrome.nix
+++ b/nixos/modules/services/audio/navidrome.nix
@@ -169,5 +169,5 @@ in
 
       networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.Port ];
     };
-  meta.maintainers = with maintainers; [ fsnkty ];
+  meta.maintainers = with lib.maintainers; [ fsnkty ];
 }
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 895ba66e7ea0c..8b4ba3aeb49c7 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -875,5 +875,5 @@ in
     )
   ];
 
-  meta.maintainers = teams.gitlab.members;
+  meta.maintainers = lib.teams.gitlab.members;
 }
diff --git a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix
index 335ebc9a144d3..27ed390ad1a4f 100644
--- a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix
@@ -16,7 +16,7 @@ in
 
 {
   meta = {
-    maintainers = teams.gnome.members;
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix
index 91ac32e79c35b..6abead05af28a 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire.nix
@@ -88,7 +88,7 @@ let
   };
 in
 {
-  meta.maintainers = teams.freedesktop.members ++ [ maintainers.k900 ];
+  meta.maintainers = lib.teams.freedesktop.members ++ [ maintainers.k900 ];
 
   ###### interface
   options = {
diff --git a/nixos/modules/services/desktops/pipewire/wireplumber.nix b/nixos/modules/services/desktops/pipewire/wireplumber.nix
index cccb892cecf7a..c9cf6efd9b7b4 100644
--- a/nixos/modules/services/desktops/pipewire/wireplumber.nix
+++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix
@@ -37,7 +37,7 @@ let
       scripts;
 in
 {
-  meta.maintainers = [ maintainers.k900 ];
+  meta.maintainers = [ lib.maintainers.k900 ];
 
   options = {
     services.pipewire.wireplumber = {
diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix
index 4ea5eb79593fd..a87f369d2dfc6 100644
--- a/nixos/modules/services/hardware/handheld-daemon.nix
+++ b/nixos/modules/services/hardware/handheld-daemon.nix
@@ -55,5 +55,5 @@ in
     };
   };
 
-  meta.maintainers = [ maintainers.appsforartists ];
+  meta.maintainers = [ lib.maintainers.appsforartists ];
 }
diff --git a/nixos/modules/services/hardware/lcd.nix b/nixos/modules/services/hardware/lcd.nix
index 0b39281667cc7..de84909cce189 100644
--- a/nixos/modules/services/hardware/lcd.nix
+++ b/nixos/modules/services/hardware/lcd.nix
@@ -36,7 +36,7 @@ in
 with lib;
 {
 
-  meta.maintainers = with maintainers; [ peterhoeg ];
+  meta.maintainers = with lib.maintainers; [ peterhoeg ];
 
   options = with types; {
     services.hardware.lcd = {
diff --git a/nixos/modules/services/home-automation/esphome.nix b/nixos/modules/services/home-automation/esphome.nix
index 0673454aab89c..81031856aa160 100644
--- a/nixos/modules/services/home-automation/esphome.nix
+++ b/nixos/modules/services/home-automation/esphome.nix
@@ -26,7 +26,7 @@ let
       "--address ${cfg.address} --port ${toString cfg.port}";
 in
 {
-  meta.maintainers = with maintainers; [ oddlama ];
+  meta.maintainers = with lib.maintainers; [ oddlama ];
 
   options.services.esphome = {
     enable = mkEnableOption "esphome, for making custom firmwares for ESP32/ESP8266";
diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix
index 48372d9c48741..2efb058198540 100644
--- a/nixos/modules/services/matrix/synapse.nix
+++ b/nixos/modules/services/matrix/synapse.nix
@@ -1599,7 +1599,7 @@ in
   meta = {
     buildDocsInSandbox = false;
     doc = ./synapse.md;
-    maintainers = teams.matrix.members;
+    maintainers = lib.teams.matrix.members;
   };
 
 }
diff --git a/nixos/modules/services/misc/anki-sync-server.nix b/nixos/modules/services/misc/anki-sync-server.nix
index 923811d845c82..29c270fb368f9 100644
--- a/nixos/modules/services/misc/anki-sync-server.nix
+++ b/nixos/modules/services/misc/anki-sync-server.nix
@@ -144,7 +144,7 @@ in {
   };
 
   meta = {
-    maintainers = with maintainers; [telotortium];
+    maintainers = with lib.maintainers; [telotortium];
     doc = ./anki-sync-server.md;
   };
 }
diff --git a/nixos/modules/services/misc/autosuspend.nix b/nixos/modules/services/misc/autosuspend.nix
index 53f872d3e040f..4ab3acacaca16 100644
--- a/nixos/modules/services/misc/autosuspend.nix
+++ b/nixos/modules/services/misc/autosuspend.nix
@@ -248,6 +248,6 @@ in
   };
 
   meta = {
-    maintainers = with maintainers; [ xlambein ];
+    maintainers = with lib.maintainers; [ xlambein ];
   };
 }
diff --git a/nixos/modules/services/misc/db-rest.nix b/nixos/modules/services/misc/db-rest.nix
index 6cb9dd3da5772..7c8f0f655583b 100644
--- a/nixos/modules/services/misc/db-rest.nix
+++ b/nixos/modules/services/misc/db-rest.nix
@@ -201,5 +201,5 @@ in
 
     services.redis.servers.db-rest.enable = cfg.redis.enable && cfg.redis.createLocally;
   };
-  meta.maintainers = with maintainers; [ marie ];
+  meta.maintainers = with lib.maintainers; [ marie ];
 }
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 80bbee5f49ce9..74db7bd316b93 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -1721,5 +1721,5 @@ in {
   };
 
   meta.doc = ./gitlab.md;
-  meta.maintainers = teams.gitlab.members;
+  meta.maintainers = lib.teams.gitlab.members;
 }
diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix
index 89640b9a32118..ec356de662434 100644
--- a/nixos/modules/services/misc/jellyfin.nix
+++ b/nixos/modules/services/misc/jellyfin.nix
@@ -200,7 +200,7 @@ in
 
   };
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     minijackson
     fsnkty
   ];
diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix
index ebce033fd55c1..959886fe27e5a 100644
--- a/nixos/modules/services/misc/sourcehut/default.nix
+++ b/nixos/modules/services/misc/sourcehut/default.nix
@@ -1554,7 +1554,7 @@ in
   ];
 
   meta.doc = ./default.md;
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     tomberek
     nessdoor
     christoph-heiss
diff --git a/nixos/modules/services/monitoring/gatus.nix b/nixos/modules/services/monitoring/gatus.nix
index 408115f5d5145..a69f3b1df56ea 100644
--- a/nixos/modules/services/monitoring/gatus.nix
+++ b/nixos/modules/services/monitoring/gatus.nix
@@ -128,5 +128,5 @@ in
     networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ cfg.settings.web.port ];
   };
 
-  meta.maintainers = with maintainers; [ pizzapim ];
+  meta.maintainers = with lib.maintainers; [ pizzapim ];
 }
diff --git a/nixos/modules/services/monitoring/gitwatch.nix b/nixos/modules/services/monitoring/gitwatch.nix
index 076114a6ef113..fde351e4b9e51 100644
--- a/nixos/modules/services/monitoring/gitwatch.nix
+++ b/nixos/modules/services/monitoring/gitwatch.nix
@@ -93,5 +93,5 @@ in
       });
   };
   config.systemd.services = mapAttrs' mkSystemdService config.services.gitwatch;
-  meta.maintainers = with maintainers; [ shved ];
+  meta.maintainers = with lib.maintainers; [ shved ];
 }
diff --git a/nixos/modules/services/monitoring/glances.nix b/nixos/modules/services/monitoring/glances.nix
index fd976ce2f0600..022798a70640a 100644
--- a/nixos/modules/services/monitoring/glances.nix
+++ b/nixos/modules/services/monitoring/glances.nix
@@ -106,5 +106,5 @@ in
     networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
   };
 
-  meta.maintainers = with maintainers; [ claha ];
+  meta.maintainers = with lib.maintainers; [ claha ];
 }
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index f805920c5b87a..0cbec3d7ed46a 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -465,6 +465,6 @@ in
 
   meta = {
     doc = ./exporters.md;
-    maintainers = [ maintainers.willibutz ];
+    maintainers = [ lib.maintainers.willibutz ];
   };
 }
diff --git a/nixos/modules/services/monitoring/scrutiny.nix b/nixos/modules/services/monitoring/scrutiny.nix
index 37a991674daea..c2475fd1e1d27 100644
--- a/nixos/modules/services/monitoring/scrutiny.nix
+++ b/nixos/modules/services/monitoring/scrutiny.nix
@@ -228,5 +228,5 @@ in
     })
   ];
 
-  meta.maintainers = [ maintainers.jnsgruk ];
+  meta.maintainers = [ lib.maintainers.jnsgruk ];
 }
diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix
index e46a101c20435..411ef2f8bdcdd 100644
--- a/nixos/modules/services/networking/bitcoind.nix
+++ b/nixos/modules/services/networking/bitcoind.nix
@@ -280,6 +280,6 @@ in
 
   };
 
-  meta.maintainers = with maintainers; [ _1000101 ];
+  meta.maintainers = with lib.maintainers; [ _1000101 ];
 
 }
diff --git a/nixos/modules/services/networking/dnsproxy.nix b/nixos/modules/services/networking/dnsproxy.nix
index 1d1666e0941e3..769a01a9a194b 100644
--- a/nixos/modules/services/networking/dnsproxy.nix
+++ b/nixos/modules/services/networking/dnsproxy.nix
@@ -115,6 +115,6 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ diogotcorreia ];
+  meta.maintainers = with lib.maintainers; [ diogotcorreia ];
 
 }
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 8635dea738ce2..4adcb8cbdc865 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -107,7 +107,7 @@ let
 
   runtimeConfigFiles = mapAttrsToList (radio: _: "/run/hostapd/${radio}.hostapd.conf") cfg.radios;
 in {
-  meta.maintainers = with maintainers; [ oddlama ];
+  meta.maintainers = with lib.maintainers; [ oddlama ];
 
   options = {
     services.hostapd = {
diff --git a/nixos/modules/services/networking/mtr-exporter.nix b/nixos/modules/services/networking/mtr-exporter.nix
index e7c8bea4499ba..6b5ed72ce1f0d 100644
--- a/nixos/modules/services/networking/mtr-exporter.nix
+++ b/nixos/modules/services/networking/mtr-exporter.nix
@@ -152,5 +152,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ jakubgs ];
+  meta.maintainers = with lib.maintainers; [ jakubgs ];
 }
diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix
index 4c0abb9b89420..e6a35afde67b3 100644
--- a/nixos/modules/services/networking/mullvad-vpn.nix
+++ b/nixos/modules/services/networking/mullvad-vpn.nix
@@ -65,5 +65,5 @@ with lib;
     };
   };
 
-  meta.maintainers = with maintainers; [ arcuru ymarkus ];
+  meta.maintainers = with lib.maintainers; [ arcuru ymarkus ];
 }
diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix
index 9771503e14e28..6a278d88615f8 100644
--- a/nixos/modules/services/networking/netbird.nix
+++ b/nixos/modules/services/networking/netbird.nix
@@ -35,7 +35,7 @@ let
   cfg = config.services.netbird;
 in
 {
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = with lib.maintainers; [ ];
   meta.doc = ./netbird.md;
 
   options.services.netbird = {
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index d2d49ee2eeb91..c286bdc7ea640 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -140,7 +140,7 @@ in
 {
 
   meta = {
-    maintainers = teams.freedesktop.members;
+    maintainers = lib.teams.freedesktop.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/networking/nix-store-gcs-proxy.nix b/nixos/modules/services/networking/nix-store-gcs-proxy.nix
index 828f4d5c244dc..b10b18e634737 100644
--- a/nixos/modules/services/networking/nix-store-gcs-proxy.nix
+++ b/nixos/modules/services/networking/nix-store-gcs-proxy.nix
@@ -80,5 +80,5 @@ in
     }
   );
 
-  meta.maintainers = [ maintainers.mrkkrp ];
+  meta.maintainers = [ lib.maintainers.mrkkrp ];
 }
diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix
index 6660e769f48ad..a9a081fddc684 100644
--- a/nixos/modules/services/networking/openconnect.nix
+++ b/nixos/modules/services/networking/openconnect.nix
@@ -159,5 +159,5 @@ in
     }) cfg.interfaces;
   };
 
-  meta.maintainers = with maintainers; [ alyaeanyx ];
+  meta.maintainers = with lib.maintainers; [ alyaeanyx ];
 }
diff --git a/nixos/modules/services/networking/peroxide.nix b/nixos/modules/services/networking/peroxide.nix
index 101a5fdffeefc..aab629f389868 100644
--- a/nixos/modules/services/networking/peroxide.nix
+++ b/nixos/modules/services/networking/peroxide.nix
@@ -143,7 +143,7 @@ in
     environment.systemPackages = [ cfg.package ];
   };
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     aanderse
     aidalgol
   ];
diff --git a/nixos/modules/services/networking/pixiecore.nix b/nixos/modules/services/networking/pixiecore.nix
index fc0d5ec1a7abb..31c957e383e83 100644
--- a/nixos/modules/services/networking/pixiecore.nix
+++ b/nixos/modules/services/networking/pixiecore.nix
@@ -11,7 +11,7 @@ let
   cfg = config.services.pixiecore;
 in
 {
-  meta.maintainers = with maintainers; [ bbigras ];
+  meta.maintainers = with lib.maintainers; [ bbigras ];
 
   options = {
     services.pixiecore = {
diff --git a/nixos/modules/services/networking/routedns.nix b/nixos/modules/services/networking/routedns.nix
index e3047a29280aa..511d6586f19ca 100644
--- a/nixos/modules/services/networking/routedns.nix
+++ b/nixos/modules/services/networking/routedns.nix
@@ -75,5 +75,5 @@ in
       };
     };
   };
-  meta.maintainers = with maintainers; [ jsimonetti ];
+  meta.maintainers = with lib.maintainers; [ jsimonetti ];
 }
diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index 0a3b104ede209..f3a0d6565c7a5 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -268,5 +268,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ rnhmjoj _999eagle ];
+  meta.maintainers = with lib.maintainers; [ rnhmjoj _999eagle ];
 }
diff --git a/nixos/modules/services/networking/snowflake-proxy.nix b/nixos/modules/services/networking/snowflake-proxy.nix
index 078fb382bae61..5ea58fcc3ae13 100644
--- a/nixos/modules/services/networking/snowflake-proxy.nix
+++ b/nixos/modules/services/networking/snowflake-proxy.nix
@@ -77,5 +77,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ yayayayaka ];
+  meta.maintainers = with lib.maintainers; [ yayayayaka ];
 }
diff --git a/nixos/modules/services/networking/soju.nix b/nixos/modules/services/networking/soju.nix
index 808c708163b21..596f026460551 100644
--- a/nixos/modules/services/networking/soju.nix
+++ b/nixos/modules/services/networking/soju.nix
@@ -141,5 +141,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ malte-v ];
+  meta.maintainers = with lib.maintainers; [ malte-v ];
 }
diff --git a/nixos/modules/services/networking/tailscale-auth.nix b/nixos/modules/services/networking/tailscale-auth.nix
index 32ddbdfd155d2..c441178edff8e 100644
--- a/nixos/modules/services/networking/tailscale-auth.nix
+++ b/nixos/modules/services/networking/tailscale-auth.nix
@@ -111,7 +111,7 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     dan-theriault
     phaer
   ];
diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index d30193ecc1290..a404333ddf98e 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -6,7 +6,7 @@ let
   cfg = config.services.tailscale;
   isNetworkd = config.networking.useNetworkd;
 in {
-  meta.maintainers = with maintainers; [ mbaillie mfrw ];
+  meta.maintainers = with lib.maintainers; [ mbaillie mfrw ];
 
   options.services.tailscale = {
     enable = mkEnableOption "Tailscale client daemon";
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 5f625c10840be..d028a463b6f52 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -431,5 +431,5 @@ in
       );
     });
 
-  meta.maintainers = with maintainers; [ minijackson mic92 ];
+  meta.maintainers = with lib.maintainers; [ minijackson mic92 ];
 }
diff --git a/nixos/modules/services/networking/tinyproxy.nix b/nixos/modules/services/networking/tinyproxy.nix
index 6e07c6a541e9b..960eb49f5b862 100644
--- a/nixos/modules/services/networking/tinyproxy.nix
+++ b/nixos/modules/services/networking/tinyproxy.nix
@@ -100,5 +100,5 @@ in
     };
     users.groups.tinyproxy = {};
   };
-  meta.maintainers = with maintainers; [ tcheronneau ];
+  meta.maintainers = with lib.maintainers; [ tcheronneau ];
 }
diff --git a/nixos/modules/services/networking/tmate-ssh-server.nix b/nixos/modules/services/networking/tmate-ssh-server.nix
index 349bc3d36939c..b08174e822a8b 100644
--- a/nixos/modules/services/networking/tmate-ssh-server.nix
+++ b/nixos/modules/services/networking/tmate-ssh-server.nix
@@ -111,7 +111,7 @@ in
   };
 
   meta = {
-    maintainers = with maintainers; [ jlesquembre ];
+    maintainers = with lib.maintainers; [ jlesquembre ];
   };
 
 }
diff --git a/nixos/modules/services/networking/trickster.nix b/nixos/modules/services/networking/trickster.nix
index 21649f0303f36..cc57a0b982464 100644
--- a/nixos/modules/services/networking/trickster.nix
+++ b/nixos/modules/services/networking/trickster.nix
@@ -113,6 +113,6 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ _1000101 ];
+  meta.maintainers = with lib.maintainers; [ _1000101 ];
 
 }
diff --git a/nixos/modules/services/networking/v2raya.nix b/nixos/modules/services/networking/v2raya.nix
index a1b574870218c..09228b21c5682 100644
--- a/nixos/modules/services/networking/v2raya.nix
+++ b/nixos/modules/services/networking/v2raya.nix
@@ -68,5 +68,5 @@ in
       };
   };
 
-  meta.maintainers = with maintainers; [ elliot ];
+  meta.maintainers = with lib.maintainers; [ elliot ];
 }
diff --git a/nixos/modules/services/networking/veilid.nix b/nixos/modules/services/networking/veilid.nix
index d471a5f61952f..515fed3bd5282 100644
--- a/nixos/modules/services/networking/veilid.nix
+++ b/nixos/modules/services/networking/veilid.nix
@@ -223,5 +223,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ figboy9 ];
+  meta.maintainers = with lib.maintainers; [ figboy9 ];
 }
diff --git a/nixos/modules/services/networking/wg-netmanager.nix b/nixos/modules/services/networking/wg-netmanager.nix
index eb13d35ccccbd..815276607e035 100644
--- a/nixos/modules/services/networking/wg-netmanager.nix
+++ b/nixos/modules/services/networking/wg-netmanager.nix
@@ -50,5 +50,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ gin66 ];
+  meta.maintainers = with lib.maintainers; [ gin66 ];
 }
diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix
index d293aa05758f5..a9ac8160ada2d 100644
--- a/nixos/modules/services/networking/zeronet.nix
+++ b/nixos/modules/services/networking/zeronet.nix
@@ -133,5 +133,5 @@ with lib;
     ] "Zeronet will log by default in /var/lib/zeronet")
   ];
 
-  meta.maintainers = with maintainers; [ Madouura ];
+  meta.maintainers = with lib.maintainers; [ Madouura ];
 }
diff --git a/nixos/modules/services/security/bitwarden-directory-connector-cli.nix b/nixos/modules/services/security/bitwarden-directory-connector-cli.nix
index 633563a115618..136d306f7d788 100644
--- a/nixos/modules/services/security/bitwarden-directory-connector-cli.nix
+++ b/nixos/modules/services/security/bitwarden-directory-connector-cli.nix
@@ -335,5 +335,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ Silver-Golden ];
+  meta.maintainers = with lib.maintainers; [ Silver-Golden ];
 }
diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix
index fd9bd7aca0190..386e448a9a556 100644
--- a/nixos/modules/services/ttys/getty.nix
+++ b/nixos/modules/services/ttys/getty.nix
@@ -182,5 +182,5 @@ in
 
   };
 
-  meta.maintainers = with maintainers; [ RossComputerGuy ];
+  meta.maintainers = with lib.maintainers; [ RossComputerGuy ];
 }
diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix
index da6edd02f5b2f..d6234ebc642ec 100644
--- a/nixos/modules/services/video/wivrn.nix
+++ b/nixos/modules/services/video/wivrn.nix
@@ -252,5 +252,5 @@ in
       };
     };
   };
-  meta.maintainers = with maintainers; [ passivelemon ];
+  meta.maintainers = with lib.maintainers; [ passivelemon ];
 }
diff --git a/nixos/modules/services/web-apps/audiobookshelf.nix b/nixos/modules/services/web-apps/audiobookshelf.nix
index d72bdd95ad605..fadb37de9f5f6 100644
--- a/nixos/modules/services/web-apps/audiobookshelf.nix
+++ b/nixos/modules/services/web-apps/audiobookshelf.nix
@@ -91,5 +91,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ wietsedv ];
+  meta.maintainers = with lib.maintainers; [ wietsedv ];
 }
diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix
index 696f486cd90ab..d145c4b78d12a 100644
--- a/nixos/modules/services/web-apps/bookstack.nix
+++ b/nixos/modules/services/web-apps/bookstack.nix
@@ -448,5 +448,5 @@ in {
 
   };
 
-  meta.maintainers = with maintainers; [ ymarkus ];
+  meta.maintainers = with lib.maintainers; [ ymarkus ];
 }
diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix
index 0c51a5118bbd0..d477597ec7a08 100644
--- a/nixos/modules/services/web-apps/cloudlog.nix
+++ b/nixos/modules/services/web-apps/cloudlog.nix
@@ -518,5 +518,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ melling ];
+  meta.maintainers = with lib.maintainers; [ melling ];
 }
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix
index d6ca14c40ef97..cb1a7f0637cf6 100644
--- a/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/nixos/modules/services/web-apps/dokuwiki.nix
@@ -514,7 +514,7 @@ in
 
   ]);
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     _1000101
     onny
     dandellion
diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix
index 0e8bcc703efa9..3482c689c36be 100644
--- a/nixos/modules/services/web-apps/freshrss.nix
+++ b/nixos/modules/services/web-apps/freshrss.nix
@@ -14,7 +14,7 @@ let
   };
 in
 {
-  meta.maintainers = with maintainers; [ etu stunkymonkey mattchrist ];
+  meta.maintainers = with lib.maintainers; [ etu stunkymonkey mattchrist ];
 
   options.services.freshrss = {
     enable = mkEnableOption "FreshRSS RSS aggregator and reader with php-fpm backend";
diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix
index 23e5844e17612..abdbb36f27054 100644
--- a/nixos/modules/services/web-apps/grocy.nix
+++ b/nixos/modules/services/web-apps/grocy.nix
@@ -211,7 +211,7 @@ in
   };
 
   meta = {
-    maintainers = with maintainers; [ ];
+    maintainers = with lib.maintainers; [ ];
     doc = ./grocy.md;
   };
 }
diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
index 680257d23b21a..0641e6f363257 100644
--- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
+++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
@@ -17,7 +17,7 @@ let
   };
 in
 {
-  meta.maintainers = teams.helsinki-systems.members;
+  meta.maintainers = lib.teams.helsinki-systems.members;
 
   options.services.icingaweb2 = with types; {
     enable = mkEnableOption "the icingaweb2 web interface";
diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix
index 406b978d6704b..0c423755e7f9e 100644
--- a/nixos/modules/services/web-apps/keycloak.nix
+++ b/nixos/modules/services/web-apps/keycloak.nix
@@ -739,5 +739,5 @@ in
     };
 
   meta.doc = ./keycloak.md;
-  meta.maintainers = [ maintainers.talyz ];
+  meta.maintainers = [ lib.maintainers.talyz ];
 }
diff --git a/nixos/modules/services/web-apps/komga.nix b/nixos/modules/services/web-apps/komga.nix
index 5245552b21305..92019c6a426e8 100644
--- a/nixos/modules/services/web-apps/komga.nix
+++ b/nixos/modules/services/web-apps/komga.nix
@@ -164,5 +164,5 @@ in
       };
     };
 
-  meta.maintainers = with maintainers; [ govanify ];
+  meta.maintainers = with lib.maintainers; [ govanify ];
 }
diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix
index 02ba3acf06ca5..ad22d3edfb389 100644
--- a/nixos/modules/services/web-apps/lemmy.nix
+++ b/nixos/modules/services/web-apps/lemmy.nix
@@ -11,7 +11,7 @@ let
   settingsFormat = pkgs.formats.json { };
 in
 {
-  meta.maintainers = with maintainers; [ happysalada ];
+  meta.maintainers = with lib.maintainers; [ happysalada ];
   meta.doc = ./lemmy.md;
 
   imports = [
diff --git a/nixos/modules/services/web-apps/phylactery.nix b/nixos/modules/services/web-apps/phylactery.nix
index 49539affde6c3..89fa686e9b8cd 100644
--- a/nixos/modules/services/web-apps/phylactery.nix
+++ b/nixos/modules/services/web-apps/phylactery.nix
@@ -49,5 +49,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ McSinyx ];
+  meta.maintainers = with lib.maintainers; [ McSinyx ];
 }
diff --git a/nixos/modules/services/web-apps/pict-rs.nix b/nixos/modules/services/web-apps/pict-rs.nix
index 446360bc792b2..1a709a2925236 100644
--- a/nixos/modules/services/web-apps/pict-rs.nix
+++ b/nixos/modules/services/web-apps/pict-rs.nix
@@ -10,7 +10,7 @@ let
   inherit (lib) maintainers mkOption types;
 in
 {
-  meta.maintainers = with maintainers; [ happysalada ];
+  meta.maintainers = with lib.maintainers; [ happysalada ];
   meta.doc = ./pict-rs.md;
 
   options.services.pict-rs = {
diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix
index 2640c9e53cf71..9e2732d6e8690 100644
--- a/nixos/modules/services/web-apps/plausible.nix
+++ b/nixos/modules/services/web-apps/plausible.nix
@@ -335,6 +335,6 @@ in
     ];
   };
 
-  meta.maintainers = teams.cyberus.members;
+  meta.maintainers = lib.teams.cyberus.members;
   meta.doc = ./plausible.md;
 }
diff --git a/nixos/modules/services/web-apps/snipe-it.nix b/nixos/modules/services/web-apps/snipe-it.nix
index e9a68006ae646..f58c2a040c0ef 100644
--- a/nixos/modules/services/web-apps/snipe-it.nix
+++ b/nixos/modules/services/web-apps/snipe-it.nix
@@ -511,5 +511,5 @@ in {
 
   };
 
-  meta.maintainers = with maintainers; [ yayayayaka ];
+  meta.maintainers = with lib.maintainers; [ yayayayaka ];
 }
diff --git a/nixos/modules/services/web-apps/wiki-js.nix b/nixos/modules/services/web-apps/wiki-js.nix
index 4c742c26afadf..99b71c12f0753 100644
--- a/nixos/modules/services/web-apps/wiki-js.nix
+++ b/nixos/modules/services/web-apps/wiki-js.nix
@@ -156,5 +156,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ ma27 ];
+  meta.maintainers = with lib.maintainers; [ ma27 ];
 }
diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix
index bfc3fed4a2a5a..572474c4292ab 100644
--- a/nixos/modules/services/web-servers/garage.nix
+++ b/nixos/modules/services/web-servers/garage.nix
@@ -22,7 +22,7 @@ in
 {
   meta = {
     doc = ./garage.md;
-    maintainers = [ maintainers.mjm ];
+    maintainers = [ lib.maintainers.mjm ];
   };
 
   options.services.garage = {
diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix
index a3e1750d41beb..874be0eb1b69b 100644
--- a/nixos/modules/services/web-servers/minio.nix
+++ b/nixos/modules/services/web-servers/minio.nix
@@ -11,7 +11,7 @@ let
   '';
 in
 {
-  meta.maintainers = [ maintainers.bachp ];
+  meta.maintainers = [ lib.maintainers.bachp ];
 
   options.services.minio = {
     enable = mkEnableOption "Minio Object Storage";
diff --git a/nixos/modules/services/web-servers/nginx/tailscale-auth.nix b/nixos/modules/services/web-servers/nginx/tailscale-auth.nix
index 7529e6258fd25..83a3778cbd84c 100644
--- a/nixos/modules/services/web-servers/nginx/tailscale-auth.nix
+++ b/nixos/modules/services/web-servers/nginx/tailscale-auth.nix
@@ -105,6 +105,6 @@ in
     });
   };
 
-  meta.maintainers = with maintainers; [ phaer ];
+  meta.maintainers = with lib.maintainers; [ phaer ];
 
 }
diff --git a/nixos/modules/services/web-servers/rustus.nix b/nixos/modules/services/web-servers/rustus.nix
index 9ca87bb16bf3b..2225c9f9bd832 100644
--- a/nixos/modules/services/web-servers/rustus.nix
+++ b/nixos/modules/services/web-servers/rustus.nix
@@ -9,7 +9,7 @@ let
   cfg = config.services.rustus;
 in
 {
-  meta.maintainers = with maintainers; [ happysalada ];
+  meta.maintainers = with lib.maintainers; [ happysalada ];
 
   options.services.rustus = {
 
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 05ed81e579927..402efca4bb636 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -23,7 +23,7 @@ in
 
 {
   meta = {
-    maintainers = teams.enlightenment.members;
+    maintainers = lib.teams.enlightenment.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix
index 74fabced3af3e..c740840f66776 100644
--- a/nixos/modules/services/x11/desktop-managers/lumina.nix
+++ b/nixos/modules/services/x11/desktop-managers/lumina.nix
@@ -16,7 +16,7 @@ in
 
 {
   meta = {
-    maintainers = teams.lumina.members;
+    maintainers = lib.teams.lumina.members;
   };
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index ac86c385bcc8d..74d21c8e8bcb1 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -10,7 +10,7 @@ in
 
 {
   meta = {
-    maintainers = teams.lxqt.members;
+    maintainers = lib.teams.lxqt.members;
   };
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 14e7e25252de7..c7c7a58b1c06b 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -19,7 +19,7 @@ in
 
   meta = {
     doc = ./pantheon.md;
-    maintainers = teams.pantheon.members;
+    maintainers = lib.teams.pantheon.members;
   };
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/retroarch.nix b/nixos/modules/services/x11/desktop-managers/retroarch.nix
index 445de823e03f9..ff2a44f7a8fc8 100644
--- a/nixos/modules/services/x11/desktop-managers/retroarch.nix
+++ b/nixos/modules/services/x11/desktop-managers/retroarch.nix
@@ -44,5 +44,5 @@ in
     environment.systemPackages = [ cfg.package ];
   };
 
-  meta.maintainers = with maintainers; [ j0hax ];
+  meta.maintainers = with lib.maintainers; [ j0hax ];
 }
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index e1273aa7b7d16..e756d21ce1143 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -9,7 +9,7 @@ let
 in
 {
   meta = {
-    maintainers = teams.xfce.members;
+    maintainers = lib.teams.xfce.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/x11/touchegg.nix b/nixos/modules/services/x11/touchegg.nix
index def3dac738e04..4e5e46b7a431b 100644
--- a/nixos/modules/services/x11/touchegg.nix
+++ b/nixos/modules/services/x11/touchegg.nix
@@ -13,7 +13,7 @@ let
 in
 {
   meta = {
-    maintainers = teams.pantheon.members;
+    maintainers = lib.teams.pantheon.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index 4361dc8451539..35f91b84404c0 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -38,7 +38,7 @@ let
 
   xmonad = if (cfg.config != null) then xmonad-config else xmonad-vanilla;
 in {
-  meta.maintainers = with maintainers; [ lassulus xaverdh ivanbrennan slotThe ];
+  meta.maintainers = with lib.maintainers; [ lassulus xaverdh ivanbrennan slotThe ];
 
   options = {
     services.xserver.windowManager.xmonad = {
diff --git a/nixos/modules/system/boot/loader/external/external.nix b/nixos/modules/system/boot/loader/external/external.nix
index f159aa498f879..7a5277efddd71 100644
--- a/nixos/modules/system/boot/loader/external/external.nix
+++ b/nixos/modules/system/boot/loader/external/external.nix
@@ -12,7 +12,7 @@ let
 in
 {
   meta = {
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       cole-h
       grahamc
       raitobezarius
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index d7ada20e0b0ba..8fab35bd27510 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -107,5 +107,5 @@ in
       };
     };
   };
-  meta.maintainers = with maintainers; [ arianvp ];
+  meta.maintainers = with lib.maintainers; [ arianvp ];
 }
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index 973bccc83891f..cd1dd28352b6e 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -21,7 +21,7 @@ let
 in
 {
   meta = {
-    maintainers = teams.podman.members;
+    maintainers = lib.teams.podman.members;
   };
 
   options.virtualisation.cri-o = {
diff --git a/nixos/modules/virtualisation/digital-ocean-config.nix b/nixos/modules/virtualisation/digital-ocean-config.nix
index 4ef2b85551c66..3d881355db113 100644
--- a/nixos/modules/virtualisation/digital-ocean-config.nix
+++ b/nixos/modules/virtualisation/digital-ocean-config.nix
@@ -188,6 +188,6 @@ with lib;
 
     }
   ];
-  meta.maintainers = with maintainers; [ arianvp eamsden ];
+  meta.maintainers = with lib.maintainers; [ arianvp eamsden ];
 }
 
diff --git a/nixos/modules/virtualisation/digital-ocean-image.nix b/nixos/modules/virtualisation/digital-ocean-image.nix
index 3d9fe52bb0db7..b2d7fe97ae0f0 100644
--- a/nixos/modules/virtualisation/digital-ocean-image.nix
+++ b/nixos/modules/virtualisation/digital-ocean-image.nix
@@ -106,7 +106,7 @@ in
 
     };
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     arianvp
     eamsden
   ];
diff --git a/nixos/modules/virtualisation/digital-ocean-init.nix b/nixos/modules/virtualisation/digital-ocean-init.nix
index b28e512255e38..e3e67e197e3e5 100644
--- a/nixos/modules/virtualisation/digital-ocean-init.nix
+++ b/nixos/modules/virtualisation/digital-ocean-init.nix
@@ -107,7 +107,7 @@ in
       '';
     };
   };
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     arianvp
     eamsden
   ];
diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index e3df23dfff6a7..706244931fbd7 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -97,5 +97,5 @@ with lib;
 
   };
 
-  meta.maintainers = with maintainers; [ arianvp ];
+  meta.maintainers = with lib.maintainers; [ arianvp ];
 }
diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix
index 5dfac60c1c693..6b8aa8f80be37 100644
--- a/nixos/modules/virtualisation/kvmgt.nix
+++ b/nixos/modules/virtualisation/kvmgt.nix
@@ -99,5 +99,5 @@ in
       };
   };
 
-  meta.maintainers = with maintainers; [ patryk27 ];
+  meta.maintainers = with lib.maintainers; [ patryk27 ];
 }
diff --git a/nixos/modules/virtualisation/linode-image.nix b/nixos/modules/virtualisation/linode-image.nix
index 80aefbf54a369..bbf1e5e43b0e9 100644
--- a/nixos/modules/virtualisation/linode-image.nix
+++ b/nixos/modules/virtualisation/linode-image.nix
@@ -79,5 +79,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ cyntheticfox ];
+  meta.maintainers = with lib.maintainers; [ cyntheticfox ];
 }
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index 498044ce43c88..8cfd04ef1d9d3 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -146,6 +146,6 @@ in
     '')
   ];
 
-  meta.maintainers = with maintainers; [ netixx ];
+  meta.maintainers = with lib.maintainers; [ netixx ];
 
 }
diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index 74dc7d4156a8c..45e86abeb98eb 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -26,7 +26,7 @@ in
   ];
 
   meta = {
-    maintainers = [ maintainers.kjeremy ];
+    maintainers = [ lib.maintainers.kjeremy ];
   };
 
   options.virtualisation.vmware.guest = {
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index f7192ca228d02..f83b486d7d79a 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -45,7 +45,7 @@ mapAttrs (
     name = "chromium-${channel}";
     meta =
       {
-        maintainers = with maintainers; [
+        maintainers = with lib.maintainers; [
           aszlig
           primeos
         ];
diff --git a/nixos/tests/cri-o.nix b/nixos/tests/cri-o.nix
index 216351bda8dbc..314e52855a1c6 100644
--- a/nixos/tests/cri-o.nix
+++ b/nixos/tests/cri-o.nix
@@ -3,7 +3,7 @@ import ./make-test-python.nix (
   { pkgs, ... }:
   {
     name = "cri-o";
-    meta.maintainers = with pkgs.lib; teams.podman.members;
+    meta.maintainers = with pkgs.lib; lib.teams.podman.members;
 
     nodes = {
       crio = {
diff --git a/nixos/tests/forgejo.nix b/nixos/tests/forgejo.nix
index 392b380b21c98..4ac94c8dd7074 100644
--- a/nixos/tests/forgejo.nix
+++ b/nixos/tests/forgejo.nix
@@ -54,7 +54,7 @@ let
     type:
     nameValuePair type (makeTest {
       name = "forgejo-${type}";
-      meta.maintainers = with maintainers; [
+      meta.maintainers = with lib.maintainers; [
         bendlas
         emilylange
       ];
diff --git a/nixos/tests/gemstash.nix b/nixos/tests/gemstash.nix
index 1b87228e9e63c..b780fe48680af 100644
--- a/nixos/tests/gemstash.nix
+++ b/nixos/tests/gemstash.nix
@@ -9,7 +9,7 @@ with pkgs.lib;
 
 let
   common_meta = {
-    maintainers = [ maintainers.viraptor ];
+    maintainers = [ lib.maintainers.viraptor ];
   };
 in
 {
diff --git a/nixos/tests/geoserver.nix b/nixos/tests/geoserver.nix
index 3e9416961e90a..3f048c79171a0 100644
--- a/nixos/tests/geoserver.nix
+++ b/nixos/tests/geoserver.nix
@@ -19,7 +19,7 @@ in
 
   name = "geoserver";
   meta = {
-    maintainers = with lib; [ teams.geospatial.members ];
+    maintainers = [ lib.teams.geospatial.members ];
   };
 
   nodes = {
diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix
index eb16c47429936..5156c4ac8482c 100644
--- a/nixos/tests/gitea.nix
+++ b/nixos/tests/gitea.nix
@@ -33,7 +33,7 @@ let
     type:
     nameValuePair type (makeTest {
       name = "${giteaPackage.pname}-${type}";
-      meta.maintainers = with maintainers; [
+      meta.maintainers = with lib.maintainers; [
         aanderse
         kolaente
       ];
diff --git a/nixos/tests/hadoop/hbase.nix b/nixos/tests/hadoop/hbase.nix
index efc85c869bf91..6fda344c42454 100644
--- a/nixos/tests/hadoop/hbase.nix
+++ b/nixos/tests/hadoop/hbase.nix
@@ -130,6 +130,6 @@ import ../make-test-python.nix (
       thrift.wait_for_open_port(9090)
     '';
 
-    meta.maintainers = with maintainers; [ illustris ];
+    meta.maintainers = with lib.maintainers; [ illustris ];
   }
 )
diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix
index 35c71aa088538..3febba12d6253 100644
--- a/nixos/tests/matomo.nix
+++ b/nixos/tests/matomo.nix
@@ -60,7 +60,7 @@ in
   };
   matomo-beta = matomoTest pkgs.matomo-beta // {
     name = "matomo-beta";
-    meta.maintainers = with maintainers; [
+    meta.maintainers = with lib.maintainers; [
       florianjacob
       mmilata
       twey
diff --git a/nixos/tests/qgis.nix b/nixos/tests/qgis.nix
index 1a7b75891b96d..6b863249517ad 100644
--- a/nixos/tests/qgis.nix
+++ b/nixos/tests/qgis.nix
@@ -15,7 +15,7 @@ import ./make-test-python.nix (
   {
     name = "qgis";
     meta = {
-      maintainers = with lib; [ teams.geospatial.members ];
+      maintainers = [ lib.teams.geospatial.members ];
     };
 
     nodes = {
diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix
index 1a002abfbfff5..2478034be0240 100644
--- a/nixos/tests/redmine.nix
+++ b/nixos/tests/redmine.nix
@@ -42,7 +42,7 @@ let
       '';
     }
     // {
-      meta.maintainers = [ maintainers.aanderse ];
+      meta.maintainers = [ lib.maintainers.aanderse ];
     };
 in
 {
diff --git a/nixos/tests/rshim.nix b/nixos/tests/rshim.nix
index 474018732e165..172c9d994d7aa 100644
--- a/nixos/tests/rshim.nix
+++ b/nixos/tests/rshim.nix
@@ -10,7 +10,7 @@ with pkgs.lib;
 {
   basic = makeTest {
     name = "rshim";
-    meta.maintainers = with maintainers; [ nikstur ];
+    meta.maintainers = with lib.maintainers; [ nikstur ];
 
     nodes.machine =
       { config, pkgs, ... }:
diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix
index 570cd6b934091..aba0a6cd82e13 100644
--- a/nixos/tests/systemd-boot.nix
+++ b/nixos/tests/systemd-boot.nix
@@ -307,7 +307,7 @@ in
     with pkgs.lib;
     optionalAttrs (meta.availableOn { inherit system; } pkgs.memtest86plus) (makeTest {
       name = "systemd-boot-memtest86";
-      meta.maintainers = with maintainers; [ julienmalka ];
+      meta.maintainers = with lib.maintainers; [ julienmalka ];
 
       nodes.machine =
         { pkgs, lib, ... }: