From 4d183fff584bd06f410594d160dd6df6bfd3d086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 24 Aug 2023 14:12:17 +0200 Subject: [PATCH] apply prettier to source tree --- docs/clan-config.md | 4 ++++ formatter.nix | 4 ++++ lib/jsonschema/example-data.json | 5 +---- lib/jsonschema/example-schema.json | 6 +----- lib/jsonschema/options.json | 29 +++++++---------------------- pkgs/ui/src/app/nodes/NodeList.tsx | 4 ++-- pkgs/ui/src/app/nodes/page.tsx | 4 ++-- pkgs/ui/src/data/nodeData.tsx | 4 ++-- templates/new-clan/systems.json | 4 +--- 9 files changed, 24 insertions(+), 40 deletions(-) diff --git a/docs/clan-config.md b/docs/clan-config.md index 3855cf11..942d0b64 100644 --- a/docs/clan-config.md +++ b/docs/clan-config.md @@ -13,6 +13,7 @@ clan.url = "git+https://git.clan.lol/clan/clan-core"; ``` and inside the mkFlake: + ``` imports = [ inputs.clan.flakeModules.clan-config @@ -20,12 +21,14 @@ imports = [ ``` Add an empty config file and add it to git + ```command echo "{}" > ./clan-settings.json git add ./clan-settings.json ``` Import the clan-config module into your nixos configuration: + ```nix { imports = [ @@ -39,6 +42,7 @@ Import the clan-config module into your nixos configuration: ``` Make sure your nixos configuration is set a default + ```nix {self, ...}: { flake.nixosConfigurations.default = self.nixosConfigurations.my-machine; diff --git a/formatter.nix b/formatter.nix index f348e266..949e7b4c 100644 --- a/formatter.nix +++ b/formatter.nix @@ -14,6 +14,10 @@ treefmt.programs.prettier.settings.plugins = [ "${self'.packages.prettier-plugin-tailwindcss}/lib/node_modules/prettier-plugin-tailwindcss/dist/index.mjs" ]; + treefmt.settings.formatter.prettier.excludes = [ + "secrets.yaml" + "key.json" + ]; treefmt.programs.mypy.enable = true; treefmt.programs.mypy.directories = { diff --git a/lib/jsonschema/example-data.json b/lib/jsonschema/example-data.json index a703d539..240016f7 100644 --- a/lib/jsonschema/example-data.json +++ b/lib/jsonschema/example-data.json @@ -2,10 +2,7 @@ "name": "John Doe", "age": 42, "isAdmin": false, - "kernelModules": [ - "usbhid", - "usb_storage" - ], + "kernelModules": ["usbhid", "usb_storage"], "userIds": { "mic92": 1, "lassulus": 2, diff --git a/lib/jsonschema/example-schema.json b/lib/jsonschema/example-schema.json index 823a5d6c..62d68fb1 100644 --- a/lib/jsonschema/example-schema.json +++ b/lib/jsonschema/example-schema.json @@ -21,11 +21,7 @@ "items": { "type": "string" }, - "default": [ - "nvme", - "xhci_pci", - "ahci" - ], + "default": ["nvme", "xhci_pci", "ahci"], "description": "A list of enabled kernel modules" }, "userIds": { diff --git a/lib/jsonschema/options.json b/lib/jsonschema/options.json index 0b8da527..4ba1ddb8 100644 --- a/lib/jsonschema/options.json +++ b/lib/jsonschema/options.json @@ -8,9 +8,7 @@ "text": "42" }, "description": "The age of the user", - "loc": [ - "age" - ], + "loc": ["age"], "readOnly": false, "type": "signed integer" }, @@ -23,9 +21,7 @@ "text": "false" }, "description": "Is the user an admin?", - "loc": [ - "isAdmin" - ], + "loc": ["isAdmin"], "readOnly": false, "type": "boolean" }, @@ -38,9 +34,7 @@ "text": "[\n \"nvme\"\n \"xhci_pci\"\n \"ahci\"\n]" }, "description": "A list of enabled kernel modules", - "loc": [ - "kernelModules" - ], + "loc": ["kernelModules"], "readOnly": false, "type": "list of string" }, @@ -53,9 +47,7 @@ "text": "\"John Doe\"" }, "description": "The name of the user", - "loc": [ - "name" - ], + "loc": ["name"], "readOnly": false, "type": "string" }, @@ -64,9 +56,7 @@ "/home/grmpf/synced/projects/clan/clan-core/lib/jsonschema/example-interface.nix" ], "description": null, - "loc": [ - "services" - ], + "loc": ["services"], "readOnly": false, "type": "submodule" }, @@ -79,10 +69,7 @@ "text": "\"foo\"" }, "description": "A submodule option", - "loc": [ - "services", - "opt" - ], + "loc": ["services", "opt"], "readOnly": false, "type": "string" }, @@ -95,9 +82,7 @@ "text": "{\n albrecht = 3;\n horst = 1;\n peter = 2;\n}" }, "description": "Some attributes", - "loc": [ - "userIds" - ], + "loc": ["userIds"], "readOnly": false, "type": "attribute set of signed integer" } diff --git a/pkgs/ui/src/app/nodes/NodeList.tsx b/pkgs/ui/src/app/nodes/NodeList.tsx index 9854e0c3..9f7a324a 100644 --- a/pkgs/ui/src/app/nodes/NodeList.tsx +++ b/pkgs/ui/src/app/nodes/NodeList.tsx @@ -140,7 +140,7 @@ function CrudSpeedDial(props: { selected: string | undefined }) { function editDial() { if (isSomethingSelected) { return ( - + ); @@ -173,7 +173,7 @@ function CrudSpeedDial(props: { selected: string | undefined }) { + } diff --git a/pkgs/ui/src/app/nodes/page.tsx b/pkgs/ui/src/app/nodes/page.tsx index b269e977..d912c5fc 100644 --- a/pkgs/ui/src/app/nodes/page.tsx +++ b/pkgs/ui/src/app/nodes/page.tsx @@ -8,8 +8,8 @@ import { StrictMode } from "react"; export default function Page() { return ( - + - + ); } diff --git a/pkgs/ui/src/data/nodeData.tsx b/pkgs/ui/src/data/nodeData.tsx index 9a73d03f..60c982bd 100644 --- a/pkgs/ui/src/data/nodeData.tsx +++ b/pkgs/ui/src/data/nodeData.tsx @@ -9,9 +9,9 @@ export const NodeStatus = { Online: "Online", Offline: "Offline", Pending: "Pending", -} +}; -export type NodeStatusKeys = typeof NodeStatus[keyof typeof NodeStatus]; +export type NodeStatusKeys = (typeof NodeStatus)[keyof typeof NodeStatus]; function createData( name: string, diff --git a/templates/new-clan/systems.json b/templates/new-clan/systems.json index 5f3305fb..4db535b9 100644 --- a/templates/new-clan/systems.json +++ b/templates/new-clan/systems.json @@ -1,3 +1 @@ -[ - "x86_64-linux" -] +["x86_64-linux"]