diff --git a/flake.lock b/flake.lock index 4d02808..2878d7e 100644 --- a/flake.lock +++ b/flake.lock @@ -350,11 +350,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724531977, - "narHash": "sha256-XROVLf9ti4rrNCFLr+DmXRZtPjCQTW4cYy59owTEmxk=", + "lastModified": 1724727824, + "narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2527da1ef492c495d5391f3bcf9c1dd9f4514e32", + "rev": "36bae45077667aff5720e5b3f1a5458f51cf0776", "type": "github" }, "original": { @@ -383,11 +383,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724800090, - "narHash": "sha256-7KxGFZ40pidca5gcdI2weGanfB74yDxrErFNElOZWqA=", + "lastModified": 1724820329, + "narHash": "sha256-jXaDebjRjcUgZcMNXkvA99s/tTUvZfLLJxLwf1e/qwE=", "owner": "nix-community", "repo": "nixvim", - "rev": "4814147442cd3f12f8160ecad9e36751f68cdc22", + "rev": "70e9532ec290769e4d671747b0f65b1c29a3c14e", "type": "github" }, "original": { diff --git a/nvim/plugins.nix b/nvim/plugins.nix index b19bb71..3e76f45 100644 --- a/nvim/plugins.nix +++ b/nvim/plugins.nix @@ -143,20 +143,18 @@ in # FIXME: doesn't include formatters conform-nvim = { enable = true; - settings = { - formatters.nixfmt.command = "${lib.getExe pkgs.nixfmt-rfc-style}"; - formatters_by_ft = { - "_" = [ "trim_whitespace" ]; - c = [ "clang_format" ]; - cpp = [ "clang_format" ]; - lua = [ "stylua" ]; - nix = [ "nixfmt" ]; - rust = [ "rustfmt" ]; - sh = [ "shfmt" ]; - toml = [ "taplo" ]; - yaml = [ "yamlfmt" ]; - zig = [ "zigfmt" ]; - }; + formatters.nixfmt.command = "${lib.getExe pkgs.nixfmt-rfc-style}"; + formattersByFt = { + "_" = [ "trim_whitespace" ]; + c = [ "clang_format" ]; + cpp = [ "clang_format" ]; + lua = [ "stylua" ]; + nix = [ "nixfmt" ]; + rust = [ "rustfmt" ]; + sh = [ "shfmt" ]; + toml = [ "taplo" ]; + yaml = [ "yamlfmt" ]; + zig = [ "zigfmt" ]; }; }; gitsigns.enable = true;