diff --git a/.gitignore b/.gitignore
index af1da56..e986370 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-result/
\ No newline at end of file
+result/
+.devenv/
diff --git a/flake.nix b/flake.nix
index d5be9f7..ddc03b3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,10 +4,11 @@
   outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
 
   inputs = {
+    devenv.url = "github:cachix/devenv";
     flake-file.url = "github:vic/flake-file";
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs-lib";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
     };
     home-manager.url = "github:nix-community/home-manager";
     import-tree.url = "github:vic/import-tree";
@@ -20,7 +21,6 @@
       flake = false;
     };
     nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
-    nixpkgs-lib.follows = "nixpkgs";
     nvf = {
       url = "github:notashelf/nvf";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index 2ab3dc3..8f7a9cd 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -96,6 +96,7 @@ in
         env = {
           LANG = "en_US.UTF-8";
           COLORTERM = "truecolor";
+          DEVENV_SHELL_TYPE = "zsh";
         };
         settings = {
           completion = {
@@ -133,12 +134,15 @@ in
 
           HOSTNAME=$(hostname -s)
           ${aliasStr}
+
+          eval "$(devenv hook zsh)"
         '';
         extraPackages = with pkgs; [
-          lazydocker
           lazygit
+          lazydocker
           self'.packages.shell-tools
           self'.packages.neovim-min
+          devenv
         ];
       }).wrapper;
   };