From 117fd8a06ebeece34995e0f0f139d45201f66620 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sun, 11 Jan 2026 16:38:11 -0500
Subject: [PATCH] replace nixfmt-rfc-style with equivalent nixfmt

---
 flake.nix                                                     | 2 +-
 pkgs/applications/editors/neovim/nmasur/neovim/config/lsp.nix | 2 +-
 pkgs/tools/misc/dotfiles-devshell/package.nix                 | 2 +-
 platforms/home-manager/modules/nmasur/profiles/power-user.nix | 2 +-
 templates/default/flake.nix                                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index fd10463..f9a57fd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -287,7 +287,7 @@
             inherit (lib) overlays;
           };
         in
-        pkgs.nixfmt-rfc-style
+        pkgs.nixfmt
       );
 
       # Templates for starting other projects quickly
diff --git a/pkgs/applications/editors/neovim/nmasur/neovim/config/lsp.nix b/pkgs/applications/editors/neovim/nmasur/neovim/config/lsp.nix
index ca7763f..ad73a0f 100644
--- a/pkgs/applications/editors/neovim/nmasur/neovim/config/lsp.nix
+++ b/pkgs/applications/editors/neovim/nmasur/neovim/config/lsp.nix
@@ -100,7 +100,7 @@
         lua.command = "${pkgs.stylua}/bin/stylua";
         black.command = "${pkgs.black}/bin/black";
         fish_indent.command = "${pkgs.fish}/bin/fish_indent";
-        nixfmt.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
+        nixfmt.command = "${pkgs.nixfmt}/bin/nixfmt";
         rustfmt.command = "${pkgs.rustfmt}/bin/rustfmt";
         shfmt = {
           command = "${pkgs.shfmt}/bin/shfmt";
diff --git a/pkgs/tools/misc/dotfiles-devshell/package.nix b/pkgs/tools/misc/dotfiles-devshell/package.nix
index c40333e..6768d4e 100644
--- a/pkgs/tools/misc/dotfiles-devshell/package.nix
+++ b/pkgs/tools/misc/dotfiles-devshell/package.nix
@@ -5,7 +5,7 @@ pkgs.mkShell {
   buildInputs = with pkgs; [
     git
     stylua
-    nixfmt-rfc-style
+    nixfmt
     shfmt
     shellcheck
   ];
diff --git a/platforms/home-manager/modules/nmasur/profiles/power-user.nix b/platforms/home-manager/modules/nmasur/profiles/power-user.nix
index a44f643..cbe495b 100644
--- a/platforms/home-manager/modules/nmasur/profiles/power-user.nix
+++ b/platforms/home-manager/modules/nmasur/profiles/power-user.nix
@@ -26,7 +26,7 @@ in
       pkgs.jless # JSON viewer
       pkgs.jo # JSON output
       pkgs.mpd # TUI slideshows
-      pkgs.nixfmt-rfc-style # Format Nix code
+      pkgs.nixfmt # Format Nix code
       pkgs.nmasur.jqr # FZF fq JSON tool
       pkgs.nmasur.osc # Clipboard over SSH
       pkgs.nmasur.ren-find # Rename files
diff --git a/templates/default/flake.nix b/templates/default/flake.nix
index 9f18afe..194d7ee 100644
--- a/templates/default/flake.nix
+++ b/templates/default/flake.nix
@@ -18,7 +18,7 @@
           pkgs = import nixpkgs { inherit system; };
         in
         {
-          default = pkgs.mkShell { buildInputs = with pkgs; [ nixfmt-rfc-style ]; };
+          default = pkgs.mkShell { buildInputs = with pkgs; [ nixfmt ]; };
         }
       );
     };