diff --git a/Makefile b/Makefile
index be9e30fa0..fec2cc1e8 100644
--- a/Makefile
+++ b/Makefile
@@ -489,14 +489,6 @@ neovim-update: ## Update Neovim plugins.
 neovim-sync: ## Sync Neovim plugins.
 	@echo "🔄 Syncing neovim plugins..."
 	@nvim --headless +"lua vim.cmd('source ' .. vim.fn.stdpath('config') .. '/init.lua')" +qa
-	@if [ -f "$(PWD)/home-manager/programs/neovim/nvim-pack-lock.json" ]; then \
-		if [ "$$(uname)" = "Darwin" ]; then \
-			sed -i '' -e '$$ { /^$$/d; }' "$(PWD)/home-manager/programs/neovim/nvim-pack-lock.json"; \
-		else \
-			sed -i -e '$$ { /^$$/d; }' "$(PWD)/home-manager/programs/neovim/nvim-pack-lock.json"; \
-		fi && \
-		printf '\n' >> "$(PWD)/home-manager/programs/neovim/nvim-pack-lock.json"; \
-	fi
 	@echo "✅ Neovim plugins synced"
 
 ##@ Lua
diff --git a/flake.nix b/flake.nix
index a3763d60f..d5a9c5b3d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -139,6 +139,7 @@
           ...
         }:
         let
+          inherit (inputs.nixpkgs) lib;
           devenvRoot =
             let
               envRoot = builtins.getEnv "DEVENV_ROOT";
@@ -151,6 +152,23 @@
             };
             overlays = (import ./overlays) { inherit inputs; };
           };
+          treefmtToml = builtins.fromTOML (builtins.readFile ./treefmt.toml);
+          treefmtSettings = lib.recursiveUpdate treefmtToml {
+            formatter = {
+              nix = (treefmtToml.formatter.nix or { }) // {
+                command = lib.getExe pkgs.nixfmt-rfc-style;
+              };
+              biome = (treefmtToml.formatter.biome or { }) // {
+                command = lib.getExe pkgs.biome;
+              };
+              json = (treefmtToml.formatter.json or { }) // {
+                command = lib.getExe pkgs.jsonfmt;
+              };
+              shell = (treefmtToml.formatter.shell or { }) // {
+                command = lib.getExe pkgs.shfmt;
+              };
+            };
+          };
         in
         {
           # Force this attribute so devenv's deprecated helper packages don't surface during flake checks.
@@ -166,14 +184,11 @@
           treefmt = {
             projectRootFile = "flake.nix";
             programs = {
-              biome.enable = true;
-              nixfmt.enable = true;
-              shfmt.enable = true;
               stylua.enable = true;
               taplo.enable = true;
-              jsonfmt.enable = true;
               yamlfmt.enable = true;
             };
+            settings = treefmtSettings;
           };
         };
     };
diff --git a/home-manager/programs/neovim/nvim-pack-lock.json b/home-manager/programs/neovim/nvim-pack-lock.json
index 75f97bbd5..cba19a7cd 100644
--- a/home-manager/programs/neovim/nvim-pack-lock.json
+++ b/home-manager/programs/neovim/nvim-pack-lock.json
@@ -174,4 +174,4 @@
       "src": "https://github.com/christoomey/vim-tmux-navigator"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/home-manager/programs/zoxide/default.nix b/home-manager/programs/zoxide/default.nix
index 23d4ea494..145b3f42b 100644
--- a/home-manager/programs/zoxide/default.nix
+++ b/home-manager/programs/zoxide/default.nix
@@ -2,6 +2,8 @@
 {
   programs.zoxide = {
     enable = true;
+    enableBashIntegration = true;
     enableFishIntegration = true;
+    enableZshIntegration = true;
   };
 }
diff --git a/treefmt.toml b/treefmt.toml
index d698b2216..203e408a2 100644
--- a/treefmt.toml
+++ b/treefmt.toml
@@ -11,6 +11,7 @@ excludes = ["*.json"]
 [formatter.json]
 command = "jsonfmt"
 includes = ["*.json"]
+excludes = ["home-manager/programs/neovim/nvim-pack-lock.json"]
 
 [formatter.shell]
 command = "shfmt"