From 51413f38966053943db5b231facee93dc5140685 Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Mon, 11 Aug 2025 20:45:29 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20[shared]=20Replace=20Prettier=20wit?= =?UTF-8?q?h=20Biome?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .prettierrc.toml | 1 - biome.jsonc | 12 ++++++++++++ .../home-manager/zen/chrome/userContent.css | 5 ++--- .../home-manager/zen/chrome/userContent.css | 5 ++--- shared/base/home-manager/development/helix.nix | 16 ++++++++++++---- shared/base/modules/development/formatters.nix | 2 +- shared/desktop/home-manager/development/zed.nix | 1 + shared/desktop/modules/development/node.nix | 1 - shell.nix | 2 +- treefmt.toml | 14 +++++--------- 10 files changed, 36 insertions(+), 23 deletions(-) delete mode 100644 .prettierrc.toml create mode 100644 biome.jsonc diff --git a/.prettierrc.toml b/.prettierrc.toml deleted file mode 100644 index 66c04fd..0000000 --- a/.prettierrc.toml +++ /dev/null @@ -1 +0,0 @@ -trailingComma = "none" diff --git a/biome.jsonc b/biome.jsonc new file mode 100644 index 0000000..df05565 --- /dev/null +++ b/biome.jsonc @@ -0,0 +1,12 @@ +{ + "$schema": "https://biomejs.dev/schemas/2.0.5/schema.json", + + "formatter": { + "enabled": true, + "indentStyle": "space" + }, + + "linter": { + "enabled": false + } +} diff --git a/hosts/desktop/home-manager/zen/chrome/userContent.css b/hosts/desktop/home-manager/zen/chrome/userContent.css index 036655d..918aca6 100644 --- a/hosts/desktop/home-manager/zen/chrome/userContent.css +++ b/hosts/desktop/home-manager/zen/chrome/userContent.css @@ -29,10 +29,9 @@ } .search-wrapper .logo-and-wordmark .logo { - background: - url("zen-logo-mocha.svg"), + background: url("zen-logo-mocha.svg"), url("https://raw.githubusercontent.com/IAmJafeth/zen-browser/main/themes/Mocha/Blue/zen-logo-mocha.svg") - no-repeat center !important; + no-repeat center !important; display: inline-block !important; height: 82px !important; width: 82px !important; diff --git a/hosts/thinkpad/home-manager/zen/chrome/userContent.css b/hosts/thinkpad/home-manager/zen/chrome/userContent.css index 036655d..918aca6 100644 --- a/hosts/thinkpad/home-manager/zen/chrome/userContent.css +++ b/hosts/thinkpad/home-manager/zen/chrome/userContent.css @@ -29,10 +29,9 @@ } .search-wrapper .logo-and-wordmark .logo { - background: - url("zen-logo-mocha.svg"), + background: url("zen-logo-mocha.svg"), url("https://raw.githubusercontent.com/IAmJafeth/zen-browser/main/themes/Mocha/Blue/zen-logo-mocha.svg") - no-repeat center !important; + no-repeat center !important; display: inline-block !important; height: 82px !important; width: 82px !important; diff --git a/shared/base/home-manager/development/helix.nix b/shared/base/home-manager/development/helix.nix index 589def5..35e2336 100644 --- a/shared/base/home-manager/development/helix.nix +++ b/shared/base/home-manager/development/helix.nix @@ -16,12 +16,20 @@ helix = let prettier = format: { - command = "prettier"; + command = lib.getExe pkgs.nodePackages.prettier; args = [ "--stdin-filepath" "file.${format}" ]; }; + biome = format: { + command = lib.getExe pkgs.biome; + args = [ + "check" + "--stdin-file-path=file.${format}" + "--write" + ]; + }; in { enable = true; @@ -60,7 +68,7 @@ languages.language = [ { name = "css"; - formatter = prettier "css"; + formatter = biome "css"; auto-format = true; } { @@ -68,14 +76,14 @@ language-servers = [ "vscode-json-language-server" ]; - formatter = prettier "json"; + formatter = biome "json"; auto-format = true; } { name = "jsonc"; language-servers = [ ]; - formatter = prettier "jsonc"; + formatter = biome "jsonc"; file-types = [ "jsonc" ]; diff --git a/shared/base/modules/development/formatters.nix b/shared/base/modules/development/formatters.nix index 2d3a2c1..e7863e9 100644 --- a/shared/base/modules/development/formatters.nix +++ b/shared/base/modules/development/formatters.nix @@ -2,7 +2,7 @@ { environment.systemPackages = with pkgs; [ - nodePackages.prettier + biome # Linter + formatter nixfmt-rfc-style treefmt shfmt diff --git a/shared/desktop/home-manager/development/zed.nix b/shared/desktop/home-manager/development/zed.nix index 446e0d3..88bc5a4 100644 --- a/shared/desktop/home-manager/development/zed.nix +++ b/shared/desktop/home-manager/development/zed.nix @@ -12,6 +12,7 @@ "nix" "git-firefly" "just" + "biome" ]; userSettings = let diff --git a/shared/desktop/modules/development/node.nix b/shared/desktop/modules/development/node.nix index b7ad29f..3ad0813 100644 --- a/shared/desktop/modules/development/node.nix +++ b/shared/desktop/modules/development/node.nix @@ -5,6 +5,5 @@ jetbrains.webstorm nodejs_22 pnpm - nodePackages.prettier ]; } diff --git a/shell.nix b/shell.nix index 7047a58..498cd4d 100644 --- a/shell.nix +++ b/shell.nix @@ -13,7 +13,7 @@ # Formatters needed for 'just fmt' format = pkgs.mkShell { packages = with pkgs; [ - nodePackages.prettier + biome nixfmt-rfc-style treefmt shfmt diff --git a/treefmt.toml b/treefmt.toml index 12be96b..12bbba4 100644 --- a/treefmt.toml +++ b/treefmt.toml @@ -2,17 +2,13 @@ command = "nixfmt" includes = ["*.nix"] -[formatter.prettier] -command = "prettier" -includes = ["*.css", "*.json", "*.jsonc", "*.yaml"] -options = ["--write"] +[formatter.biome] +command = "biome" +includes = ["*.css", "*.json", "*.jsonc"] +options = ["check", "--write"] [formatter.shell] command = "shfmt" includes = ["fmt", "test", "switch"] excludes = [] -options = [ -"--indent", "2", -"--simplify", -"--write", -] +options = ["--indent", "2", "--simplify", "--write"]