diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1f060d1..4ee1950 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,6 +20,7 @@ jobs:
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
     - run: nix build '.#nixosConfigurations.attic.pkgs.attic-server'
     - run: nix build '.#nixosConfigurations.attic.pkgs.attic-client'
+    - run: nix build '.#nixosConfigurations.attic.pkgs.neovim-nightly'
 
   build-arm64-linux:
     runs-on: buildjet-2vcpu-ubuntu-2204-arm
@@ -33,3 +34,4 @@ jobs:
         name: nifoc
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
     - run: nix build '.#nixosConfigurations.adsb-antenna.pkgs.attic-client'
+    - run: nix build '.#nixosConfigurations.adsb-antenna.pkgs.neovim-nightly'
diff --git a/flake.lock b/flake.lock
index 37dec8a..ec4c78f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -113,22 +113,6 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "locked": {
         "lastModified": 1667395993,
@@ -183,17 +167,16 @@
       "inputs": {
         "flake-utils": "flake-utils_2",
         "nixpkgs": [
-          "neovim-nightly-overlay",
           "nixpkgs"
         ]
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1682581904,
-        "narHash": "sha256-9P4T2erXXrPxXTTLgD29U/IdKCOYqP4xbwdYswtVBA8=",
+        "lastModified": 1683121765,
+        "narHash": "sha256-P54glCHzWk9ZsONGwQRTNB0rJdH/FbVCxNwDG9DnC4Y=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "d321deb4a9b05e9d81b79ac166274f4a6e7981bf",
+        "rev": "39caf86e8aa0f6bd803b538b2d864f7dc94fc8dd",
         "type": "github"
       },
       "original": {
@@ -203,29 +186,6 @@
         "type": "github"
       }
     },
-    "neovim-nightly-overlay": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "neovim-flake": "neovim-flake",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1682583188,
-        "narHash": "sha256-CqXxDWqRLc7liA8cwafV4TQ5ggxx3PTlvDs8CUuF5HY=",
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "rev": "c57746e2b9e3b42c0be9d9fd1d765f245c3827b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "rev": "c57746e2b9e3b42c0be9d9fd1d765f245c3827b7",
-        "type": "github"
-      }
-    },
     "nifoc-overlay": {
       "inputs": {
         "nixpkgs": [
@@ -233,11 +193,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1683015695,
-        "narHash": "sha256-ExzgdrZ8QAleNO2Xh20zXZPYhIgeznb/FETHMwqvI0M=",
+        "lastModified": 1683128179,
+        "narHash": "sha256-Cg2NkFpTbnGRawMZZRzD18tx00wEGLBGEekYpaV7CIw=",
         "owner": "nifoc",
         "repo": "nix-overlay",
-        "rev": "26d2cae3181bca2a27d939664bd83eee91d776fc",
+        "rev": "84fc7286b0fd228615e205bcb0947055c310611c",
         "type": "github"
       },
       "original": {
@@ -284,7 +244,7 @@
         "attic": "attic",
         "darwin": "darwin",
         "home-manager": "home-manager",
-        "neovim-nightly-overlay": "neovim-nightly-overlay",
+        "neovim-flake": "neovim-flake",
         "nifoc-overlay": "nifoc-overlay",
         "nixpkgs": "nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index 0254452..8dfcc4f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,8 +23,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    neovim-nightly-overlay = {
-      url = "github:nix-community/neovim-nightly-overlay?rev=c57746e2b9e3b42c0be9d9fd1d765f245c3827b7";
+    neovim-flake = {
+      url = "github:neovim/neovim?dir=contrib";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix
index f1554e2..44e5d1b 100644
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -3,7 +3,11 @@
 {
   programs.neovim = {
     enable = true;
-    package = pkgs.neovim-nightly;
+    package = pkgs.neovim-nightly.overrideAttrs (oa: {
+      nativeBuildInputs = oa.nativeBuildInputs ++ [
+        pkgs.liblpeg-darwin
+      ];
+    });
 
     defaultEditor = true;
 
diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix
index ca2e090..c1e044d 100644
--- a/home/programs/nvim/plugins.nix
+++ b/home/programs/nvim/plugins.nix
@@ -107,12 +107,12 @@ in
   };
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2023-05-02";
+    version = "2023-05-03";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "e2cf8977fda35ad666d7b431b0254d8da710968a";
-      sha256 = "0bvifdi5clly0sm0mi9nrnydiif7xiz52cym94mpv362lkam00ys";
+      rev = "bff7115bf89a553e4a1a120eb69b99486564af4c";
+      sha256 = "1l20an16vxxgdm3mvni6g51lq6xsxkls68hplv7mwp7k66zxxfrp";
       fetchSubmodules = false;
     };
   };
@@ -220,12 +220,12 @@ in
   };
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2023-05-02";
+    version = "2023-05-03";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "05689b96fdad33fb01d4968089760d6886a65058";
-      sha256 = "0w72qki10pl5hbxxydhi4gkk0w1whlq1k47aw5ddqmmvqp13sya7";
+      rev = "3bd4ca412982afa6f88bb7ef890660cee51c3e58";
+      sha256 = "1rnzqr5wnk0zfi85dnrqccqs7jrg8ibd9bqzj4qqsqz40l6bli1s";
       fetchSubmodules = false;
     };
   };
