diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4ee1950..1f060d1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,6 @@ 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
@@ -34,4 +33,3 @@ 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 a665194..2604fe7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -84,11 +84,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682773107,
-        "narHash": "sha256-+h94XeJnG3uk5imJlBi/1lVmcfCbxHpwZp5u7n3Krwg=",
+        "lastModified": 1683753978,
+        "narHash": "sha256-v3/MZqcg4hY6qY6s7ZxP6UXYah69fxWXfJrEXMkC1wQ=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "379d42fad6bc5c28f79d5f7ff2fa5f1c90cb7bf8",
+        "rev": "25e28feddab8923376b9ed2620f817d9d282cd6c",
         "type": "github"
       },
       "original": {
@@ -167,16 +167,17 @@
       "inputs": {
         "flake-utils": "flake-utils_2",
         "nixpkgs": [
+          "nifoc-overlay",
           "nixpkgs"
         ]
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1683648894,
-        "narHash": "sha256-jVKbohNE4kUn0exw0hBKkFXT/k7Bk2z5IhYVsPz/geY=",
+        "lastModified": 1683738879,
+        "narHash": "sha256-V53XRMc6YUYoHFdQ0OgE3HE5qbnwvXWJT9tEi6lT75w=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "36baaf7c1aa0bbc9c80f4512bb1384839c8851ff",
+        "rev": "ac1aee99bc76c0036aa0ccf7b9eda48fcf46ac11",
         "type": "github"
       },
       "original": {
@@ -188,16 +189,17 @@
     },
     "nifoc-overlay": {
       "inputs": {
+        "neovim-flake": "neovim-flake",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1683620480,
-        "narHash": "sha256-qqfDPWgcjg4fa+gn5kfCAeNIOipYbbucEUZH0ojEcCI=",
+        "lastModified": 1683754238,
+        "narHash": "sha256-utLzZGTbf4f5qk5m+k240JOKWEbP+XZxBrWhxf2NSYY=",
         "owner": "nifoc",
         "repo": "nix-overlay",
-        "rev": "f228a26a36b47fdb10c4c3f3813e417966a48e39",
+        "rev": "7e5b7accfb8b23a8e63f7f38559676e9384024a6",
         "type": "github"
       },
       "original": {
@@ -208,11 +210,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1683594133,
-        "narHash": "sha256-iUhLhEAgOCnexSGDsYT2ouydis09uDoNzM7UC685XGE=",
+        "lastModified": 1683686518,
+        "narHash": "sha256-ieG0J4GCUqOE9Wo8cNSsa1Ev9QKMLrHANOlu22v17bo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8d447c5626cfefb9b129d5b30103344377fe09bc",
+        "rev": "12ba1a5f90b16acdca741ac82d8204b3ec8c2aaf",
         "type": "github"
       },
       "original": {
@@ -244,7 +246,6 @@
         "attic": "attic",
         "darwin": "darwin",
         "home-manager": "home-manager",
-        "neovim-flake": "neovim-flake",
         "nifoc-overlay": "nifoc-overlay",
         "nixpkgs": "nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index 8dfcc4f..2fc0737 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,11 +23,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    neovim-flake = {
-      url = "github:neovim/neovim?dir=contrib";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     nifoc-overlay = {
       url = "github:nifoc/nix-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix
index 70bf02c..f7828a5 100644
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -7,11 +7,7 @@ in
 {
   programs.neovim = {
     enable = true;
-    package = pkgs.neovim-nightly.overrideAttrs (oa: {
-      nativeBuildInputs = oa.nativeBuildInputs ++ optionals isDarwin [
-        pkgs.liblpeg-darwin
-      ];
-    });
+    package = pkgs.neovim-nightly;
 
     defaultEditor = true;
 
diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix
index cb28c49..e0ecb90 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-09";
+    version = "2023-05-10";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "6e8ad92031ff3b07db8980ab4a5491d1c40398ea";
-      sha256 = "1adjxg359j101d43k700nr3p43id2rb4yqqplfd4a897gxq60znj";
+      rev = "73c7af9cdbce9330eeb9771639c86269f6d7cf9d";
+      sha256 = "0pxxyv54v6dbcx6glp3qwhns5sznyxr631hxpc3qfxpljcdb3qcw";
       fetchSubmodules = false;
     };
   };
@@ -220,12 +220,12 @@ in
   };
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2023-05-09";
+    version = "2023-05-10";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "8356319af6e8012a5797b647e946b377d1ba3d9c";
-      sha256 = "026n4pkgasfa9r7rnsdrcp0x9fc48qzxri1wkyqlk3hrzv8d2iyw";
+      rev = "84717430fb6f51c9e9cc8d63da10cceafc91500c";
+      sha256 = "02f91bxkm28f1h9wpi9s9h0lp5kxxm3032fg59513m3l3h2xqy39";
       fetchSubmodules = false;
     };
   };
@@ -539,12 +539,12 @@ in
   };
   gitsigns-nvim = buildVimPluginFrom2Nix {
     pname = "gitsigns.nvim";
-    version = "2023-04-28";
+    version = "2023-05-10";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "gitsigns.nvim";
-      rev = "e5edefd9976039f5352e0c900f35206770b33a2d";
-      sha256 = "1g3wh3zwa9ympdfglgxnnfwnv958dyl0l8jqi2an4kgabl6f5471";
+      rev = "814158f6c4b1724c039fcefe79b0be72c9131c2d";
+      sha256 = "1sa50871l86fx1hyrhb07i03r1sjlw76zp30csf846n24vnnnjrq";
       fetchSubmodules = false;
     };
   };
