diff --git a/lib/shells.nix b/lib/shells.nix
index fcf20a5..be28b62 100644
--- a/lib/shells.nix
+++ b/lib/shells.nix
@@ -1,24 +1,28 @@
 { pkgs, home-manager, ... }:
+let
+  treefmt-deps = with pkgs; [
+    treefmt
+    stylua
+    statix
+    deadnix
+    nixpkgs-fmt
+  ];
+in
 {
 
   default = pkgs.mkShell {
     packages = with pkgs; [
       nixos-rebuild
       just
-      stylua
-      deadnix
-      nixpkgs-fmt
       selene
-      statix
-      treefmt
       home-manager.packages.${system}.default
-    ];
+    ] ++ treefmt-deps;
   };
   ci = pkgs.mkShell {
     packages = with pkgs; [
       just
       nixos-rebuild
-      jq
-    ];
+      jq      
+    ] ++ treefmt-deps;
   };
 }