diff --git a/candy/lua/marshmallow/format.lua b/candy/lua/marshmallow/format.lua index af49c65..9e418ef 100644 --- a/candy/lua/marshmallow/format.lua +++ b/candy/lua/marshmallow/format.lua @@ -13,7 +13,7 @@ require("lz.n").load({ lua = { "stylua" }, -- Use a sub-list to run only the first available formatter javascript = { { "prettierd", "prettier" } }, - nix = { "alejandra" }, + nix = { "nixfmt" }, toml = { "taplo" }, sql = { "sql_formatter" }, python = { "black" }, diff --git a/flake.lock b/flake.lock index 813ae6f..8b76657 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1742654371, - "narHash": "sha256-fmOfoKTyGmjouWGFxfJvMdZVX3u2GSZyMlVE9yNhusA=", + "lastModified": 1743511785, + "narHash": "sha256-oXIT9GcwX/G1L4M3OgYh+R17g8JKdSip4FAYo6idb/c=", "owner": "neovim", "repo": "neovim", - "rev": "f4d9a2983a49c1729f78ffbf6b1e6dcc30215d0d", + "rev": "9b239a6a86ed0caaaf7522cfc600da4b35d94d04", "type": "github" }, "original": { @@ -223,11 +223,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1742688454, - "narHash": "sha256-gK9nPXWEXVtBWlZCBlwMZynlCDGJ1TtVlRBfC02PNxc=", + "lastModified": 1743574307, + "narHash": "sha256-bT8RG639HtF8he+5sjmR83oIgimAxFBNCrCuU5V10A8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "098d2af8c606ea8adc1b8b3084f454ca681a7ab3", + "rev": "8c23e99e8ebfe6c4edc8ff4ff3f5a5f650c5193a", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742578646, - "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=", + "lastModified": 1743472173, + "narHash": "sha256-xwNv3FYTC5pl4QVZ79gUxqCEvqKzcKdXycpH5UbYscw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94c4dbe77c0740ebba36c173672ca15a7926c993", + "rev": "88e992074d86ad50249de12b7fb8dbaadf8dc0c5", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742578646, - "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=", + "lastModified": 1743568003, + "narHash": "sha256-ZID5T65E8ruHqWRcdvZLsczWDOAWIE7om+vQOREwiX0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94c4dbe77c0740ebba36c173672ca15a7926c993", + "rev": "b7ba7f9f45c5cd0d8625e9e217c28f8eb6a19a76", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1742696745, - "narHash": "sha256-57jlygyNVeCgFiVSvNqdErMlE6NiWaIxQ0XlHoMTEL8=", + "lastModified": 1743560563, + "narHash": "sha256-l3eGn19iEYPDbVsVsx1AKLw9T6D3dFfjk4RYUxFYktU=", "owner": "wires-org", "repo": "tolerable-nvim-nix", - "rev": "bb3c4788849428cb5ec852a529e6e99b9396727c", + "rev": "5e4bceb7c4d81508de01fae2935400da437039c8", "type": "github" }, "original": { @@ -342,11 +342,11 @@ ] }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1743081648, + "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5a7d3cb..2f5b315 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ stylua prettierd black - alejandra + nixfmt-rfc-style taplo lua-language-server nil