From df4cacf2623cb1487e6f60b4a360fbaed9562ddb Mon Sep 17 00:00:00 2001
From: Felix Buehler
Date: Sat, 24 Aug 2024 22:05:43 +0200
Subject: nixos/services.felix: remove `with lib;`

---
 nixos/modules/services/misc/felix.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix
index 0283de128afe..3def12e3adef 100644
--- a/nixos/modules/services/misc/felix.nix
+++ b/nixos/modules/services/misc/felix.nix
@@ -1,8 +1,5 @@
 # Felix server
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
 
   cfg = config.services.felix;
@@ -17,23 +14,23 @@ in
 
     services.felix = {
 
-      enable = mkEnableOption "the Apache Felix OSGi service";
+      enable = lib.mkEnableOption "the Apache Felix OSGi service";
 
-      bundles = mkOption {
-        type = types.listOf types.package;
+      bundles = lib.mkOption {
+        type = lib.types.listOf lib.types.package;
         default = [ pkgs.felix_remoteshell ];
-        defaultText = literalExpression "[ pkgs.felix_remoteshell ]";
+        defaultText = lib.literalExpression "[ pkgs.felix_remoteshell ]";
         description = "List of bundles that should be activated on startup";
       };
 
-      user = mkOption {
-        type = types.str;
+      user = lib.mkOption {
+        type = lib.types.str;
         default = "osgi";
         description = "User account under which Apache Felix runs.";
       };
 
-      group = mkOption {
-        type = types.str;
+      group = lib.mkOption {
+        type = lib.types.str;
         default = "osgi";
         description = "Group account under which Apache Felix runs.";
       };
@@ -45,7 +42,7 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     users.groups.osgi.gid = config.ids.gids.osgi;
 
     users.users.osgi =
-- 
cgit 1.4.1