@@ -286,12 +286,12 @@ in
   };
   comment-nvim = buildVimPluginFrom2Nix {
     pname = "comment.nvim";
-    version = "2023-04-28";
+    version = "2023-05-03";
     src = fetchFromGitHub {
       owner = "numtostr";
       repo = "comment.nvim";
-      rev = "38d3b7eb553872d8866f14a0dd4fe84126068fce";
-      sha256 = "1d1a2c864y24lnr8h1xsg9krrk9604vy5mawjccn2fzq9g5vg6z5";
+      rev = "e1fe53117aab24c378d5e6deaad786789c360123";
+      sha256 = "13ypypkb63j8spg9av9i7n0yp0g4d1hwrym0f9659r0kxmzy9h88";
       fetchSubmodules = false;
     };
   };
@@ -319,12 +319,12 @@ in
   };
   nvim-cmp = buildVimPluginFrom2Nix {
     pname = "nvim-cmp";
-    version = "2023-05-01";
+    version = "2023-05-03";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "nvim-cmp";
-      rev = "c3f7c54f6efed83b5657b1cf2e2a9bb7c121c6b4";
-      sha256 = "10d1va35izy4cxbpsyh5h2p5jqxwlwpb5pafhb8fw72rqf02lda7";
+      rev = "bd168a2f86f01f2a348e5f4ac2980943737ff459";
+      sha256 = "18bzn6xklnl02d8xayx4m501nz117wfbcc8m174kmg6nl6l4yh88";
       fetchSubmodules = false;
     };
   };
diff --git a/system/flakes/Styx.nix b/system/flakes/Styx.nix
index 641ddf7..17ad72e 100644
--- a/system/flakes/Styx.nix
+++ b/system/flakes/Styx.nix
@@ -6,7 +6,7 @@ let
   overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; };
   overlay-agenix = inputs.agenix.overlays.default;
   overlay-attic = inputs.attic.overlays.default;
-  overlay-neovim = inputs.neovim-nightly-overlay.overlay;
+  overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
diff --git a/system/flakes/adsb-antenna.nix b/system/flakes/adsb-antenna.nix
index bf3150e..6a91831 100644
--- a/system/flakes/adsb-antenna.nix
+++ b/system/flakes/adsb-antenna.nix
@@ -1,8 +1,10 @@
 { nixpkgs, home-manager, inputs, ... }:
 
 let
+  default-system = "aarch64-linux";
+
   overlay-attic = inputs.attic.overlays.default;
-  overlay-neovim = inputs.neovim-nightly-overlay.overlay;
+  overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
@@ -20,7 +22,7 @@ let
 in
 {
   system = nixpkgs.lib.nixosSystem {
-    system = "aarch64-linux";
+    system = default-system;
     modules = [
       ({
         nixpkgs.overlays = nixpkgsConfig.overlays;
diff --git a/system/flakes/attic.nix b/system/flakes/attic.nix
index aee07e8..18c8442 100644
--- a/system/flakes/attic.nix
+++ b/system/flakes/attic.nix
@@ -1,7 +1,9 @@
 { nixpkgs, home-manager, agenix, attic, inputs, ... }:
 
 let
-  overlay-neovim = inputs.neovim-nightly-overlay.overlay;
+  default-system = "x86_64-linux";
+
+  overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
@@ -18,7 +20,7 @@ let
 in
 {
   system = nixpkgs.lib.nixosSystem {
-    system = "x86_64-linux";
+    system = default-system;
     modules = [
       ../hosts/attic.nix
 
diff --git a/system/flakes/mediaserver.nix b/system/flakes/mediaserver.nix
index 0537eeb..f394971 100644
--- a/system/flakes/mediaserver.nix
+++ b/system/flakes/mediaserver.nix
@@ -1,8 +1,10 @@
 { nixpkgs, home-manager, agenix, inputs, ... }:
 
 let
+  default-system = "x86_64-linux";
+
   overlay-attic = inputs.attic.overlays.default;
-  overlay-neovim = inputs.neovim-nightly-overlay.overlay;
+  overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
@@ -20,7 +22,7 @@ let
 in
 {
   system = nixpkgs.lib.nixosSystem {
-    system = "x86_64-linux";
+    system = default-system;
     modules = [
       ../hosts/mediaserver.nix
 
diff --git a/system/flakes/sail.nix b/system/flakes/sail.nix
index e7ea8ac..0da59a2 100644
--- a/system/flakes/sail.nix
+++ b/system/flakes/sail.nix
@@ -1,8 +1,10 @@
 { nixpkgs, home-manager, agenix, inputs, ... }:
 
 let
+  default-system = "x86_64-linux";
+
   overlay-attic = inputs.attic.overlays.default;
-  overlay-neovim = inputs.neovim-nightly-overlay.overlay;
+  overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
@@ -20,7 +22,7 @@ let
 in
 {
   system = nixpkgs.lib.nixosSystem {
-    system = "x86_64-linux";
+    system = default-system;
     modules = [
       ../hosts/sail.nix