modules/core/default.nix

@@ -13,7 +13,11 @@
     ./users.nix
   ];
 
-  options.pub-solar-os = with lib; {
+  options.pub-solar-os =
+    let
+      inherit (lib) mkOption types;
+    in
+    {
       adminEmail = mkOption {
         description = "Email address to use for administrative stuff like ACME";
         type = types.str;

modules/core/networking.nix

@@ -5,7 +5,11 @@
   ...
 }:
 {
-  options.pub-solar-os.networking = with lib; {
+  options.pub-solar-os.networking =
+    let
+      inherit (lib) mkOption types;
+    in
+    {
       domain = mkOption {
         description = "domain on which all services should run. This defaults to pub.solar";
         type = types.str;

modules/core/users.nix

@@ -6,7 +6,11 @@
   ...
 }:
 {
-  options.pub-solar-os.authentication = with lib; {
+  options.pub-solar-os.authentication =
+    let
+      inherit (lib) mkOption types;
+    in
+    {
       username = mkOption {
         description = "Username for the adminstrative user";
         type = types.str;

modules/keycloak/default.nix

@@ -6,12 +6,12 @@
   ...
 }:
 {
-  options.pub-solar-os.auth = with lib; {
+  options.pub-solar-os.auth = {
-    enable = mkEnableOption "Enable keycloak to run on the node";
+    enable = lib.mkEnableOption "Enable keycloak to run on the node";
 
-    realm = mkOption {
+    realm = lib.mkOption {
       description = "Name of the realm";
-      type = types.str;
+      type = lib.types.str;
       default = config.pub-solar-os.networking.domain;
     };
   };