diff --git a/flake.lock b/flake.lock
index 3bd2dfb..762ba38 100644
--- a/flake.lock
+++ b/flake.lock
@@ -173,24 +173,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -252,46 +234,21 @@
         "type": "github"
       }
     },
-    "neovim-flake": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nifoc-overlay",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "contrib",
-        "lastModified": 1716156820,
-        "narHash": "sha256-1hW6OkPWWjp07rIhwEnsLwd4dqCtCLN6YreSvfy8lN4=",
-        "owner": "neovim",
-        "repo": "neovim",
-        "rev": "b16b287b8f36a8e25b27f3009d7fdd0d39348894",
-        "type": "github"
-      },
-      "original": {
-        "dir": "contrib",
-        "owner": "neovim",
-        "repo": "neovim",
-        "type": "github"
-      }
-    },
     "nifoc-overlay": {
       "inputs": {
         "flake-parts": [
           "flake-parts"
         ],
-        "neovim-flake": "neovim-flake",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1716170503,
-        "narHash": "sha256-bdwihVZIBFQIkd+wcPwhzMBrAsOfeRHfdAm/JH+ZX+I=",
+        "lastModified": 1716203874,
+        "narHash": "sha256-Nhu1py/xcVcSZ/v7no/ZE0kS8nWFWYxUn1+0jBSQBIM=",
         "ref": "refs/heads/master",
-        "rev": "d9b5729e0e7ffe02ecf967a4b8d83bfabbde4311",
-        "revCount": 821,
+        "rev": "056a5db75e3dc960e7e282ea1c26cb3f1851811a",
+        "revCount": 823,
         "type": "git",
         "url": "https://git.kempkens.io/daniel/nix-overlay"
       },
@@ -307,11 +264,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715901937,
-        "narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=",
+        "lastModified": 1716204319,
+        "narHash": "sha256-3KL5dRGk89SUaeODFO6B9lxymCVav3UzqsNxOzAbwVY=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8",
+        "rev": "e1cacc63e6e324ae95e65e8aaea62dec74686208",
         "type": "github"
       },
       "original": {
@@ -338,11 +295,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1716127062,
-        "narHash": "sha256-2rk8FqB/iQV2d0vQLs684/Tj5PUHaS1sFwG7fng5vXE=",
+        "lastModified": 1716170507,
+        "narHash": "sha256-EAJWIo2uRoELjlI9+RAL/9QF4D+SSHqYLyMW4QTZLP0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8a2555763c48e2410054de3f52f7310ce3241ec5",
+        "rev": "f72f67152a44df2d2c09a578bac8e09b9390279b",
         "type": "github"
       },
       "original": {
@@ -468,21 +425,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix
index fe1ff5d..7569323 100644
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -7,7 +7,7 @@ in
 {
   programs.neovim = {
     enable = true;
-    package = pkgs.neovim-nightly;
+    package = pkgs.neovim-unwrapped;
 
     defaultEditor = true;
 
@@ -127,8 +127,6 @@ in
           type = "fennel";
         }
 
-        playground
-
         # Telescope
         {
           plugin = telescope-nvim;
diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix
index a168699..3b57377 100644
--- a/home/programs/nvim/plugins.nix
+++ b/home/programs/nvim/plugins.nix
@@ -29,7 +29,7 @@ in
   };
   nvim-web-devicons = buildVimPlugin {
     pname = "nvim-web-devicons";
-    version = "2024-05-13";
+    version = "2024-05-14";
     src = fetchFromGitHub {
       owner = "kyazdani42";
       repo = "nvim-web-devicons";
@@ -121,8 +121,8 @@ in
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "d184407e33084f4a57302bc1adf991997ccdd1da";
-      sha256 = "1psmm4jnpw1b7fdsrmrm1x1c840d73khh8qpsk7l4ihfah557xvp";
+      rev = "7c9c5bed8340031f8a6dad47a58a26eaf15b9a56";
+      sha256 = "0lki07zrpakm944kn0dpxkc2b50ank5n8idnvkl3lrwlcqyfjaqg";
       fetchSubmodules = false;
     };
   };
@@ -159,25 +159,14 @@ in
       fetchSubmodules = false;
     };
   };
