From 012969cb68569bde027947d79b00c8e10ee1d7e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Dec 2024 13:45:46 +0100
Subject: [PATCH] prettier: also format json

---
 formatter.nix                      | 7 +++++++
 pkgs/editor/settings.json          | 4 +---
 pkgs/webview-ui/app/tsconfig.json  | 2 +-
 sops/machines/test-backup/key.json | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/formatter.nix b/formatter.nix
index 03d4bb333..6288b82fa 100644
--- a/formatter.nix
+++ b/formatter.nix
@@ -13,6 +13,8 @@
       treefmt.programs.deadnix.enable = true;
       treefmt.settings.global.excludes = [
         "*.png"
+        "*.svg"
+        "package-lock.json"
         "*.jpeg"
         "*.gitignore"
         ".vscode/*"
@@ -24,6 +26,10 @@
         "*.age"
         "*.list"
         "*.desktop"
+        # ignore symlink
+        "docs/site/manual/contribute.md"
+        "*_test_cert"
+        "*_test_key"
       ];
       treefmt.programs.prettier = {
         enable = true;
@@ -32,6 +38,7 @@
           "*.css"
           "*.html"
           "*.js"
+          "*.json"
           "*.json5"
           "*.jsx"
           "*.mdx"
diff --git a/pkgs/editor/settings.json b/pkgs/editor/settings.json
index 0dbc48065..cbbfa69e0 100644
--- a/pkgs/editor/settings.json
+++ b/pkgs/editor/settings.json
@@ -10,9 +10,7 @@
       },
       "options": {
         "nixos": {
-          "expr": "(let pkgs = import <nixpkgs> { }; in (pkgs.lib.evalModules { modules
-         =  (import <nixpkgs/nixos/modules/module-list.nix>) ++ [ ({...}: {
-         nixpkgs.hostPlatform = builtins.currentSystem;} ) ] ; })).options"
+          "expr": "(let pkgs = import <nixpkgs> { }; in (pkgs.lib.evalModules { modules =  (import <nixpkgs/nixos/modules/module-list.nix>) ++ [ ({...}: { nixpkgs.hostPlatform = builtins.currentSystem;} ) ] ; })).options"
         },
         "home-manager": {
           "expr": "(builtins.getFlake \"github:nix-community/home-manager\").homeConfigurations.<name>.options"
diff --git a/pkgs/webview-ui/app/tsconfig.json b/pkgs/webview-ui/app/tsconfig.json
index 46c1e53b2..98e05a906 100644
--- a/pkgs/webview-ui/app/tsconfig.json
+++ b/pkgs/webview-ui/app/tsconfig.json
@@ -8,7 +8,7 @@
     "esModuleInterop": true,
     "jsx": "preserve",
     "jsxImportSource": "solid-js",
-    "types": [ "vite-plugin-solid-svg/types-component-solid", "vite/client" ],
+    "types": ["vite-plugin-solid-svg/types-component-solid", "vite/client"],
     "noEmit": true,
     "resolveJsonModule": true,
     "allowJs": true,
diff --git a/sops/machines/test-backup/key.json b/sops/machines/test-backup/key.json
index a58accffa..a4560aa94 100755
--- a/sops/machines/test-backup/key.json
+++ b/sops/machines/test-backup/key.json
@@ -1,4 +1,4 @@
 {
   "publickey": "age1ez6xlcxl5k2uekcjvsu5wjca29f0j3lml0kq8fnvnkugvnj4pyjsyzuc93",
   "type": "age"
-}
\ No newline at end of file
+}