From fe4492f0049e888066a52c08168e9636172b16c5 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Thu, 3 Apr 2025 13:59:37 +0200
Subject: [PATCH] Change formatter to nixfmt

---
 flake.nix                           |  6 ++--
 packages/common/nki-kakoune/lsp.nix | 45 +++++++++++++++--------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6f30f7a..df2774f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -240,8 +240,8 @@
 
       # This is highly advised, and will prevent many possible mistakes
       checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
-    } // (inputs.flake-utils.lib.eachDefaultSystem (system: {
-      formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
+    }
+    // (inputs.flake-utils.lib.eachDefaultSystem (system: {
+      formatter = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
     }));
 }
-
diff --git a/packages/common/nki-kakoune/lsp.nix b/packages/common/nki-kakoune/lsp.nix
index 9c5790e..7ca6afd 100644
--- a/packages/common/nki-kakoune/lsp.nix
+++ b/packages/common/nki-kakoune/lsp.nix
@@ -1,24 +1,25 @@
-{ lib
-, writeTextDir
-, formats
-, kak-lsp
-, # LSP packages
-  ccls
-, gopls
-, nil
-, nixpkgs-fmt
-, python311Packages
-, ltex-ls
-, nodePackages
-, tailwindcss-language-server
-, fsautocomplete
-, metals
-, texlab
-, tinymist
-, marksman
-, templ
-, rust-analyzer
-, ...
+{
+  lib,
+  writeTextDir,
+  formats,
+  kak-lsp,
+  # LSP packages
+  ccls,
+  gopls,
+  nil,
+  nixfmt-rfc-style,
+  python311Packages,
+  ltex-ls,
+  nodePackages,
+  tailwindcss-language-server,
+  fsautocomplete,
+  metals,
+  texlab,
+  tinymist,
+  marksman,
+  templ,
+  rust-analyzer,
+  ...
 }:
 let
   # Configuration for kak-lsp
@@ -75,7 +76,7 @@ let
           filetypes = [ "nix" ];
           roots = [ "flake.nix" "shell.nix" ".git" ];
           settings.nil = {
-            formatting.command = [ "${lib.getExe nixpkgs-fmt}" ];
+            formatting.command = [ "${lib.getExe nixfmt-rfc-style}" ];
           };
         };
         pylsp = {