devenv: nix: add formatter to emacs

3 files changed, 14 insertions, 8 deletions

diff --git a/modules/devenv/dotfiles.nix b/modules/devenv/dotfiles.nix
index 7f11194..ca3108c 100644
--- a/modules/devenv/dotfiles.nix
+++ b/modules/devenv/dotfiles.nix
@@ -14,8 +14,11 @@ in {
           gitignore =
             lib.mkEnableOption ""
             // {
-              default = true;
-              description = "Whether git should ignore this dotfile, typically if it is generated to contain absolute paths.";
+              description = ''
+                Whether git should ignore this dotfile, typically if it is
+                generated to contain absolute paths and is specific to this
+                project (and may not be ignored system-wide by the user).
+              '';
             };
           text = lib.mkOption {
             type = lib.types.lines;
diff --git a/modules/devenv/integrations/emacs.nix b/modules/devenv/integrations/emacs.nix
index b7f1e42..d002967 100644
--- a/modules/devenv/integrations/emacs.nix
+++ b/modules/devenv/integrations/emacs.nix
@@ -46,8 +46,8 @@ in {
     };
   };
 
-  config.dotfiles.".dir-locals.el" = lib.mkIf (cfg.dirLocals != {}) {
-    gitignore = lib.mkDefault true;
-    text = attrs2alist cfg.dirLocals;
-  };
+  config.dotfiles.".dir-locals.el".text =
+    lib.mkIf (cfg.dirLocals != {})
+    (attrs2alist
+      cfg.dirLocals);
 }
diff --git a/modules/devenv/languages/nix.nix b/modules/devenv/languages/nix.nix
index 6db3af4..efd76ce 100644
--- a/modules/devenv/languages/nix.nix
+++ b/modules/devenv/languages/nix.nix
@@ -18,12 +18,15 @@ in {
     packaging.enable = lib.mkEnableOption "tools for writing nix derivations";
   };
 
-  config = {
-    packages = lib.mkIf cfg.enable (with pkgs; [cfg.formatter deadnix] ++ lib.optionals cfg.packaging.enable [nix-prefetch-scripts nix-prefetch-github]);
+  config = lib.mkIf cfg.enable {
+    packages = with pkgs; [cfg.formatter deadnix] ++ lib.optionals cfg.packaging.enable [nix-prefetch-scripts nix-prefetch-github];
 
     pre-commit.hooks = {
       deadnix.enable = lib.mkDefault true;
       "${cfg.formatter.pname}".enable = lib.mkDefault true;
     };
+
+    scripts."${cfg.formatter.pname}-emacs".exec = "${cfg.formatter.pname} " + lib.optionalString (cfg.formatter.pname == "alejandra") "--quiet" + " $@";
+    emacs.dirLocals.nix-mode.nix-nixfmt-bin = ''"${cfg.formatter.pname}-emacs"'';
   };
 }