From 0199d6c520d49ac3fc10f2b7ffa8673abb683018 Mon Sep 17 00:00:00 2001 From: Chris Samuel Date: Mon, 26 Jan 2026 08:11:23 -0600 Subject: [PATCH 1/2] chore: nixfmt-rfc-style -> nixfmt Fixes this warning during evaluation ``` evaluation warning: nixfmt-rfc-style is now the same as pkgs.nixfmt which should be used instead. ``` --- flake.nix | 6 +++--- home-manager/default.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index ac42d5d..f91406f 100644 --- a/flake.nix +++ b/flake.nix @@ -57,7 +57,7 @@ pkgs.mkShell { packages = with pkgs; [ treefmt - nixfmt-rfc-style + nixfmt nixd direnv git @@ -93,11 +93,11 @@ }; }; - formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.nixfmt-rfc-style; + formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.nixfmt; devShells.aarch64-darwin.default = devShellFor "aarch64-darwin"; # For CI lint on linux runners devShells.x86_64-linux.default = devShellFor "x86_64-linux"; - formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; + formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt; }; } diff --git a/home-manager/default.nix b/home-manager/default.nix index e125781..e922644 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -26,7 +26,7 @@ nixd cloudlens cmatrix - nixfmt-rfc-style + nixfmt nil tree ]; From 9c9b26122c4b85da0f85c5125d07a1f54878ac22 Mon Sep 17 00:00:00 2001 From: Chris Samuel Date: Mon, 26 Jan 2026 08:16:57 -0600 Subject: [PATCH 2/2] update agent docs --- AGENTS.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index a219f84..fc46c70 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -3,7 +3,7 @@ ## Project Structure - `flake.nix` - Main flake configuration with inputs and outputs - `darwin/` - macOS system configurations - - `hosts/` - Per-host configurations (higgins, benson, spaceblack, dunston) + - `hosts/` - Per-host configurations (higgins, benson, spaceblack, dunston, mfourmax) - `modules/` - Reusable Darwin modules - `home-manager/` - User environment configurations - `.config/` - Application-specific configs (ghostty, git, zed) @@ -29,7 +29,7 @@ Before applying changes: 5. Apply if successful: `sudo darwin-rebuild switch --flake .#` ## Code Style -- **Language**: Nix using RFC-style formatting (nixfmt-rfc-style) +- **Language**: Nix using RFC-style formatting (nixfmt) - **Formatting**: Use `nixfmt` formatter (configured in treefmt.toml) - **Imports**: Group imports in `imports = [ ... ];` blocks at the top of modules - **Function signatures**: Use attribute sets with destructuring: `{ pkgs, lib, config, ... }:` @@ -59,8 +59,8 @@ Before applying changes: - **Update flake inputs**: `nix flake update` or `nix flake lock --update-input ` ## Quick Reference -- **Current hosts**: higgins, benson, spaceblack, dunston +- **Current hosts**: higgins, benson, spaceblack, dunston, mfourmax - **Darwin state version**: 4 - **Home-manager state version**: "24.05" -- **Primary formatter**: nixfmt-rfc-style +- **Primary formatter**: nixfmt - **Flake**: Uses `nixpkgs` and `darwin` + `home-manager` as inputs