diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 551090b..7aa3e00 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,7 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/flake.nix b/flake.nix
index 2caed47..50fda6a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,14 +15,12 @@
         mkHomeManagerConfig = { system, modules }:
           home-manager.lib.homeManagerConfiguration {
             inherit modules;
-            pkgs = import nixpkgs {
-              inherit system;
-              overlays = [
-                (final: prev: {
-                  devenv = devenv.packages.${system}.default;
-                })
-                vim-plugins.overlays.default
-              ];
+            pkgs = nixpkgs.legacyPackages.${system};
+            extraSpecialArgs = {
+              devenv-overlay = (final: prev: {
+                devenv = devenv.packages.${system}.default;
+              });
+              vim-plugins-overlay = vim-plugins.overlays.default;
             };
           };
       in
diff --git a/home.nix b/home.nix
index 8fd59b9..d1125d5 100644
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, devenv-overlay, vim-plugins-overlay, ... }:
 
 {
   # This value determines the Home Manager release that your configuration is
@@ -29,6 +29,7 @@
     pkgs.devenv
     pkgs.jq
     pkgs.nix-prefetch
+    pkgs.nixpkgs-fmt
     pkgs.noti
     pkgs.pstree
     pkgs.tmate
@@ -71,4 +72,9 @@
   programs.starship.enable = true;
 
   programs.home-manager.enable = true;
+
+  nixpkgs.overlays = [
+    devenv-overlay
+    vim-plugins-overlay
+  ];
 }