diff --git a/_hosts/cleo-darwin/darwin.nix b/cleo.darwin.nix similarity index 92% rename from _hosts/cleo-darwin/darwin.nix rename to cleo.darwin.nix index 6e52640..3446939 100644 --- a/_hosts/cleo-darwin/darwin.nix +++ b/cleo.darwin.nix @@ -15,7 +15,8 @@ environment.systemPath = [ "/opt/homebrew/bin" "/opt/homebrew/sbin" ]; # Biome config - environment.etc."biome.json".source = ../../config/biome.json; + environment.etc."biome.json".source = ./config.biome.json; + environment.etc."oxlintrc.json".source = ./config.oxlintrc.json; system.primaryUser = "matthew.bessette"; users.users."matthew.bessette" = { diff --git a/_hosts/cleo-darwin/home.nix b/cleo.home.nix similarity index 97% rename from _hosts/cleo-darwin/home.nix rename to cleo.home.nix index 91a8ba8..1721a0b 100644 --- a/_hosts/cleo-darwin/home.nix +++ b/cleo.home.nix @@ -33,7 +33,7 @@ programs.vscode = { enable = true; profiles.default = { - userSettings = builtins.fromJSON (builtins.readFile ../../config/vscode.settings.json); + userSettings = builtins.fromJSON (builtins.readFile ./config.vscode.settings.json); extensions = with pkgs.vscode-extensions; [ # graphql.vscode-graphql biomejs.biome diff --git a/config/biome.json b/config.biome.json similarity index 100% rename from config/biome.json rename to config.biome.json diff --git a/config.oxlintrc.json b/config.oxlintrc.json new file mode 100644 index 0000000..e87cc13 --- /dev/null +++ b/config.oxlintrc.json @@ -0,0 +1,31 @@ +{ + "plugins": [ + "eslint", + "import", + "node", + "oxc", + "promise", + "typescript", + "unicorn" + ], + "categories": { + "correctness": "warn", + "suspicious": "error", + "perf": "error" + }, + "rules": { + "unicorn/require-module-specifiers": "off", + + "eslint/no-restricted-imports": [ + "error", + { + "paths": [ + { + "name": "zod", + "message": "Use `zod/v4` (legacy `zod` import is disallowed)." + } + ] + } + ] + } +} diff --git a/config/vscode.settings.json b/config.vscode.settings.json similarity index 95% rename from config/vscode.settings.json rename to config.vscode.settings.json index 37d7da9..5f1e285 100644 --- a/config/vscode.settings.json +++ b/config.vscode.settings.json @@ -49,6 +49,8 @@ }, "oxc.enable": null, "oxc.enable.oxlint": true, + "oxc.configPath": "/etc/oxlintrc.json", + "oxc.disableNestedConfig": true, "js/ts.updateImportsOnFileMove.enabled": "always", "js/ts.experimental.useTsgo": true } diff --git a/flake.nix b/flake.nix index 1df15dc..ef271a2 100644 --- a/flake.nix +++ b/flake.nix @@ -76,12 +76,12 @@ specialArgs = { inherit system; inherit inputs; }; system = "aarch64-darwin"; modules = [ - ./_hosts/cleo-darwin/darwin.nix + ./cleo.darwin.nix home-manager.darwinModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users."matthew.bessette" = import ./_hosts/cleo-darwin/home.nix; + home-manager.users."matthew.bessette" = import ./cleo.home.nix; home-manager.backupFileExtension = ".before-nix"; } ]; diff --git a/hydrogen.darwin.nix b/hydrogen.darwin.nix new file mode 100644 index 0000000..e69de29 diff --git a/hydrogen.home.nix b/hydrogen.home.nix new file mode 100644 index 0000000..e69de29