diff --git a/.nixd.json b/.nixd.json index ffa5a471..b232595b 100644 --- a/.nixd.json +++ b/.nixd.json @@ -7,9 +7,6 @@ "depth": 0, "workers": 3 }, - "formatting": { - "command": "nixpkgs-fmt" - }, "options": { "enable": true, "target": { diff --git a/config/nvim/lua/core/plugin_config/null_ls.lua b/config/nvim/lua/core/plugin_config/null_ls.lua index af91a986..efcdbe5c 100644 --- a/config/nvim/lua/core/plugin_config/null_ls.lua +++ b/config/nvim/lua/core/plugin_config/null_ls.lua @@ -10,6 +10,7 @@ null_ls.setup({ formatting.prettier, formatting.stylua, formatting.csharpier, + formatting.alejandra diagnostics.cpplint, }, on_attach = function(client, bufnr) diff --git a/modules/dev/nil.nix b/modules/dev/nil.nix index 4f6d3f4f..687805bf 100644 --- a/modules/dev/nil.nix +++ b/modules/dev/nil.nix @@ -11,7 +11,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ nil - nixpkgs-fmt + alejandra ]; }; } diff --git a/modules/dev/nixd.nix b/modules/dev/nixd.nix index cf2d6ba0..a85bf8af 100644 --- a/modules/dev/nixd.nix +++ b/modules/dev/nixd.nix @@ -15,7 +15,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ unstable.nixd - nixpkgs-fmt + alejandra ]; }; }