From ef283b9c1f4c260b12f8aa48ac4fa26a41401f3b Mon Sep 17 00:00:00 2001
From: reo101 <pavel.atanasov2001@gmail.com>
Date: Mon, 21 Nov 2022 14:42:45 +0200
Subject: [PATCH] feat: correctly pass overlays to HM configurations

Add `zig master` and `neovim-nightly` from top-level `flake` to `cheetah` HM configuration
---
 nix-on-droid/cheetah/configuration.nix |  2 +-
 nix-on-droid/cheetah/home.nix          | 24 ++++++------------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/nix-on-droid/cheetah/configuration.nix b/nix-on-droid/cheetah/configuration.nix
index 4a5e331..de3c9e1 100644
--- a/nix-on-droid/cheetah/configuration.nix
+++ b/nix-on-droid/cheetah/configuration.nix
@@ -26,6 +26,6 @@
     backupFileExtension = "hm-bak";
     # useGlobalPkgs = true;
 
-    # extraOptions = { inherit inputs; };
+    extraSpecialArgs = { inherit inputs; };
   };
 }
diff --git a/nix-on-droid/cheetah/home.nix b/nix-on-droid/cheetah/home.nix
index c6921a2..ffd268b 100644
--- a/nix-on-droid/cheetah/home.nix
+++ b/nix-on-droid/cheetah/home.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }:
+{ inputs, lib, config, pkgs, ... }:
 
 {
   # Home Manager needs a bit of information about you and the
@@ -49,32 +49,20 @@
     # Dhall
     dhall
     dhall-lsp-server
-  ];
 
-  # nixpkgs = {
-  #   overlays = [
-  #     inputs.neovim-nightly-overlay.overlay
-  #     inputs.zig-overlay.overlay
-  #   ];
-  #
-  #   config.allowUnfree = true;
-  # };
+    # Zig
+    zigpkgs.master
+  ];
 
   nixpkgs = {
     overlays = [
-      (import (builtins.fetchTarball {
-        url = https://github.com/nix-community/neovim-nightly-overlay/archive/master.tar.gz;
-      }))
+      inputs.neovim-nightly-overlay.overlay
+      inputs.zig-overlay.overlays.default
     ];
 
     config.allowUnfree = true;
   };
 
-  # programs.zig = {
-  #   enable = true;
-  #   package = pkgs.zig;
-  # };
-
   programs.neovim = {
     enable = true;
     package = pkgs.neovim-nightly;