summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2022-10-16 23:29:56 +0200
committerAlan Pearce2022-10-16 23:50:03 +0200
commit82cd148ed09ff40fa765ca2d12e5d1b2d3b8a194 (patch)
tree8883cc39b8416267e2715bdad8eafaa835f596b4
parent300a10e626e2bf3dc40863d79fd71c29f603ef32 (diff)
downloadnixfiles-82cd148ed09ff40fa765ca2d12e5d1b2d3b8a194.tar.lz
nixfiles-82cd148ed09ff40fa765ca2d12e5d1b2d3b8a194.tar.zst
nixfiles-82cd148ed09ff40fa765ca2d12e5d1b2d3b8a194.zip
Use alejandra instead of nixfmt
-rw-r--r--user/emacs/init.el5
-rw-r--r--user/settings/development/base.nix2
2 files changed, 2 insertions, 5 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el
index 948bfa6a..e0b4d24d 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -795,10 +795,7 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
 ;;;; nix
 (with-eval-after-load 'nix-mode
   (setq nix-mode-use-smie t
-        nix-indent-function #'smie-indent-line)
-  (general-add-hook 'nix-mode-hook
-                    (lambda ()
-                      (add-hook 'before-save-hook #'nix-mode-format 0 'local))))
+        nix-indent-function #'smie-indent-line))
 
 (use-package nix-update
   :commands (nix-update-fetch))
diff --git a/user/settings/development/base.nix b/user/settings/development/base.nix
index 954d433f..64f52db9 100644
--- a/user/settings/development/base.nix
+++ b/user/settings/development/base.nix
@@ -11,7 +11,7 @@
     mosh
 
     nix-prefetch-scripts
-    nixfmt
+    alejandra # nix formatter
 
     httpie
     jq