update NixOS, switch to real neovim nightly overlay via flake

Author: mitchellh

flake.lock

@@ -18,15 +18,16 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # Other packages
-    nix-pgquarrel.url = "github:mitchellh/nix-pgquarrel";
-    nix-pgquarrel.inputs.nixpkgs.follows = "nixpkgs";
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
   };
 
   outputs = { self, nixpkgs, home-manager, nixpkgs-unstable, ... }@inputs: let
     mkVM = import ./lib/mkvm.nix;
 
     # Overlays is the list of overlays we want to apply from flake inputs.
-    overlays = [ inputs.nix-pgquarrel.overlay ];
+    overlays = [
+      inputs.neovim-nightly-overlay.overlay
+    ];
   in {
     nixosConfigurations.vm-aarch64 = mkVM "vm-aarch64" rec {
       inherit overlays nixpkgs home-manager;

flake.nix

@@ -9,7 +9,7 @@ nixpkgs.lib.nixosSystem rec {
     # Apply our overlays. Overlays are keyed by system type so we have
     # to go through and apply our system type. We do this first so
     # the overlays are available globally.
-    { nixpkgs.overlays = map (x: x.${system}) overlays; }
+    { nixpkgs.overlays = overlays; }
 
     ../hardware/${name}.nix
     ../machines/${name}.nix

lib/mkvm.nix

@@ -90,11 +90,6 @@
     rxvt_unicode
     xclip
 
-    # I actually don't need this for any particular reason, especially
-    # globally, but I keep this around as an example of how to use a
-    # flake with an overlay. haha.
-    pgquarrel
-
     # This is needed for the vmware user tools clipboard to work.
     # You can test if you don't need this by deleting this and seeing
     # if the clipboard sill works.

machines/vm-shared.nix

@@ -17,9 +17,5 @@
 
   nixpkgs.overlays = import ../../lib/overlays.nix ++ [
     (import ./vim.nix)
-    (import (builtins.fetchTarball {
-      url = https://github.com/nix-community/neovim-nightly-overlay/archive/1dd99a6c91b4a6909e66d0ee69b3f31995f38851.tar.gz;
-      sha256 = "1z8gx1cqd18s8zgqksjbyinwgcbndg2r6wv59c4qs24rbgcsvny9";
-    }))
   ];
 }