diff --git a/flake.lock b/flake.lock
index eb20aaa..f75a33e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -210,6 +210,21 @@
       }
     },
     "flake-utils_5": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_6": {
       "locked": {
         "lastModified": 1644229661,
         "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -419,6 +434,27 @@
         "type": "github"
       }
     },
+    "neovim": {
+      "inputs": {
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": "nixpkgs_6"
+      },
+      "locked": {
+        "dir": "contrib",
+        "lastModified": 1676603980,
+        "narHash": "sha256-EWHGiO/1dulYfzdUnxXqW6nu79T+soBC/YS0tZPtlQ0=",
+        "owner": "neovim",
+        "repo": "neovim",
+        "rev": "371a74e4e1685f21e83c70eb8f0bd05c2ce24e49",
+        "type": "github"
+      },
+      "original": {
+        "dir": "contrib",
+        "owner": "neovim",
+        "repo": "neovim",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1673540789,
@@ -532,6 +568,22 @@
       }
     },
     "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1671983799,
+        "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1675940568,
         "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=",
@@ -547,7 +599,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1671271357,
         "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=",
@@ -619,9 +671,9 @@
     "pre-commit-hooks_3": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_5",
         "gitignore": "gitignore_2",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_8",
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
@@ -651,7 +703,8 @@
         "hyprland": "hyprland",
         "hyprpaper": "hyprpaper",
         "master": "master",
-        "nixpkgs": "nixpkgs_6",
+        "neovim": "neovim",
+        "nixpkgs": "nixpkgs_7",
         "pre-commit-hooks": "pre-commit-hooks_3",
         "stable": "stable",
         "utils": "utils_2"
@@ -690,7 +743,7 @@
     },
     "utils_2": {
       "inputs": {
-        "flake-utils": "flake-utils_5"
+        "flake-utils": "flake-utils_6"
       },
       "locked": {
         "lastModified": 1657226504,
diff --git a/flake.nix b/flake.nix
index 945aaf5..efd2145 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,6 +48,8 @@
 
     emacs.url = "git+ssh://git@gitea.moritzboeh.me/moritz/emacs.git?ref=main";
 
+    neovim.url = "github:neovim/neovim?dir=contrib";
+
     # Hyprland
     hyprland.url = "github:hyprwm/Hyprland";
     hyprpaper.url = "github:hyprwm/hyprpaper";
diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index 1c00cf5..553def7 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -20,6 +20,7 @@ in
   config = mkIf cfg.enable {
     home-manager.users.moritz.programs.neovim = {
       enable = true;
+      package = pkgs.neovim-nightly;
       vimAlias = true;
       vimdiffAlias = true;
       withNodeJs = true;
diff --git a/overlays/default.nix b/overlays/default.nix
index 071a899..4f6be2e 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,4 +1,6 @@
 { inputs }: final: prev: {
+  neovim-nightly = inputs.neovim.packages.${prev.system}.default;
+
   logseq-wayland = prev.symlinkJoin {
     name = "logseq-wayland";
     paths = [ prev.logseq ];