From b42612654c8b043cbb2a0222d711eec3970f7150 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sat, 8 May 2021 01:04:32 -0400
Subject: [PATCH] neovim nightly overlay, for telescope

---
 flake.lock | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 flake.nix  |  1 +
 home.nix   |  5 +--
 3 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 76f5eee..61c3996 100644
--- a/flake.lock
+++ b/flake.lock
@@ -48,6 +48,22 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1606424373,
+        "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1614513358,
@@ -63,6 +79,21 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1610051610,
+        "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "himalaya": {
       "inputs": {
         "crate2nix": "crate2nix",
@@ -103,6 +134,49 @@
         "type": "github"
       }
     },
+    "neovim-flake": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "contrib",
+        "lastModified": 1620343716,
+        "narHash": "sha256-f2eE84DuWINai8xO5bTBgs89pKaEC/pMEQvS3RjKvTo=",
+        "owner": "neovim",
+        "repo": "neovim",
+        "rev": "21035cff9f1d279e3cb5ec866916bfa231cdbaa2",
+        "type": "github"
+      },
+      "original": {
+        "dir": "contrib",
+        "owner": "neovim",
+        "repo": "neovim",
+        "type": "github"
+      }
+    },
+    "neovim-nightly-overlay": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "neovim-flake": "neovim-flake",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1620375202,
+        "narHash": "sha256-miacHH480vL4jJomZHq+QXVVX/OEPVnM1SBJwupjiVE=",
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "rev": "7a622e338501b6a2723f010e1e4b4f0decbe653e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1619336929,
@@ -165,6 +239,22 @@
       }
     },
     "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1620340338,
+        "narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "63586475587d7e0e078291ad4b49b6f6a6885100",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1620382360,
         "narHash": "sha256-ZWYjVMnHlbSiPV2aZc5orzixpKSIsIWw+q4H+QtRdY0=",
@@ -185,8 +275,9 @@
         "emacs-overlay": "emacs-overlay",
         "himalaya": "himalaya",
         "home-manager": "home-manager",
+        "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
       }
     },
     "rust-overlay": {
diff --git a/flake.nix b/flake.nix
index 9eb71f0..c8bf84b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,7 @@
     home-manager.url = "github:nix-community/home-manager";
     himalaya.url = "github:soywod/himalaya";
     emacs-overlay.url = "github:nix-community/emacs-overlay";
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
   };
 
   outputs = inputs@{ self, home-manager, nixpkgs, ... }:
diff --git a/home.nix b/home.nix
index 8f793a8..4777e72 100644
--- a/home.nix
+++ b/home.nix
@@ -4,6 +4,7 @@ let
     (import (builtins.fetchTarball "https://github.com/obsidiansystems/nix-thunk/archive/master.tar.gz") { }).command;
   himalayaSrc = inputs.himalaya;
   himalaya = import ./features/email/himalaya.nix { inherit pkgs inputs system; };
+  neovim-nightly = inputs.neovim-nightly-overlay.packages.${system}.neovim;
 in
 {
   # Let Home Manager install and manage itself.
@@ -72,8 +73,8 @@ in
 
     neovim = {
       enable = true;
+      package = neovim-nightly;
       viAlias = true;
-      vimAlias = true;
       # withNodeJs = true;
 
       extraPackages = [
@@ -87,7 +88,7 @@ in
         papercolor-theme
         fzf-vim
         ale
-        # telescope-nvim
+        telescope-nvim
 
         (pkgs.vimUtils.buildVimPlugin {
           name = "himalaya";