@@ -572,12 +572,12 @@ in
   };
   noice-nvim = buildVimPluginFrom2Nix {
     pname = "noice.nvim";
-    version = "2023-05-07";
+    version = "2023-05-10";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "13c3b39e43fbd0f50dac608fdbda230dec69f1d1";
-      sha256 = "1cjqij8lv002y77wrhi66xiflmh7brdcnvc1imcv69g3ywva75xd";
+      rev = "c2a745a26ae562f1faecbf6177ac53377d2658d5";
+      sha256 = "01y0nh8cdjrwcagcpw99sw55yvylyia4jphpprbyswrggg4r83fw";
       fetchSubmodules = false;
     };
   };
diff --git a/system/flakes/Styx.nix b/system/flakes/Styx.nix
index 17ad72e..f19bdf8 100644
--- a/system/flakes/Styx.nix
+++ b/system/flakes/Styx.nix
@@ -6,7 +6,6 @@ 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 = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
@@ -14,7 +13,6 @@ let
       overlay-x86
       overlay-agenix
       overlay-attic
-      overlay-neovim
       overlay-nifoc
     ];
 
diff --git a/system/flakes/adsb-antenna.nix b/system/flakes/adsb-antenna.nix
index 6a91831..d6f548a 100644
--- a/system/flakes/adsb-antenna.nix
+++ b/system/flakes/adsb-antenna.nix
@@ -4,13 +4,11 @@ let
   default-system = "aarch64-linux";
 
   overlay-attic = inputs.attic.overlays.default;
-  overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       overlay-attic
-      overlay-neovim
       overlay-nifoc
     ];
 
diff --git a/system/flakes/attic.nix b/system/flakes/attic.nix
index 18c8442..e18750e 100644
--- a/system/flakes/attic.nix
+++ b/system/flakes/attic.nix
@@ -3,12 +3,10 @@
 let
   default-system = "x86_64-linux";
 
-  overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
-      overlay-neovim
       overlay-nifoc
     ];
 
diff --git a/system/flakes/mediaserver.nix b/system/flakes/mediaserver.nix
index f394971..6ce14b0 100644
--- a/system/flakes/mediaserver.nix
+++ b/system/flakes/mediaserver.nix
@@ -4,13 +4,11 @@ let
   default-system = "x86_64-linux";
 
   overlay-attic = inputs.attic.overlays.default;
-  overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       overlay-attic
-      overlay-neovim
       overlay-nifoc
     ];
 
diff --git a/system/flakes/sail.nix b/system/flakes/sail.nix
index 0da59a2..17e0685 100644
--- a/system/flakes/sail.nix
+++ b/system/flakes/sail.nix
@@ -4,13 +4,11 @@ let
   default-system = "x86_64-linux";
 
   overlay-attic = inputs.attic.overlays.default;
-  overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       overlay-attic
-      overlay-neovim
       overlay-nifoc
     ];