diff --git a/extern/default.nix b/extern/default.nix
index 4ca9df6b..19c1bae6 100644
--- a/extern/default.nix
+++ b/extern/default.nix
@@ -7,10 +7,6 @@
 
   overlays = [
     nur.overlay
-    devshell.overlay
-    (final: prev: {
-      deploy-rs = deploy.packages.${prev.system}.deploy-rs;
-    })
     pkgs.overlay
   ];
 
diff --git a/flake.lock b/flake.lock
index 531c9813..7d108f46 100644
--- a/flake.lock
+++ b/flake.lock
@@ -81,7 +81,7 @@
         "utils": "utils_2"
       },
       "locked": {
-        "narHash": "sha256-/SJJ8u/qBnCtMbMxBmDNBDnLWnmro2ioi35gL45hP9w=",
+        "narHash": "sha256-Mf67M0twCyNmRQxnhH51f6VroHaCwJKvFDMc1Wc7pt8=",
         "path": "./lib",
         "type": "path"
       },
diff --git a/flake.nix b/flake.nix
index 443c9b98..4bf5bdb7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,7 @@
 
   outputs = inputs@{ self, devos, nixos, nur, ... }:
     devos.lib.mkFlake {
-      inherit self;
+      inherit self inputs nixos;
       hosts = ./hosts;
       packages = import ./pkgs;
       suites = import ./suites;
diff --git a/lib/devos/devosSystem.nix b/lib/devos/devosSystem.nix
index f9a84d0f..6ea50dab 100644
--- a/lib/devos/devosSystem.nix
+++ b/lib/devos/devosSystem.nix
@@ -1,6 +1,6 @@
 { lib }:
 
-{ userFlakeNixos, userFlakeSelf, userFlakeInputs }:
+{ userFlakeNixOS, userFlakeSelf, userFlakeInputs }:
 
 { modules, ... } @ args:
 lib.nixosSystem (args // {
@@ -15,7 +15,7 @@ lib.nixosSystem (args // {
         (args // {
           modules = moduleList ++ [
 
-            "${userFlakeNixos}/${modpath}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
+            "${userFlakeNixOS}/${modpath}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
 
             ({ config, suites, ... }: {
 
diff --git a/lib/devos/mkHosts.nix b/lib/devos/mkHosts.nix
index d86de4e5..d4a785fe 100644
--- a/lib/devos/mkHosts.nix
+++ b/lib/devos/mkHosts.nix
@@ -65,7 +65,7 @@ let
     # Everything in `./modules/list.nix`.
     flakeModules = { imports = builtins.attrValues userFlakeSelf.nixosModules ++ extern.modules; };
 
-    cachix = ../../cachix.nix;
+    cachix = "${userFlakeSelf}/cachix.nix";
   };
 
   specialArgs = extern.specialArgs // { suites = suites.system; };
@@ -84,12 +84,12 @@ let
           hosts = builtins.mapAttrs (_: host: host.config)
             (removeAttrs hosts [ hostName ]);
         };
-      };
-      lib = {
+
         lib = { inherit specialArgs; };
         lib.testModule = {
           imports = builtins.attrValues modules;
         };
+
       };
     in
     lib.os.devosSystem {
@@ -97,7 +97,7 @@ let
     } {
       inherit specialArgs;
       system = defaultSystem;
-      modules = modules // { inherit local lib; };
+      modules = modules // { inherit local; };
     };
 
   hosts = lib.os.recImport
diff --git a/lib/mkFlake/evalOldArgs.nix b/lib/mkFlake/evalOldArgs.nix
index d15fbc97..2cf92214 100644
--- a/lib/mkFlake/evalOldArgs.nix
+++ b/lib/mkFlake/evalOldArgs.nix
@@ -22,6 +22,14 @@ let
           type = addCheck attrs lib.isStorePath;
           description = "The flake to create the devos outputs for";
         };
+        nixos = mkOption {
+          type = addCheck attrs lib.isStorePath;
+          description = "The default nixpkgs channel of the devos";
+        };
+        inputs = mkOption {
+          type = addCheck attrs lib.isStorePath;
+          description = "All inptus of the devos";
+        };
         hosts = mkOption {
           type = path;
           default = "${userFlakeSelf}/hosts";
diff --git a/lib/pkgs-lib/default.nix b/lib/pkgs-lib/default.nix
index 1b7c6422..40b451c2 100644
--- a/lib/pkgs-lib/default.nix
+++ b/lib/pkgs-lib/default.nix
@@ -3,7 +3,7 @@
 lib.genAttrs
   lib.defaultSystems (system:
     {
-      tests = import ./tests { inherit lib deploy nixpkgs pkgs system; };
+      tests = import ./tests { inherit lib deploy nixpkgs system; };
       shell = import ./shell { inherit lib devshell deploy nixpkgs system; };
     }
   )
diff --git a/lib/pkgs-lib/shell/default.nix b/lib/pkgs-lib/shell/default.nix
index e43155b1..7744f68f 100644
--- a/lib/pkgs-lib/shell/default.nix
+++ b/lib/pkgs-lib/shell/default.nix
@@ -11,7 +11,7 @@ let
 
   ];
 
-  pkgs = import nixpkgs { inherit system overlays;; config = {}; };
+  pkgs = import nixpkgs { inherit system overlays; config = {}; };
 
   flk = pkgs.callPackage ./flk.nix { };
 
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index f5a654c0..077ffa26 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -11,7 +11,6 @@ in
       binutils
       coreutils
       curl
-      deploy-rs
       direnv
       dnsutils
       dosfstools