-  playground = buildVimPlugin {
-    pname = "playground";
-    version = "2023-09-15";
-    src = fetchFromGitHub {
-      owner = "nvim-treesitter";
-      repo = "playground";
-      rev = "ba48c6a62a280eefb7c85725b0915e021a1a0749";
-      sha256 = "1vgj5vc32ly15ni62fk51yd8km2zp3fkzx0622x5cv9pavmjpr40";
-      fetchSubmodules = false;
-    };
-  };
   telescope-nvim = buildVimPlugin {
     pname = "telescope.nvim";
-    version = "2024-05-17";
+    version = "2024-05-20";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "0c12735d5aff6a48ffd8111bf144dc2ff44e5975";
-      sha256 = "1k439x672iwrfqhy1ak6knsqlsydp5vhwf9ipd1m6p3hzbk0n7gs";
+      rev = "4aed63995a69e343b068c7469491a8d1592c339f";
+      sha256 = "05ny8znavjbjkk5gv362rzsgdjpcl26jf6j24w6jkayzk4x1y2ac";
       fetchSubmodules = false;
     };
   };
@@ -216,12 +205,12 @@ in
   };
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2024-05-18";
+    version = "2024-05-20";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "6d2ae9fdc3111a6e8fd5db2467aca11737195a30";
-      sha256 = "1vsri2p7prbm336b08hkjc78jdv5bw79kiy3kkqjhk3nigqavxir";
+      rev = "9bda20fb967075355f253911bc066a8b5a03c77e";
+      sha256 = "05y3gnfi4wqi521i2m481gc4ay6j5vcww18c8jpn6bj42slgl6z3";
       fetchSubmodules = false;
     };
   };
@@ -238,7 +227,7 @@ in
   };
   schemastore-nvim = buildVimPlugin {
     pname = "schemastore.nvim";
-    version = "2024-05-19";
+    version = "2024-05-20";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "schemastore.nvim";
@@ -403,7 +392,7 @@ in
   };
   nvim-autopairs = buildVimPlugin {
     pname = "nvim-autopairs";
-    version = "2024-05-19";
+    version = "2024-05-20";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-autopairs";
@@ -458,12 +447,12 @@ in
   };
   heirline-nvim = buildVimPlugin {
     pname = "heirline.nvim";
-    version = "2024-05-12";
+    version = "2024-05-20";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "heirline.nvim";
-      rev = "c52391dc4428d503f65e6bcb1533e6334f22a136";
-      sha256 = "0hplfmqy9gx21ifqyj23ydq7zsm9v0kfhhqb4s9bjb1djx9209j4";
+      rev = "7566440d5ac0953b7b6505b754d30f3f2469fad6";
+      sha256 = "1imyd30rvc3fjhg0jdyqi3yaihphca0r0hsjfd90ivw6ms26fdyx";
       fetchSubmodules = false;
     };
   };
@@ -528,8 +517,8 @@ in
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "d55898fe64e3b3d87a0b3b38ddc9c3d57526ff48";
-      sha256 = "01q0zsq35w5km135nh4sb9i22zg0igljixjblwk9frvlh4lc1vwc";
+      rev = "b93316d15c590377f50ca61e70e9129e4aa9b848";
+      sha256 = "13g6rjd70x73jnpv4mp4pb8nyjrphdsnwk81w8z732jgdb8058vy";
       fetchSubmodules = false;
     };
   };
diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml
index a7da3c6..dca5d7d 100644
--- a/home/programs/nvim/plugins.yaml
+++ b/home/programs/nvim/plugins.yaml
@@ -16,7 +16,6 @@
 - src: NoahTheDuke/vim-just
 - src: HiPhish/rainbow-delimiters.nvim
 - src: folke/todo-comments.nvim
-- src: nvim-treesitter/playground
 # Telescope
 - src: nvim-telescope/telescope.nvim
 - src: ahmedkhalf/project.nvim
@@ -60,6 +59,6 @@
 - src: lewis6991/gitsigns.nvim
 - src: sindrets/diffview.nvim
 - src: NeogitOrg/neogit
-  branch: nightly
+  branch: master
 - src: j-hui/fidget.nvim
 - src: folke/which-key.nvim
diff --git a/system/flakes/Styx.nix b/system/flakes/Styx.nix
index 419e33e..1cbb48c 100644
--- a/system/flakes/Styx.nix
+++ b/system/flakes/Styx.nix
@@ -10,8 +10,8 @@ let
     overlays = [
       overlay-x86
       agenix.overlays.default
-      overlay-mkalias
       inputs.nifoc-overlay.overlay
+      overlay-mkalias
     ];
 
     config = {