summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2023-03-14 21:37:56 +0100
committerAlan Pearce2023-03-14 21:37:56 +0100
commit0f1b6a0fb092d044db6bbaebf25198b3f96c61f9 (patch)
treea8f9b44f00028ae2e5ef86cf82dedc92e6fa96e1
parent1804e5807da1a6aa39dd71e6938edc6fd5828a77 (diff)
downloadnixfiles-0f1b6a0fb092d044db6bbaebf25198b3f96c61f9.tar.lz
nixfiles-0f1b6a0fb092d044db6bbaebf25198b3f96c61f9.tar.zst
nixfiles-0f1b6a0fb092d044db6bbaebf25198b3f96c61f9.zip
nix: use nixpkgs-fmt instead of alejandra
-rw-r--r--user/emacs/init.el4
-rw-r--r--user/settings/nix.nix2
2 files changed, 4 insertions, 2 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el
index 1c0d7ebe..c7ac3c67 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -1082,7 +1082,9 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
 (use-package apheleia
   :config (progn
             (setf (alist-get 'shfmt apheleia-formatters)
-                  '("shfmt")))
+                  '("shfmt"))
+            (setf (alist-get 'nixfmt apheleia-formatters)
+                  '("nixpkgs-fmt")))
   :init (progn
           (apheleia-global-mode +1)))
 
diff --git a/user/settings/nix.nix b/user/settings/nix.nix
index 39f34623..4d313624 100644
--- a/user/settings/nix.nix
+++ b/user/settings/nix.nix
@@ -7,7 +7,7 @@
   home.packages = with pkgs; [
     nil
     nix-prefetch-scripts
-    alejandra # nix formatter
+    nixpkgs-fmt
   ];
   nixpkgs.overlays = [
     (import ../overlays/extra-packages.nix)