diff --git a/default.nix b/default.nix
index e009e9f..e4869aa 100644
--- a/default.nix
+++ b/default.nix
@@ -1,43 +1,55 @@
 let
   inputs = import ./deps;
   patch = import inputs.nix-patches { patchFile = ./patches; };
-  inputs_final = inputs // { nixpkgs_patched = patch.mkNixpkgsSrc { src = inputs.unstable; version = "nixos-unstable"; }; };
+  inputs_final = inputs // {
+    nixpkgs_patched = patch.mkNixpkgsSrc {
+      src = inputs.unstable;
+      version = "nixos-unstable";
+    };
+  };
   nixpkgs = import inputs.nixpkgs { };
+  unstable = import inputs.unstable { };
   lib = nixpkgs.lib.extend (import ./lib inputs_final);
-  machines_plats = lib.lists.unique (lib.mapAttrsToList (_name: value: value.arch) (lib.filterAttrs (_n: v: builtins.hasAttr "arch" v) lib.luj.machines));
+  machines_plats = lib.lists.unique (
+    lib.mapAttrsToList (_name: value: value.arch) (
+      lib.filterAttrs (_n: v: builtins.hasAttr "arch" v) lib.luj.machines
+    )
+  );
   mkMachine = import ./lib/mkmachine.nix inputs_final lib;
 
-  nixpkgs_plats = builtins.listToAttrs (builtins.map
-    (plat: {
+  nixpkgs_plats = builtins.listToAttrs (
+    builtins.map (plat: {
       name = plat;
       value = import inputs.nixpkgs { system = plat; };
-    })
-    machines_plats);
+    }) machines_plats
+  );
 in
 rec {
 
-  nixosModules = builtins.listToAttrs (map
-    (x: {
+  nixosModules = builtins.listToAttrs (
+    map (x: {
       name = x;
       value = import (./modules + "/${x}");
-    })
-    (builtins.attrNames (builtins.readDir ./modules)));
+    }) (builtins.attrNames (builtins.readDir ./modules))
+  );
 
-  nixosConfigurations = builtins.mapAttrs
-    (name: value: (mkMachine {
+  nixosConfigurations = builtins.mapAttrs (
+    name: value:
+    (mkMachine {
       inherit name;
       host-config = value;
       modules = nixosModules;
       nixpkgs = lib.luj.machines.${name}.nixpkgs_version;
       system = lib.luj.machines.${name}.arch;
       home-manager = lib.luj.machines.${name}.hm_version;
-    }))
-    (lib.importConfig ./machines);
-
+    })
+  ) (lib.importConfig ./machines);
 
   colmena =
     let
-      deployableConfigurations = lib.filterAttrs (_: v: builtins.hasAttr "ipv4" lib.luj.machines.${v.config.networking.hostName}) nixosConfigurations;
+      deployableConfigurations = lib.filterAttrs (
+        _: v: builtins.hasAttr "ipv4" lib.luj.machines.${v.config.networking.hostName}
+      ) nixosConfigurations;
     in
     {
       meta = {
@@ -46,27 +58,34 @@ rec {
         nodeSpecialArgs = builtins.mapAttrs (_: v: v._module.specialArgs) deployableConfigurations;
         specialArgs.lib = lib;
       };
-    } // builtins.mapAttrs
-      (_: v: {
-        imports = v._module.args.modules;
-      })
-      deployableConfigurations;
+    }
+    // builtins.mapAttrs (_: v: { imports = v._module.args.modules; }) deployableConfigurations;
 
-
-  packages = builtins.listToAttrs
-    (builtins.map
-      (plat: {
-        name = plat;
-        value =
-          lib.filterAttrs (_name: value: (!lib.hasAttrByPath [ "meta" "platforms" ] value) || builtins.elem plat value.meta.platforms)
-            (builtins.listToAttrs (builtins.map
-              (e: {
+  packages = builtins.listToAttrs (
+    builtins.map (plat: {
+      name = plat;
+      value =
+        lib.filterAttrs
+          (
+            _name: value:
+            (
+              !lib.hasAttrByPath [
+                "meta"
+                "platforms"
+              ] value
+            )
+            || builtins.elem plat value.meta.platforms
+          )
+          (
+            builtins.listToAttrs (
+              builtins.map (e: {
                 name = e;
                 value = nixpkgs_plats.${plat}.callPackage (./packages + "/${e}") { };
-              })
-              (builtins.attrNames (builtins.readDir ./packages))));
-      })
-      machines_plats);
+              }) (builtins.attrNames (builtins.readDir ./packages))
+            )
+          );
+    }) machines_plats
+  );
 
   inherit (lib.luj) machines;
 
@@ -75,4 +94,3 @@ rec {
     machines = lib.mapAttrs (_: v: v.config.system.build.toplevel) nixosConfigurations;
   };
 }
-