From 8ad5e28d4d0d44b92f30e2799b130ce3e6d73486 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 6 Jul 2021 21:51:21 +0200
Subject: vim: use released neovim 0.5.0

---
 common/vim.nix |  2 +-
 flake.lock     | 39 ---------------------------------------
 flake.nix      |  4 ----
 3 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/common/vim.nix b/common/vim.nix
index 613247e..0a3e1c9 100644
--- a/common/vim.nix
+++ b/common/vim.nix
@@ -7,7 +7,7 @@ let
 
   luaFormat = inputs.self.lib.generators.lua { };
 
-  neovim-unwrapped = inputs.neovim-master.defaultPackage.${config.nixpkgs.system};
+  neovim-unwrapped = pkgs.unstable.neovim-unwrapped;
 
   cfg = config.vim;
 
diff --git a/flake.lock b/flake.lock
index 0c1a3f0..15cd6e2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -15,21 +15,6 @@
         "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"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -67,29 +52,6 @@
         "type": "github"
       }
     },
-    "neovim-master": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ]
-      },
-      "locked": {
-        "dir": "contrib",
-        "lastModified": 1625382879,
-        "narHash": "sha256-pi9EfFYaAdzCJuar24CT+nhkS29FCg2nufai1Qb0mZA=",
-        "owner": "neovim",
-        "repo": "neovim",
-        "rev": "490615612ed5ec587c8023de28db495b3181de30",
-        "type": "github"
-      },
-      "original": {
-        "dir": "contrib",
-        "owner": "neovim",
-        "repo": "neovim",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1625176478,
@@ -142,7 +104,6 @@
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "musnix": "musnix",
-        "neovim-master": "neovim-master",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur"
diff --git a/flake.nix b/flake.nix
index befc158..6d014e9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,10 +8,6 @@
     url = "github:nix-community/home-manager/release-21.05";
     inputs.nixpkgs.follows = "nixpkgs";
   };
-  inputs.neovim-master = {
-    url = "github:neovim/neovim?dir=contrib";
-    inputs.nixpkgs.follows = "nixpkgs-unstable";
-  };
   inputs.nur.url = "github:nix-community/NUR";
   inputs.musnix = {
     url = "github:musnix/musnix";
-- 
cgit v1.2.3