diff --git a/emacs/config.el b/emacs/config.el
index 50f8deb..1189215 100644
--- a/emacs/config.el
+++ b/emacs/config.el
@@ -178,4 +178,7 @@
   :config
   (load-theme 'base16-oxocarbon-dark t))
 
+(use-package nix-ts-mode
+  :mode "\\.nix\\'")
+
 (provide 'config)
diff --git a/emacs/mkEmacs.nix b/emacs/mkEmacs.nix
index dc1e530..3abbf07 100644
--- a/emacs/mkEmacs.nix
+++ b/emacs/mkEmacs.nix
@@ -33,8 +33,10 @@ in
             consult
             embark
             embark-consult
-	    base16-theme
+      	    base16-theme
+            nix-ts-mode
             ;
+          treesit-grammars = e.treesit-grammars.with-all-grammars;
         };
       override = _: prev: { use-package = prev.emacs; };
     };