diff --git a/flake.lock b/flake.lock
index 8f1c97a..1490f7e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -314,26 +314,6 @@
         "type": "github"
       }
     },
-    "neovim": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729421151,
-        "narHash": "sha256-4vXBq3gKoRVvCO0LkzqYkurrRbCtiPooAanl1zGu5/o=",
-        "ref": "refs/heads/main",
-        "rev": "2b17334f38bf58b6d5f6545014eb0d41368dec32",
-        "revCount": 68,
-        "type": "git",
-        "url": "https://git.ccnlc.eu/Nydragon/neovim.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.ccnlc.eu/Nydragon/neovim.git"
-      }
-    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1728056216,
@@ -482,7 +462,6 @@
         "home-manager": "home-manager_2",
         "hyprland": "hyprland",
         "hyprlock": "hyprlock",
-        "neovim": "neovim",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "nysh": "nysh",
diff --git a/flake.nix b/flake.nix
index 5a34450..8a8671a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,11 +47,6 @@
       url = "git+https://git.ccnlc.eu/Nydragon/flakey-rustypaste.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    neovim = {
-      url = "git+https://git.ccnlc.eu/Nydragon/neovim.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
diff --git a/home/terminal/neovim/default.nix b/home/terminal/neovim/default.nix
index 0f2aed8..5ddd452 100644
--- a/home/terminal/neovim/default.nix
+++ b/home/terminal/neovim/default.nix
@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 {
   programs.neovim = {
     defaultEditor = true;
@@ -6,5 +7,43 @@
     enable = true;
     withPython3 = false;
     withRuby = false;
+
+    extraPackages = with pkgs; [
+      lua
+
+      # Language Servers
+      rust-analyzer
+      nil
+      pyright
+      bash-language-server
+      lua-language-server
+      zls
+      typescript
+      nodePackages_latest.typescript-language-server
+
+      kdePackages.qtdeclarative # QML formatter
+
+      # Formatter
+      python311Packages.black # Python formatter
+      clang-tools
+      nodePackages_latest.prettier # JSON, JS, TS formatter
+      yamlfmt # YAML formatter
+      taplo # TOML formatter
+      rustfmt # Rust formatter
+      shfmt # Shell, Bash etc.
+      nixfmt-rfc-style
+      stylua # lua formatter
+
+      # Misc
+      ripgrep
+      rustc
+      cargo
+      nodejs_22
+      clang
+      tree-sitter
+      fd
+      luajitPackages.luarocks
+      wl-clipboard
+    ];
   };
 }
diff --git a/modules/nix/overlays.nix b/modules/nix/overlays.nix
index f0e6bba..c0f4de9 100644
--- a/modules/nix/overlays.nix
+++ b/modules/nix/overlays.nix
@@ -37,8 +37,6 @@
       #xdg-desktop-portal-hyprland = inputs'.hyprland.packages.xdg-desktop-portal-hyprland;
 
       hyprlock = inputs'.hyprlock.packages.hyprlock;
-
-      neovim = inputs'.neovim.packages.default;
     })
     inputs.rustypaste.overlays.default
   ];