From eec6e3edf99fb177ddd4c9ec63a196f1fe331774 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Tue, 18 May 2021 11:36:36 +0200
Subject: [PATCH] feat: switch to neovim flake

---
 flake.lock                      | 50 +++++++++++++++++++++++++--------
 flake.nix                       | 12 +++++++-
 home/editors/neovim/default.nix | 14 +--------
 3 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index afc0768..d191260 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1620692082,
-        "narHash": "sha256-s/eBXs4OI47yPWNTKoAg4f/H7wMLyO+VEMmobXkzfI8=",
+        "lastModified": 1621227293,
+        "narHash": "sha256-eLBymCG2AvHpex58S3NdDueUWydQgnv3Jzm+Ec+aIWw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "23769994e8f7b212d9a257799173b120ed87736b",
+        "rev": "6a471f1b1111408d541caf04e64650813bfb22ac",
         "type": "github"
       },
       "original": {
@@ -36,13 +36,38 @@
         "type": "github"
       }
     },
+    "neovim": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "contrib",
+        "lastModified": 1621323438,
+        "narHash": "sha256-pczGTgVGMLke9w+7t87egrH8PbNiRfZPX7QatGcApo0=",
+        "owner": "neovim",
+        "repo": "neovim",
+        "rev": "c40de6e5f5898943e0a77590694e9ce890e49995",
+        "type": "github"
+      },
+      "original": {
+        "dir": "contrib",
+        "owner": "neovim",
+        "repo": "neovim",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1620830445,
-        "narHash": "sha256-CE4R4OlOcTUATacRZMo5hyS9n47U6A0G5SASNoo4TbI=",
+        "lastModified": 1621073999,
+        "narHash": "sha256-Cp99YreSFedcWovxNmO8g8qFYltQQJPRLfuot6Z7iGE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "65d6153aec85c8cb46023f0a7248628f423ca4ee",
+        "rev": "83d907fd760d9ee4f49b4b7e4b1c6682f137b573",
         "type": "github"
       },
       "original": {
@@ -69,11 +94,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1620857692,
-        "narHash": "sha256-3ykEsUUgoCQkKY+Rs+ao2Ro6avSP5YpDjorbMuui2QA=",
+        "lastModified": 1621237577,
+        "narHash": "sha256-/XkHvj08G2HAaxSU7BkKmvibFs801KAtIMDaDYessOE=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "c729672908b82f40b850fbfea50faa542cdab51c",
+        "rev": "e75e0e5ad0e4b27de60261b29faf9e5d634ec33d",
         "type": "github"
       },
       "original": {
@@ -150,11 +175,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1619976063,
-        "narHash": "sha256-2tjVP95+qR1UzL8/UeV/xRJu7S2fRB7rf7enZedbrik=",
+        "lastModified": 1620897287,
+        "narHash": "sha256-UU0SysjA5h1NMCQhA0lKaeqy9gCBqpq/5dW1BWLbIXo=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "09fb9e425111878b58223852e87ed85e8a189e0d",
+        "rev": "40a51af82c1181b9dea3526c4124eee077e30213",
         "type": "github"
       },
       "original": {
@@ -183,6 +208,7 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
+        "neovim": "neovim",
         "nixpkgs": "nixpkgs",
         "nur": "nur",
         "obelisk": "obelisk",
diff --git a/flake.nix b/flake.nix
index 87bb704..27820c2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,12 @@
 
   inputs.nur.url = "github:nix-community/NUR/master";
 
+  inputs.neovim = {
+    url = "github:neovim/neovim?dir=contrib";
+    inputs.nixpkgs.follows = "nixpkgs";
+    inputs.flake-utils.follows = "flake-utils";
+  };
+
   inputs.obelisk = {
     url = "github:obsidiansystems/obelisk";
     flake = false;
@@ -27,10 +33,13 @@
     inputs.flake-utils.follows = "flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils, home-manager, nur, obelisk
+  outputs = { self, nixpkgs, flake-utils, home-manager, nur, neovim, obelisk
     , photoprism-flake, pre-commit-hooks }:
     let
       overlays = {
+        neovim = self: super: {
+          neovim-nightly = neovim.packages.${self.system}.neovim;
+        };
         deconz = self: super: {
           deconz = self.qt5.callPackage ./pkgs/deconz { };
         };
@@ -54,6 +63,7 @@
 
           nixpkgs.overlays = [
             nur.overlay
+            overlays.neovim
             overlays.deconz
             overlays.photoprism
             overlays.obelisk
diff --git a/home/editors/neovim/default.nix b/home/editors/neovim/default.nix
index 240e418..6033cf0 100644
--- a/home/editors/neovim/default.nix
+++ b/home/editors/neovim/default.nix
@@ -1,18 +1,6 @@
 { config, pkgs, ... }:
 
 let
-  neovim-unwrapped = pkgs.neovim-unwrapped.overrideAttrs (oldAttrs: rec {
-    version = "2021-05-04";
-    src = pkgs.fetchFromGitHub {
-      owner = "neovim";
-      repo = "neovim";
-      rev = "63d8a8f4e8b02e524d85aed08aa16c5d9815598c";
-      sha256 = "0zfrbvj8f2993n1gy37cnfmgixi6zgickzf44c1ll888k5f5rrx3";
-    };
-    nativeBuildInputs = oldAttrs.nativeBuildInputs
-      ++ [ pkgs.utf8proc pkgs.tree-sitter ];
-  });
-
   buildVimPluginFrom2Nix = pkgs.vimUtils.buildVimPluginFrom2Nix;
 
   nvim-ts-autotag = buildVimPluginFrom2Nix {
@@ -47,7 +35,7 @@ in {
 
   programs.neovim = {
     enable = true;
-    package = neovim-unwrapped;
+    package = pkgs.neovim-nightly;
     viAlias = true;
     vimAlias = true;
     plugins = with pkgs.vimPlugins; [