From a3d6b1bb1c48286125c9a37261bf731b10d1af2e Mon Sep 17 00:00:00 2001 From: Matthew Bessette Date: Wed, 11 Mar 2026 12:08:03 -0400 Subject: [PATCH] bump --- _hosts/cleo-darwin/darwin.nix | 3 +++ _hosts/cleo-darwin/home.nix | 35 ++++++++++++++++++++++++++++++--- config/biome.json | 37 ++++++++++++++++++++++++++++------- config/vscode.settings.json | 13 +++++++++--- 4 files changed, 75 insertions(+), 13 deletions(-) diff --git a/_hosts/cleo-darwin/darwin.nix b/_hosts/cleo-darwin/darwin.nix index 58fbd40..6e52640 100644 --- a/_hosts/cleo-darwin/darwin.nix +++ b/_hosts/cleo-darwin/darwin.nix @@ -14,6 +14,9 @@ # Add Homebrew to PATH environment.systemPath = [ "/opt/homebrew/bin" "/opt/homebrew/sbin" ]; + # Biome config + environment.etc."biome.json".source = ../../config/biome.json; + system.primaryUser = "matthew.bessette"; users.users."matthew.bessette" = { name = "matthew.bessette"; diff --git a/_hosts/cleo-darwin/home.nix b/_hosts/cleo-darwin/home.nix index 0e82848..91a8ba8 100644 --- a/_hosts/cleo-darwin/home.nix +++ b/_hosts/cleo-darwin/home.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ config, pkgs, ... }: { home.stateVersion = "23.11"; home.username = "matthew.bessette"; @@ -23,8 +23,6 @@ buf ]; - xdg.configFile."biome.json".source = ../../config/biome.json; - # Enable direnv for automatic environment switching programs.direnv = { enable = true; @@ -51,6 +49,7 @@ ms-python.python ms-python.vscode-pylance redhat.vscode-xml + # typescriptteam.native-preview ]; }; }; @@ -98,5 +97,35 @@ # Points to the Homebrew location mentioned in your caveat ANDROID_HOME = "/opt/homebrew/share/android-commandlinetools"; JAVA_HOME = "${pkgs.jdk17}"; + NPM_CONFIG_PREFIX = "${config.home.homeDirectory}/.npm-global"; + }; + + home.sessionPath = [ + "${config.home.homeDirectory}/.npm-global/bin" + ]; + + home.file.".npmrc".text = '' + prefix=${config.home.homeDirectory}/.npm-global + '' ; + + programs.git = { + enable = true; + + settings.user = { + name = "Matthew Bessette"; + email = "matthew.bessette@hicleo.com"; + }; + + settings.init.defaultBranch = "main"; + + # This creates ~/.config/git/ignore and sets core.excludesFile + ignores = [ + "biome.json" + "flake.lock" + "flake.nix" + ".DS_Store" + ".direnv" + ".envrc" + ]; }; } \ No newline at end of file diff --git a/config/biome.json b/config/biome.json index c2d03e1..2287b74 100644 --- a/config/biome.json +++ b/config/biome.json @@ -1,22 +1,45 @@ { - "$schema": "https://biomejs.dev/schemas/2.4.5/schema.json", - "organizeImports": { - "enabled": true + "$schema": "https://biomejs.dev/schemas/2.4.6/schema.json", + "linter": { + "enabled": false + }, + "assist": { + "enabled": false }, "formatter": { "enabled": true, "formatWithErrors": false, + "attributePosition": "auto", "indentStyle": "space", "indentWidth": 2, "lineWidth": 140, - "attributePosition": "auto" + "lineEnding": "lf", + "bracketSpacing": true, + "trailingNewline": true + }, + "graphql": { + "formatter": { + "quoteStyle": "double" + } }, "javascript": { + "parser": { + "unsafeParameterDecoratorsEnabled": true + }, "formatter": { - "quoteStyle": "single", + "arrowParentheses": "always", + "bracketSameLine": false, + "bracketSpacing": true, "jsxQuoteStyle": "double", - "trailingCommas": "all", - "arrowParentheses": "asNeeded" + "quoteProperties": "asNeeded", + "quoteStyle": "single", + "semicolons": "always", + "trailingCommas": "all" + } + }, + "json": { + "formatter": { + "trailingCommas": "none" } } } diff --git a/config/vscode.settings.json b/config/vscode.settings.json index f1c4749..37d7da9 100644 --- a/config/vscode.settings.json +++ b/config/vscode.settings.json @@ -1,11 +1,11 @@ { "$schema": "vscode://schemas/settings/user", + "debug.javascript.autoAttachFilter": "disabled", "editor.tabSize": 2, "editor.unicodeHighlight.ambiguousCharacters": false, "editor.unicodeHighlight.invisibleCharacters": false, "editor.formatOnSave": true, "editor.defaultFormatter": "biomejs.biome", - "debug.javascript.autoAttachFilter": "disabled", "[json]": { "editor.defaultFormatter": "biomejs.biome", "editor.formatOnSave": true @@ -30,7 +30,10 @@ "js/ts.preferences.importModuleSpecifier": "relative", "git.openRepositoryInParentFolders": "never", "github.copilot.nextEditSuggestions.enabled": true, - "chat.tools.terminal.autoApprove": { "yarn test": true, "npm test": true }, + "chat.tools.terminal.autoApprove": { + "yarn test": true, + "npm test": true + }, "gitlens.ai.model": "vscode", "gitlens.ai.vscode.model": "copilot:gpt-4.1", "chat.viewSessions.orientation": "stacked", @@ -43,5 +46,9 @@ "https://json-schema.org/": true, "https://developer.microsoft.com/json-schemas/": true, "https://biomejs.dev": true - } + }, + "oxc.enable": null, + "oxc.enable.oxlint": true, + "js/ts.updateImportsOnFileMove.enabled": "always", + "js/ts.experimental.useTsgo": true }