nixpkgs/neovim: switch back to stable neovim

.config/nixpkgs/neovim/flake.lock

@@ -1,50 +1,12 @@
 {
   "nodes": {
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1644229661,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "neovim-flake": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "contrib",
-        "lastModified": 1647818703,
-        "narHash": "sha256-OY2R0lA0pp+GRTR7A9Y28LerMGSFJWvku/wgxpRXDl8=",
-        "owner": "neovim",
-        "repo": "neovim",
-        "rev": "e9b53f3fb56e91a0d4f15bb36d8068bcc6ea88cf",
-        "type": "github"
-      },
-      "original": {
-        "dir": "contrib",
-        "owner": "neovim",
-        "repo": "neovim",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1647350163,
-        "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=",
+        "lastModified": 1650585041,
+        "narHash": "sha256-wZAZbkHwXKKdFTrDdKiFIvAtYOgQd3qO1jSSsaWlU84=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d",
+        "rev": "f53f90b66921488fb3681ac78528ce407b775590",
         "type": "github"
       },
       "original": {
@@ -54,7 +16,6 @@
     },
     "root": {
       "inputs": {
-        "neovim-flake": "neovim-flake",
         "nixpkgs": "nixpkgs"
       }
     }

.config/nixpkgs/neovim/flake.nix

@@ -1,24 +1,14 @@
 {
   description = "Neovim configuration";
 
-  inputs = {
-    neovim-flake.url = "github:neovim/neovim?dir=contrib";
-    neovim-flake.inputs.nixpkgs.follows = "nixpkgs";
-  };
-
-  outputs = { self, nixpkgs, neovim-flake }:
+  outputs = { self, nixpkgs }:
     let
-      withOverlay = system: import nixpkgs {
+      withPkgs = system: import nixpkgs {
         inherit system;
-        overlays = [ self.overlay ];
       };
     in
     {
-      overlay = final: prev: {
-        neovim-unwrapped = neovim-flake.packages.${prev.system}.neovim;
-      };
-
-      packages.x86_64-linux.default = (withOverlay "x86_64-linux").callPackage ./neovim.nix {};
-      packages.x86_64-linux.playground = (withOverlay "x86_64-linux").callPackage ./neovim.nix { withPlayground = true; };
+      packages.x86_64-linux.default = (withPkgs "x86_64-linux").callPackage ./neovim.nix {};
+      packages.x86_64-linux.playground = (withPkgs "x86_64-linux").callPackage ./neovim.nix { withPlayground = true; };
     };
 }