diff --git a/flake.nix b/flake.nix
index 89e26c64..125db4e0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,28 +29,30 @@
 
   outputs = { self, nixpkgs, home-manager, kak, unispect, ansi-utils, unambig-path }:
     let
-      system = "aarch64-darwin";
-
-      pkgs = import nixpkgs { system = system; config.allowUnfree = true; };
-
       xdg-runtime-dir = "/tmp/xdg-rt";
 
-      home = import ./home.nix {
+      mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; };
+      mkHome = {system, pkgs} : import ./home.nix {
         kak-pkg = kak.packages.${system}.kak;
         unispect = unispect.packages.${system}.unispect;
         ansi-utils = ansi-utils.packages.${system};
         unambig-path = unambig-path.packages.${system}.unambig-path;
         inherit pkgs xdg-runtime-dir;
       };
-
     in {
-      homeConfigurations."xenia" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
+      homeConfigurations."xenia" =
+        let
+          system = "aarch64-darwin";
+          pkgs = mkPkgs system;
+          home = mkHome { inherit system pkgs; };
+        in home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
 
-        modules = [
-          home
-          ( import ./mac.nix { emacs = home.programs.emacs.package; inherit pkgs xdg-runtime-dir; } )
-        ];
+          modules = [
+            home
+            ( import ./mac.nix { emacs = home.programs.emacs.package; inherit pkgs xdg-runtime-dir; } )
+          ];
       };
+
     };
 }