chore: format files

.gitignore

@@ -1,5 +1 @@
-.direnv
-.devenv
-.idea
 result
-.pre-commit-config.yaml

docs/packaging.md

@@ -30,6 +30,7 @@ In GitLab CI this should for example be `JOB-TOKEN: $CI_JOB_TOKEN`.
 A personal access token requires this format instead: `PRIVATE-TOKEN: <your token>`.
 
 !!! note
+
     The script only uploads a version once. If the version already exists it will skip that Nixlet.
 
 ## General

lib/default.nix

@@ -10,7 +10,7 @@ with lib; rec {
     };
     modules = [
       file
-      ({...}: {
+      (_: {
         # pass through all args to the values.nix module
         config =
           rawValues
@@ -59,41 +59,42 @@ with lib; rec {
       eval = {
         system,
         project ? defaultProject,
-        overrides ? ({...}: {}),
+        overrides ? (_: {}),
         values ? {},
       }:
         assert lib.assertMsg (project != null) "No default project set, please pass a project to the render method"; let
           nixletArg = baseNixletArg // {inherit project;};
-        in (kubenix.evalModules.${system} {
+        in
-          module = {kubenix, ...}: {
+          kubenix.evalModules.${system} {
-            imports = with kubenix.modules; [
+            module = {kubenix, ...}: {
-              k8s
+              imports = with kubenix.modules; [
-              helm
+                k8s
-              docker
+                helm
-              files
+                docker
-              ./secretsModule.nix
+                files
-              ({...}: let
+                ./secretsModule.nix
-                finalValues = mkValues "${path}/values.nix" {
+                (_: let
-                  rawValues = values;
+                  finalValues = mkValues "${path}/values.nix" {
-                  nixlet = nixletArg;
+                    rawValues = values;
-                };
+                    nixlet = nixletArg;
-              in {
+                  };
-                imports = [path];
+                in {
-                _module.args.nixlet =
+                  imports = [path];
-                  {
+                  _module.args.nixlet =
-                    values = finalValues;
+                    {
-                  }
+                      values = finalValues;
-                  // nixletArg;
+                    }
-              })
+                    // nixletArg;
-              overrides
+                })
-            ];
+                overrides
-            kubenix.project = project;
+              ];
+              kubenix.project = project;
+            };
           };
-        });
       render = {
         system,
         project ? defaultProject,
-        overrides ? ({...}: {}),
+        overrides ? (_: {}),
         values ? {},
       }:
         (nixlet.eval {
@@ -150,6 +151,6 @@ with lib; rec {
       )
     );
 
-  mkDocs = {nixlet, ...} @ opts:
+  mkDocs = opts:
     import ./valuesDocs.nix (opts // {inherit lib;});
 }

lib/valuesDocs.nix

@@ -31,7 +31,7 @@
 
   optionsNix = builtins.listToAttrs (
     map (o: {
-      name = o.name;
+      inherit (o) name;
       value = removeAttrs o [
         "visible"
         "internal"
@@ -76,9 +76,9 @@
     '')
     + "\n";
 
-  opts = mapAttrsToList (name: opt:
+  opts =
-    optToMd opt)
+    mapAttrsToList (_name: optToMd)
-  optionsNix;
+    optionsNix;
   markdown = concatStringsSep "\n" opts;
 in
   builtins.toFile "values-doc.md" markdown

nixlets/attic/service.nix

@@ -10,7 +10,7 @@ with nixlet; {
             port = 8080;
           }
         ];
-        type = values.service.type;
+        inherit (values.service) type;
       };
     };
   };

nixlets/mosquitto/service.nix

@@ -7,11 +7,11 @@ with nixlet; {
         ports = [
           {
             name = "mqtt";
-            port = values.service.port;
+            inherit (values.service) port;
             targetPort = 1883;
           }
         ];
-        type = values.service.type;
+        inherit (values.service) type;
       };
     };
   };

nixlets/postgres/service.nix

@@ -7,11 +7,11 @@ with nixlet; {
         ports = [
           {
             name = "tcp";
-            port = values.service.port;
+            inherit (values.service) port;
             targetPort = 5432;
           }
         ];
-        type = values.service.type;
+        inherit (values.service) type;
       };
     };
   };

nixlets/surrealdb/deployment.nix

@@ -1,8 +1,4 @@
-{
+{nixlet, ...}:
-  nixlet,
-  lib,
-  ...
-}:
 with nixlet; {
   kubernetes.resources = {
     deployments."${values.uniqueName}" = {

nixlets/surrealdb/service.nix

@@ -8,10 +8,10 @@ with nixlet; {
           {
             name = "http";
             targetPort = "http";
-            port = values.service.port;
+            inherit (values.service) port;
           }
         ];
-        type = values.service.type;
+        inherit (values.service) type;
       };
     };
   };

nixlets/tikv/service.nix

@@ -10,7 +10,7 @@ with nixlet; {
         ports = [
           {
             name = "pd-server";
-            port = values.pd.service.port;
+            inherit (values.pd.service) port;
           }
           {
             name = "peer";
@@ -29,7 +29,7 @@ with nixlet; {
         ports = [
           {
             name = "peer";
-            port = values.tikv.service.port;
+            inherit (values.tikv.service) port;
           }
         ];
         type = "ClusterIP";
@@ -44,10 +44,10 @@ with nixlet; {
         ports = [
           {
             name = "server";
-            port = values.pd.service.port;
+            inherit (values.pd.service) port;
           }
         ];
-        type = values.pd.service.type;
+        inherit (values.pd.service) type;
       };
     };
   };

template/default.nix

@@ -1,4 +1,4 @@
-{nixlet, ...}: {
+{...}: {
   imports = [
     # import other files here
   ];