diff --git a/flake.nix b/flake.nix
index 992aae6..d0ff0fa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,7 +52,6 @@
             , ...
             } @ inputs:
     let
-      # inherit (self) outputs;
       # forAllSystems = nixpkgs.lib.genAttrs [
       #   "aarch64-linux"
       #   "i686-linux"
@@ -60,6 +59,7 @@
       #   "aarch64-darwin"
       #   "x86_64-darwin"
       # ];
+      inherit (self) outputs;
     in
     rec {
       # packages = forAllSystems (system:
@@ -89,7 +89,6 @@
 
       nixOnDroidConfigurations =
         let mkHost = system: hostname: nix-on-droid.lib.nixOnDroidConfiguration {
-          # pkgs = legacyPackages.${system};
           pkgs = import nixpkgs {
             inherit system;
 
@@ -104,9 +103,7 @@
           ] ++ (builtins.attrValues nixOnDroidModules);
 
           extraSpecialArgs = {
-            inherit inputs;
-            # inherit outputs;
-            # inherit inputs outputs;
+            inherit inputs outputs;
             # rootPath = ./.;
           };
 
diff --git a/nix-on-droid/cheetah/configuration.nix b/nix-on-droid/cheetah/configuration.nix
index 6aa118d..4a5e331 100644
--- a/nix-on-droid/cheetah/configuration.nix
+++ b/nix-on-droid/cheetah/configuration.nix
@@ -24,7 +24,7 @@
   home-manager = {
     config = ./home.nix;
     backupFileExtension = "hm-bak";
-    useGlobalPkgs = true;
+    # useGlobalPkgs = true;
 
     # extraOptions = { inherit inputs; };
   };
diff --git a/nix-on-droid/cheetah/home.nix b/nix-on-droid/cheetah/home.nix
index 6568402..08b1ac4 100644
--- a/nix-on-droid/cheetah/home.nix
+++ b/nix-on-droid/cheetah/home.nix
@@ -1,4 +1,4 @@
-{ inputs ? {}, outputs ? {}, lib, config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
 {
   # Home Manager needs a bit of information about you and the
@@ -60,6 +60,16 @@
   #   config.allowUnfree = true;
   # };
 
+  nixpkgs = {
+    overlays = [
+      (import (builtins.fetchTarball {
+        url = https://github.com/nix-community/neovim-nightly-overlay/archive/master.tar.gz;
+      }))
+    ];
+
+    config.allowUnfree = true;
+  };
+
   # programs.zig = {
   #   enable = true;
   #   package = pkgs.zig;
@@ -67,8 +77,7 @@
 
   programs.neovim = {
     enable = true;
-    # package = neovim-nightly-overlay.neovim-nightly;
-    # package = pkgs.neovim-nightly;
+    package = pkgs.neovim-nightly;
     # defaultEditor = true;
 
     viAlias = true;