From a201733f96aed62711646a2b032a246823715b3d Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Thu, 7 Nov 2024 22:51:20 -0500
Subject: [PATCH] nixpkgs-fmt -> nixfmt-rfc-style

---
 flake.nix                   | 3 ---
 modules/cli/default.nix     | 2 +-
 modules/helix/default.nix   | 2 +-
 pkgs/bck-nvim/lua/5-lsp.lua | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 59f3744..7887373 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,9 +30,6 @@
 
     in
     {
-      formatter = forAllSystems (system:
-        nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
-
       lib = {
         base64 = import lib/base64.nix;
         gen-ssh-config = import lib/gen-ssh-config.nix lib;
diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index 03b2f0d..16d8106 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -18,9 +18,9 @@
     lm_sensors
     ncdu
     nix-diff
+    nixfmt-rfc-style
     nix-index
     nix-prefetch-github
-    nixpkgs-fmt
     nodejs
     openssl
     parted
diff --git a/modules/helix/default.nix b/modules/helix/default.nix
index b51b6be..0365633 100644
--- a/modules/helix/default.nix
+++ b/modules/helix/default.nix
@@ -58,7 +58,7 @@ in
         {
           name = "nix";
           auto-format = true;
-          formatter.command = "nixpkgs-fmt";
+          formatter = { command = "nixfmt"; args = [ "--verify" ]; };
         }
         {
           name = "python";
diff --git a/pkgs/bck-nvim/lua/5-lsp.lua b/pkgs/bck-nvim/lua/5-lsp.lua
index 7dcfd3f..45d43c5 100644
--- a/pkgs/bck-nvim/lua/5-lsp.lua
+++ b/pkgs/bck-nvim/lua/5-lsp.lua
@@ -56,7 +56,7 @@ lspconfig.nil_ls.setup({
 	settings = {
 		['nil'] = {
 			formatting = {
-				command = { "nixpkgs-fmt" },
+				command = { "nixfmt", "--verify" },
 			},
 		},
 	},