treewide: remove 'with lib;'

modules/hardware/bluetooth/default.nix

@@ -8,8 +8,8 @@ let
   cfg = config.my.hardware.bluetooth;
 in
 {
-  options.my.hardware.bluetooth = with lib; {
+  options.my.hardware.bluetooth = {
-    enable = mkEnableOption "bluetooth configuration";
+    enable = lib.mkEnableOption "bluetooth configuration";
   };
 
   config = lib.mkIf cfg.enable {

modules/hardware/debug/default.nix

@@ -8,8 +8,8 @@ let
   cfg = config.my.hardware.debug;
 in
 {
-  options.my.hardware.debug = with lib; {
+  options.my.hardware.debug = {
-    enable = mkEnableOption "hardware-debug configuration";
+    enable = lib.mkEnableOption "hardware-debug configuration";
   };
 
   config = lib.mkIf cfg.enable {

modules/hardware/drive-monitor/default.nix

@@ -3,11 +3,11 @@ let
   cfg = config.my.hardware.drive-monitor;
 in
 {
-  options.my.hardware.drive-monitor = with lib; {
+  options.my.hardware.drive-monitor = {
-    enable = mkEnableOption "drive-monitor configuration";
+    enable = lib.mkEnableOption "drive-monitor configuration";
 
-    OnFailureMail = mkOption {
+    OnFailureMail = lib.mkOption {
-      type = types.nullOr types.str;
+      type = lib.types.nullOr lib.types.str;
       description = "Mail address where to send the error report";
       default = null;
       example = "alarm@mail.com";

modules/hardware/firmware/default.nix

@@ -3,16 +3,16 @@ let
   cfg = config.my.hardware.firmware;
 in
 {
-  options.my.hardware.firmware = with lib; {
+  options.my.hardware.firmware = {
-    enable = mkEnableOption "firmware configuration";
+    enable = lib.mkEnableOption "firmware configuration";
 
-    cpuFlavor = mkOption {
+    cpuFlavor = lib.mkOption {
-      type =
+      type = lib.types.nullOr (
-        with types;
+        lib.types.enum [
-        nullOr (enum [
           "intel"
           "amd"
-        ]);
+        ]
+      );
       default = null;
       example = "intel";
       description = "Which kind of CPU to activate micro-code updates";

modules/hardware/graphics/default.nix

@@ -8,15 +8,15 @@ let
   cfg = config.my.hardware.graphics;
 in
 {
-  options.my.hardware.graphics = with lib; {
+  options.my.hardware.graphics = {
-    enable = mkEnableOption "graphics configuration";
+    enable = lib.mkEnableOption "graphics configuration";
-    cpuFlavor = mkOption {
+    cpuFlavor = lib.mkOption {
-      type =
+      type = lib.types.nullOr (
-        with types;
+        lib.types.enum [
-        nullOr (enum [
           "amd"
           "intel"
-        ]);
+        ]
+      );
       default = null;
       example = "intel";
       description = "Which kind of GPU";

modules/hardware/id-card/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.hardware.id-card;
 in
 {
-  options.my.hardware.id-card = with lib; {
+  options.my.hardware.id-card = {
-    enable = mkEnableOption "german id card authentication";
+    enable = lib.mkEnableOption "german id card authentication";
   };
 
   config = lib.mkIf cfg.enable {

modules/services/acme/default.nix

@@ -5,11 +5,11 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.acme = with lib; {
+  options.my.services.acme = {
-    enable = mkEnableOption "ACME certificates";
+    enable = lib.mkEnableOption "ACME certificates";
 
-    credentialsFile = mkOption {
+    credentialsFile = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       example = "/var/lib/acme/creds.env";
       description = ''
         INWX API key file as an 'EnvironmentFile' (see `systemd.exec(5)`)

modules/services/alertmanager/default.nix

@@ -10,8 +10,8 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.alertmanager = with lib; {
+  options.my.services.alertmanager = {
-    enable = mkEnableOption "Prometheus alertmanager for monitoring";
+    enable = lib.mkEnableOption "Prometheus alertmanager for monitoring";
   };
 
   config = lib.mkIf cfg.enable {

modules/services/aria2/default.nix

@@ -10,11 +10,11 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.aria2 = with lib; {
+  options.my.services.aria2 = {
-    enable = mkEnableOption "Aria2 for downloads";
+    enable = lib.mkEnableOption "Aria2 for downloads";
 
-    downloadDir = mkOption {
+    downloadDir = lib.mkOption {
-      type = types.path;
+      type = lib.types.path;
       description = ''
         Directory to store downloaded files.
       '';

modules/services/backup/default.nix

@@ -8,59 +8,59 @@ let
   cfg = config.my.services.backup;
 in
 {
-  options.my.services.backup = with lib; {
+  options.my.services.backup = {
-    enable = mkEnableOption "Borgbackup Service";
+    enable = lib.mkEnableOption "Borgbackup Service";
 
-    passwordFile = mkOption {
+    passwordFile = lib.mkOption {
-      type = types.path;
+      type = lib.types.path;
       description = "Password for the backup";
       example = "/run/secrets/password";
     };
 
-    sshHost = mkOption {
+    sshHost = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       description = "ssh-hostname for remote access";
       default = "u181505-sub1.your-storagebox.de";
       example = "test.domain.com";
     };
-    sshUser = mkOption {
+    sshUser = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       description = "ssh-user for remote access";
       default = "u181505-sub1";
       example = "max";
     };
-    sshPort = mkOption {
+    sshPort = lib.mkOption {
-      type = types.port;
+      type = lib.types.port;
       description = "ssh-port for remote access";
       default = 23;
       example = 22;
     };
-    sshKeyFile = mkOption {
+    sshKeyFile = lib.mkOption {
-      type = types.path;
+      type = lib.types.path;
       description = "ssh-key for remote access";
       example = "/run/secrets/ssh_key";
     };
 
-    OnFailureNotification = mkOption {
+    OnFailureNotification = lib.mkOption {
-      type = types.bool;
+      type = lib.types.bool;
       description = "whether to show a warning to all users or not";
       default = false;
     };
-    OnFailureMail = mkOption {
+    OnFailureMail = lib.mkOption {
-      type = types.nullOr types.str;
+      type = lib.types.nullOr lib.types.str;
       description = "Mail address where to send the error report";
       default = null;
       example = "alarm@mail.com";
     };
 
-    paths = mkOption {
+    paths = lib.mkOption {
-      type = with types; listOf str;
+      type = lib.types.listOf lib.types.str;
       description = "additional path(s) to back up";
       default = [ "/" ];
       example = [ "/home/user" ];
     };
-    exclude = mkOption {
+    exclude = lib.mkOption {
-      type = with types; listOf str;
+      type = lib.types.listOf lib.types.str;
       description = "Exclude paths matching any of the given patterns. See `borg help patterns`";
       default = [ ];
       example = [
@@ -69,8 +69,8 @@ in
       ];
     };
 
-    doInit = mkOption {
+    doInit = lib.mkOption {
-      type = types.bool;
+      type = lib.types.bool;
       description = ''
         Run {command}`borg init` if the
         specified {option}`repo` does not exist.

modules/services/bazarr/default.nix

@@ -6,8 +6,8 @@ let
   port = config.services.bazarr.listenPort;
 in
 {
-  options.my.services.bazarr = with lib; {
+  options.my.services.bazarr = {
-    enable = mkEnableOption "Bazarr for subtitle management";
+    enable = lib.mkEnableOption "Bazarr for subtitle management";
 
     apiKeyFile = lib.mkOption {
       type = lib.types.path;

modules/services/blackbox/default.nix

@@ -24,13 +24,13 @@ let
   };
 in
 {
-  options.my.services.blackbox = with lib; {
+  options.my.services.blackbox = {
-    enable = mkEnableOption "Blackbox prometheus exporter";
+    enable = lib.mkEnableOption "Blackbox prometheus exporter";
 
-    http_endpoints = mkOption {
+    http_endpoints = lib.mkOption {
-      type = types.listOf types.str;
+      type = lib.types.listOf lib.types.str;
       default = [ ];
-      example = literalExpression ''
+      example = lib.literalExpression ''
         [
           "https://domain.com"
           "https://another-domain.com"

modules/services/blocky/default.nix

@@ -9,20 +9,20 @@ let
   cfg = config.my.services.blocky;
 in
 {
-  options.my.services.blocky = with lib; {
+  options.my.services.blocky = {
-    enable = mkEnableOption "Blocky DNS Server";
+    enable = lib.mkEnableOption "Blocky DNS Server";
 
-    httpPort = mkOption {
+    httpPort = lib.mkOption {
-      type = types.port;
+      type = lib.types.port;
       default = 8053;
       example = 8080;
       description = "port for requests";
     };
 
-    settings = mkOption {
+    settings = lib.mkOption {
       inherit (pkgs.formats.json { }) type;
       default = { };
-      example = literalExpression ''
+      example = lib.literalExpression ''
         { ports.http = "8053" };
       '';
       description = ''

modules/services/dyndns/default.nix

@@ -5,17 +5,17 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.dyndns = with lib; {
+  options.my.services.dyndns = {
-    enable = mkEnableOption "Dyndns";
+    enable = lib.mkEnableOption "Dyndns";
 
-    username = mkOption {
+    username = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       description = "Username for the dyndns.";
       example = "admin";
       default = "Stunkymonkey-dyndns";
     };
-    passwordFile = mkOption {
+    passwordFile = lib.mkOption {
-      type = types.path;
+      type = lib.types.path;
       description = "Password for the username for dyndns.";
       example = "/run/secrets/freshrss";
     };

modules/services/finance/default.nix

@@ -9,11 +9,11 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.finance = with lib; {
+  options.my.services.finance = {
     enable = lib.mkEnableOption "Finance firefly service.";
 
-    appKeyFile = mkOption {
+    appKeyFile = lib.mkOption {
-      type = types.path;
+      type = lib.types.path;
       description = "appkey for the service.";
       example = "/run/secrets/freshrss";
       default = "base64:ICs6jizTJnu4U8Sl/+GKIUC6TSK+0i+Lu84CicRhTNE=";

modules/services/freshrss/default.nix

@@ -10,30 +10,30 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.freshrss = with lib; {
+  options.my.services.freshrss = {
     enable = lib.mkEnableOption "FreshRSS feed reader";
 
-    package = mkOption {
+    package = lib.mkOption {
-      type = types.package;
+      type = lib.types.package;
       default = pkgs.freshrss;
       description = "Which FreshRSS package to use.";
     };
 
-    defaultUser = mkOption {
+    defaultUser = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       default = "admin";
       description = "Default username for FreshRSS.";
       example = "eva";
     };
 
-    passwordFile = mkOption {
+    passwordFile = lib.mkOption {
-      type = types.path;
+      type = lib.types.path;
       description = "Password for the defaultUser for FreshRSS.";
       example = "/run/secrets/freshrss";
     };
 
-    language = mkOption {
+    language = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       default = "en";
       description = "Default language for FreshRSS.";
       example = "de";

modules/services/fritzbox/default.nix

@@ -8,18 +8,18 @@ let
   cfg = config.my.services.fritzbox;
 in
 {
-  options.my.services.fritzbox = with lib; {
+  options.my.services.fritzbox = {
-    enable = mkEnableOption "Fritzbox-Monitoring";
+    enable = lib.mkEnableOption "Fritzbox-Monitoring";
 
-    username = mkOption {
+    username = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       default = "prometheus";
       example = "admin";
       description = "Admin username";
     };
 
-    passwordFile = mkOption {
+    passwordFile = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       example = "/var/lib/fritz/password.txt";
       description = "password stored in a file";
     };

modules/services/grafana/default.nix

@@ -10,18 +10,18 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.grafana = with lib; {
+  options.my.services.grafana = {
-    enable = mkEnableOption "Grafana for visualizing";
+    enable = lib.mkEnableOption "Grafana for visualizing";
 
-    username = mkOption {
+    username = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       default = "felix";
       example = "admin";
       description = "Admin username";
     };
 
-    passwordFile = mkOption {
+    passwordFile = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       example = "/var/lib/grafana/password.txt";
       description = "Admin password stored in a file";
     };

modules/services/hedgedoc/default.nix

@@ -10,10 +10,10 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.hedgedoc = with lib; {
+  options.my.services.hedgedoc = {
-    enable = mkEnableOption "Hedgedoc Music Server";
+    enable = lib.mkEnableOption "Hedgedoc Music Server";
 
-    settings = mkOption {
+    settings = lib.mkOption {
       inherit (pkgs.formats.json { }) type;
       default = { };
       example = {

modules/services/home-automation/default.nix

@@ -10,14 +10,14 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.home-automation = with lib; {
+  options.my.services.home-automation = {
-    enable = mkEnableOption "home-assistant server";
+    enable = lib.mkEnableOption "home-assistant server";
 
     package = lib.mkPackageOption pkgs "home-assistant" { };
 
-    extraComponents = mkOption {
+    extraComponents = lib.mkOption {
-      type = types.listOf (types.enum cfg.package.availableComponents);
+      type = lib.types.listOf (lib.types.enum cfg.package.availableComponents);
-      example = literalExpression ''
+      example = lib.literalExpression ''
         [
           "analytics"
           "default_config"
@@ -41,8 +41,8 @@ in
       '';
     };
 
-    latitude = mkOption {
+    latitude = lib.mkOption {
-      type = types.nullOr (types.either types.float types.str);
+      type = lib.types.nullOr (lib.types.either lib.types.float lib.types.str);
       default = null;
       example = 52.3;
       description = ''
@@ -50,8 +50,8 @@ in
       '';
     };
 
-    longitude = mkOption {
+    longitude = lib.mkOption {
-      type = types.nullOr (types.either types.float types.str);
+      type = lib.types.nullOr (lib.types.either lib.types.float lib.types.str);
       default = null;
       example = 4.9;
       description = ''
@@ -59,16 +59,16 @@ in
       '';
     };
 
-    elevation = mkOption {
+    elevation = lib.mkOption {
-      type = types.nullOr (types.either types.float types.str);
+      type = lib.types.nullOr (lib.types.either lib.types.float lib.types.str);
       default = null;
       description = ''
         your location elevation. Impacts sunrise data.
       '';
     };
 
-    timezone = mkOption {
+    timezone = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       default = "GMT";
       description = ''
         your timezone.

modules/services/homepage/default.nix

@@ -10,8 +10,8 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.homepage = with lib; {
+  options.my.services.homepage = {
-    enable = mkEnableOption "Stunkymonkey-Hompage";
+    enable = lib.mkEnableOption "Stunkymonkey-Hompage";
   };
 
   config = lib.mkIf cfg.enable {

modules/services/homer/default.nix

@@ -19,8 +19,8 @@ in
 {
   imports = [ ./config.nix ];
 
-  options.my.services.homer = with lib; {
+  options.my.services.homer = {
-    enable = mkEnableOption "Homer Dashboard";
+    enable = lib.mkEnableOption "Homer Dashboard";
   };
 
   config = lib.mkIf cfg.enable {

modules/services/initrd-ssh/default.nix

@@ -4,8 +4,8 @@ let
   cfg = config.my.services.initrd-ssh;
 in
 {
-  options.my.services.initrd-ssh = with lib; {
+  options.my.services.initrd-ssh = {
-    enable = mkEnableOption "Enable initrd-ssh service";
+    enable = lib.mkEnableOption "Enable initrd-ssh service";
   };
 
   config = lib.mkIf cfg.enable {

modules/services/jellyfin/default.nix

@@ -19,8 +19,8 @@ let
   });
 in
 {
-  options.my.services.jellyfin = with lib; {
+  options.my.services.jellyfin = {
-    enable = mkEnableOption "Jellyfin Media Server";
+    enable = lib.mkEnableOption "Jellyfin Media Server";
   };
 
   config = lib.mkIf cfg.enable {

modules/services/jellyseerr/default.nix

@@ -5,8 +5,8 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.jellyseerr = with lib; {
+  options.my.services.jellyseerr = {
-    enable = mkEnableOption "Sonarr for films management";
+    enable = lib.mkEnableOption "Sonarr for films management";
   };
 
   config = lib.mkIf cfg.enable {

modules/services/loki/default.nix

@@ -11,35 +11,35 @@ let
   port = 3101;
 in
 {
-  options.my.services.loki = with lib; {
+  options.my.services.loki = {
-    enable = mkEnableOption "loki log monitoring";
+    enable = lib.mkEnableOption "loki log monitoring";
 
-    rules = mkOption {
+    rules = lib.mkOption {
-      type = types.attrsOf (
+      type = lib.types.attrsOf (
-        types.submodule {
+        lib.types.submodule {
           options = {
-            condition = mkOption {
+            condition = lib.mkOption {
-              type = types.str;
+              type = lib.types.str;
               description = ''
                 Loki alert expression.
               '';
               example = ''count_over_time({job=~"secure"} |="sshd[" |~": Failed|: Invalid|: Connection closed by authenticating user" | __error__="" [15m]) > 15'';
               default = null;
             };
-            description = mkOption {
+            description = lib.mkOption {
-              type = types.str;
+              type = lib.types.str;
               description = ''
                 Loki alert message.
               '';
               example = "Prometheus encountered value {{ $value }} with {{ $labels }}";
               default = null;
             };
-            labels = mkOption {
+            labels = lib.mkOption {
-              type = types.nullOr (types.attrsOf types.str);
+              type = lib.types.nullOr (lib.types.attrsOf lib.types.str);
               description = ''
                 Additional alert labels.
               '';
-              example = literalExpression ''
+              example = lib.literalExpression ''
                 { severity = "page" };
               '';
               default = { };

modules/services/matrix-bot/default.nix

@@ -8,24 +8,24 @@ let
   cfg = config.my.services.matrix-bot;
 in
 {
-  options.my.services.matrix-bot = with lib; {
+  options.my.services.matrix-bot = {
-    enable = mkEnableOption "enable matrix forwarding bot";
+    enable = lib.mkEnableOption "enable matrix forwarding bot";
-    Username = mkOption {
+    Username = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       description = "Matrix bot name.";
       example = "@bot:matrix.org";
       default = "@stunkymonkey-bot:matrix.org";
     };
-    PasswortFile = mkOption {
+    PasswortFile = lib.mkOption {
-      type = types.path;
+      type = lib.types.path;
       description = ''
         Password for the bot.
         format: MX_TOKEN=<token>
       '';
       example = "/run/secrets/password";
     };
-    RoomID = mkOption {
+    RoomID = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       description = "Matrix room id.";
       example = "!abcdefghijklmnopqr:matrix.org";
       default = "!ZWnKiKLuQNBkBGMPCl:matrix.org";

modules/services/minecraft-server/default.nix

@@ -9,8 +9,8 @@ let
   cfg = config.my.services.minecraft-server;
 in
 {
-  options.my.services.minecraft-server = with lib; {
+  options.my.services.minecraft-server = {
-    enable = mkEnableOption "Minecraft Server";
+    enable = lib.mkEnableOption "Minecraft Server";
   };
 
   config = lib.mkIf cfg.enable {

modules/services/navidrome/default.nix

@@ -10,10 +10,10 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.navidrome = with lib; {
+  options.my.services.navidrome = {
-    enable = mkEnableOption "Navidrome Music Server";
+    enable = lib.mkEnableOption "Navidrome Music Server";
 
-    settings = mkOption {
+    settings = lib.mkOption {
       inherit (pkgs.formats.json { }) type;
       default = {
         EnableSharing = true;
@@ -29,8 +29,8 @@ in
       '';
     };
 
-    musicFolder = mkOption {
+    musicFolder = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       example = "/mnt/music/";
       description = "Music folder";
     };

modules/services/nextcloud/default.nix

@@ -10,28 +10,28 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.nextcloud = with lib; {
+  options.my.services.nextcloud = {
-    enable = mkEnableOption "Nextcloud";
+    enable = lib.mkEnableOption "Nextcloud";
-    maxSize = mkOption {
+    maxSize = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       default = "10G";
       example = "512M";
       description = "Maximum file upload size";
     };
-    admin = mkOption {
+    admin = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       default = "felix";
       example = "admin";
       description = "Name of the admin user";
     };
-    default_phone_region = mkOption {
+    default_phone_region = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       default = "DE";
       example = "US";
       description = "country codes for automatic phone-number ";
     };
-    passwordFile = mkOption {
+    passwordFile = lib.mkOption {
-      type = types.path;
+      type = lib.types.path;
       example = "/var/lib/nextcloud/password.txt";
       description = ''
         Path to a file containing the admin's password, must be readable by
@@ -39,8 +39,8 @@ in
       '';
     };
 
-    exporterPasswordFile = mkOption {
+    exporterPasswordFile = lib.mkOption {
-      type = types.path;
+      type = lib.types.path;
       example = "/var/lib/nextcloud/password.txt";
       description = ''
         Path to a file containing the admin's password, must be readable by

modules/services/node-exporter/default.nix

@@ -10,8 +10,8 @@ let
   cfg = config.my.services.node-exporter;
 in
 {
-  options.my.services.node-exporter = with lib; {
+  options.my.services.node-exporter = {
-    enable = mkEnableOption "Node-Exporter for monitoring";
+    enable = lib.mkEnableOption "Node-Exporter for monitoring";
   };
 
   config = lib.mkIf cfg.enable {

modules/services/paperless/default.nix

@@ -5,23 +5,23 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.paperless = with lib; {
+  options.my.services.paperless = {
-    enable = mkEnableOption "Paperless Server";
+    enable = lib.mkEnableOption "Paperless Server";
 
-    passwordFile = mkOption {
+    passwordFile = lib.mkOption {
-      type = types.path;
+      type = lib.types.path;
       description = "Password for the defaultUser for FreshRSS.";
       example = "/run/secrets/freshrss";
     };
 
-    mediaDir = mkOption {
+    mediaDir = lib.mkOption {
-      type = types.path;
+      type = lib.types.path;
       description = "Location of the FreshRSS data.";
       example = "/data/docs";
     };
 
-    settings = mkOption {
+    settings = lib.mkOption {
-      type = types.attrs;
+      type = lib.types.attrs;
       default = { };
       description = "additional extraConfig";
     };

modules/services/passworts/default.nix

@@ -5,10 +5,10 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.passworts = with lib; {
+  options.my.services.passworts = {
-    enable = mkEnableOption "Passwords Server";
+    enable = lib.mkEnableOption "Passwords Server";
-    port = mkOption {
+    port = lib.mkOption {
-      type = types.port;
+      type = lib.types.port;
       default = 5010;
       example = 8080;
       description = "Internal port for webui";

modules/services/prometheus/default.nix

@@ -10,50 +10,50 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.prometheus = with lib; {
+  options.my.services.prometheus = {
-    enable = mkEnableOption "Prometheus for monitoring";
+    enable = lib.mkEnableOption "Prometheus for monitoring";
 
-    scrapeInterval = mkOption {
+    scrapeInterval = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       default = "15s";
       example = "1m";
       description = "Scrape interval";
     };
 
-    retentionTime = mkOption {
+    retentionTime = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       default = "2y";
       example = "1m";
       description = "retention time";
     };
 
     # a good collections for alerts can be found here: https://samber.github.io/awesome-prometheus-alerts/rules#blackbox
-    rules = mkOption {
+    rules = lib.mkOption {
-      type = types.attrsOf (
+      type = lib.types.attrsOf (
-        types.submodule {
+        lib.types.submodule {
           options = {
-            condition = mkOption {
+            condition = lib.mkOption {
-              type = types.str;
+              type = lib.types.str;
               description = ''
                 Prometheus alert expression.
               '';
-              example = ''disk_used_percent{mode!="ro"} >= 90'';
+              example = "up == 0";
               default = null;
             };
-            description = mkOption {
+            description = lib.mkOption {
-              type = types.str;
+              type = lib.types.str;
               description = ''
                 Prometheus alert message.
               '';
               example = "Prometheus encountered value {{ $value }} with {{ $labels }}";
               default = null;
             };
-            labels = mkOption {
+            labels = lib.mkOption {
-              type = types.nullOr (types.attrsOf types.str);
+              type = lib.types.nullOr (lib.types.attrsOf lib.types.str);
               description = ''
                 Additional alert labels.
               '';
-              example = literalExpression ''
+              example = lib.literalExpression ''
                 { severity = "page" };
               '';
               default = { };

modules/services/promtail/default.nix

@@ -5,11 +5,11 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.promtail = with lib; {
+  options.my.services.promtail = {
-    enable = mkEnableOption "promtail log forwarding";
+    enable = lib.mkEnableOption "promtail log forwarding";
 
-    port = mkOption {
+    port = lib.mkOption {
-      type = types.port;
+      type = lib.types.port;
       default = 9081;
       example = 3002;
       description = "Internal port";

modules/services/prowlarr/default.nix

@@ -7,8 +7,8 @@ let
   port = 9696;
 in
 {
-  options.my.services.prowlarr = with lib; {
+  options.my.services.prowlarr = {
-    enable = mkEnableOption "Prowlarr for indexing";
+    enable = lib.mkEnableOption "Prowlarr for indexing";
 
     apiKeyFile = lib.mkOption {
       type = lib.types.path;

modules/services/radarr/default.nix

@@ -7,8 +7,8 @@ let
   port = 7878;
 in
 {
-  options.my.services.radarr = with lib; {
+  options.my.services.radarr = {
-    enable = mkEnableOption "Radarr for film management";
+    enable = lib.mkEnableOption "Radarr for film management";
 
     apiKeyFile = lib.mkOption {
       type = lib.types.path;

modules/services/sonarr/default.nix

@@ -7,8 +7,8 @@ let
   port = 8989;
 in
 {
-  options.my.services.sonarr = with lib; {
+  options.my.services.sonarr = {
-    enable = mkEnableOption "Sonarr for series management";
+    enable = lib.mkEnableOption "Sonarr for series management";
 
     apiKeyFile = lib.mkOption {
       type = lib.types.path;

modules/services/tandoor-recipes/default.nix

@@ -5,8 +5,8 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.tandoor-recipes = with lib; {
+  options.my.services.tandoor-recipes = {
-    enable = mkEnableOption "Tandoor Recipes";
+    enable = lib.mkEnableOption "Tandoor Recipes";
   };
 
   config = lib.mkIf cfg.enable {

modules/services/vpn/default.nix

@@ -5,11 +5,11 @@ let
   inherit (config.networking) domain;
 in
 {
-  options.my.services.vpn = with lib; {
+  options.my.services.vpn = {
-    enable = mkEnableOption "Headscale VPN";
+    enable = lib.mkEnableOption "Headscale VPN";
-    isMaster = mkEnableOption "Headscale Master";
+    isMaster = lib.mkEnableOption "Headscale Master";
-    port = mkOption {
+    port = lib.mkOption {
-      type = types.port;
+      type = lib.types.port;
       default = 8090;
       example = 8080;
       description = "Internal port";

modules/system/avahi/default.nix

@@ -9,8 +9,8 @@ let
   cfg = config.my.system.avahi;
 in
 {
-  options.my.system.avahi = with lib; {
+  options.my.system.avahi = {
-    enable = mkEnableOption "avahi configuration";
+    enable = lib.mkEnableOption "avahi configuration";
   };
 
   config = lib.mkIf cfg.enable {

modules/system/docker/default.nix

@@ -10,8 +10,8 @@ let
   cfg = config.my.system.docker;
 in
 {
-  options.my.system.docker = with lib; {
+  options.my.system.docker = {
-    enable = mkEnableOption "docker configuration";
+    enable = lib.mkEnableOption "docker configuration";
   };
 
   config = lib.mkIf cfg.enable {

modules/system/fonts/default.nix

@@ -8,11 +8,11 @@ let
   cfg = config.my.system.fonts;
 in
 {
-  options.my.system.fonts = with lib; {
+  options.my.system.fonts = {
-    enable = mkEnableOption "fonts configuration";
+    enable = lib.mkEnableOption "fonts configuration";
 
-    additionalFonts = mkOption {
+    additionalFonts = lib.mkOption {
-      type = types.listOf types.package;
+      type = lib.types.listOf lib.types.package;
       default = [ ];
       example = "fira";
       description = "Which additional fonts should be added as well";

modules/system/kvm/default.nix

@@ -3,16 +3,16 @@ let
   cfg = config.my.system.kvm;
 in
 {
-  options.my.system.kvm = with lib; {
+  options.my.system.kvm = {
-    enable = mkEnableOption "kvm configuration";
+    enable = lib.mkEnableOption "kvm configuration";
 
-    cpuFlavor = mkOption {
+    cpuFlavor = lib.mkOption {
-      type =
+      type = lib.types.nullOr (
-        with types;
+        lib.types.enum [
-        nullOr (enum [
           "intel"
           "amd"
-        ]);
+        ]
+      );
       default = null;
       example = "intel";
       description = "Which kind of CPU to activate kernelModules";

modules/system/miracast/default.nix

@@ -10,8 +10,8 @@ let
   cfg = config.my.system.miracast;
 in
 {
-  options.my.system.miracast = with lib; {
+  options.my.system.miracast = {
-    enable = mkEnableOption "miracast configuration";
+    enable = lib.mkEnableOption "miracast configuration";
   };
 
   config = lib.mkIf cfg.enable {

modules/system/podman/default.nix

@@ -10,8 +10,8 @@ let
   cfg = config.my.system.podman;
 in
 {
-  options.my.system.podman = with lib; {
+  options.my.system.podman = {
-    enable = mkEnableOption "podman configuration";
+    enable = lib.mkEnableOption "podman configuration";
   };
 
   config = lib.mkIf cfg.enable {

modules/system/spell-check/default.nix

@@ -10,8 +10,8 @@ let
   cfg = config.my.system.spell-check;
 in
 {
-  options.my.system.spell-check = with lib; {
+  options.my.system.spell-check = {
-    enable = mkEnableOption "spell-check configuration";
+    enable = lib.mkEnableOption "spell-check configuration";
   };
 
   config = lib.mkIf cfg.enable {

profiles/3d-design/default.nix

@@ -8,8 +8,8 @@ let
   cfg = config.my.profiles."3d-design";
 in
 {
-  options.my.profiles."3d-design" = with lib; {
+  options.my.profiles."3d-design" = {
-    enable = mkEnableOption "3d-design profile";
+    enable = lib.mkEnableOption "3d-design profile";
   };
 
   config = lib.mkIf cfg.enable {

profiles/android/default.nix

@@ -8,8 +8,8 @@ let
   cfg = config.my.profiles.android;
 in
 {
-  options.my.profiles.android = with lib; {
+  options.my.profiles.android = {
-    enable = mkEnableOption "android profile";
+    enable = lib.mkEnableOption "android profile";
   };
 
   config = lib.mkIf cfg.enable {

profiles/clean/default.nix

@@ -8,8 +8,8 @@ let
   cfg = config.my.profiles.clean;
 in
 {
-  options.my.profiles.clean = with lib; {
+  options.my.profiles.clean = {
-    enable = mkEnableOption "clean profile";
+    enable = lib.mkEnableOption "clean profile";
   };
 
   config = lib.mkIf cfg.enable {

profiles/desktop-apps/default.nix

@@ -8,8 +8,8 @@ let
   cfg = config.my.profiles.desktop-apps;
 in
 {
-  options.my.profiles.desktop-apps = with lib; {
+  options.my.profiles.desktop-apps = {
-    enable = mkEnableOption "desktop-apps profile";
+    enable = lib.mkEnableOption "desktop-apps profile";
   };
 
   config = lib.mkIf cfg.enable {

profiles/desktop-dev/default.nix

@@ -8,8 +8,8 @@ let
   cfg = config.my.profiles.desktop-dev;
 in
 {
-  options.my.profiles.desktop-dev = with lib; {
+  options.my.profiles.desktop-dev = {
-    enable = mkEnableOption "desktop-dev profile";
+    enable = lib.mkEnableOption "desktop-dev profile";
   };
 
   config = lib.mkIf cfg.enable {

profiles/development/default.nix

@@ -8,8 +8,8 @@ let
   cfg = config.my.profiles.development;
 in
 {
-  options.my.profiles.development = with lib; {
+  options.my.profiles.development = {
-    enable = mkEnableOption "development profile";
+    enable = lib.mkEnableOption "development profile";
   };
 
   config = lib.mkIf cfg.enable {