diff --git a/flake.lock b/flake.lock
index 070826e..abe98eb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -146,6 +146,39 @@
         "type": "indirect"
       }
     },
+    "flake-parts_4": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-root": {
+      "locked": {
+        "lastModified": 1723604017,
+        "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=",
+        "owner": "srid",
+        "repo": "flake-root",
+        "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "repo": "flake-root",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -466,17 +499,18 @@
         "neotab-nvim": "neotab-nvim",
         "neovim-nightly": "neovim-nightly",
         "nerdy-nvim": "nerdy-nvim",
+        "nixd": "nixd",
         "nixpkgs": [
           "nixpkgs"
         ],
         "nvim-emmet": "nvim-emmet"
       },
       "locked": {
-        "lastModified": 1736121113,
-        "narHash": "sha256-3g6XaUoyrJohd1dyOCjlI4nuDzPde8ygkruUSdS4OkY=",
+        "lastModified": 1736122363,
+        "narHash": "sha256-5lXqvrMFuPfcbUeG0miWQSSbN/EU922JfQwSdhcW1yg=",
         "ref": "refs/heads/main",
-        "rev": "c30a60f7e723ef248ae40e560bc88753b6d5edce",
-        "revCount": 133,
+        "rev": "42ac386a9e59cc5e0fc2adfcae24d014efcbf796",
+        "revCount": 134,
         "type": "git",
         "url": "https://codewith.babesonthe.net/punkfairie/marleyvim"
       },
@@ -560,6 +594,27 @@
         "type": "github"
       }
     },
+    "nixd": {
+      "inputs": {
+        "flake-parts": "flake-parts_4",
+        "flake-root": "flake-root",
+        "nixpkgs": "nixpkgs_2",
+        "treefmt-nix": "treefmt-nix_2"
+      },
+      "locked": {
+        "lastModified": 1735752858,
+        "narHash": "sha256-YzrT9iIODyf96XLhgDi2ESKvrl1v7iNhMqMdNjTTSW4=",
+        "owner": "nix-community",
+        "repo": "nixd",
+        "rev": "17b7dfd1b4a888ded1bbf875b7601e40f43f94e8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixd",
+        "type": "github"
+      }
+    },
     "nixgl": {
       "inputs": {
         "flake-utils": "flake-utils_3",
@@ -609,6 +664,18 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
       }
     },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1733096140,
+        "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1720386169,
@@ -626,6 +693,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1734435836,
+        "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4989a246d7a390a859852baddb1013f825435cee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1735834308,
         "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
@@ -680,7 +763,7 @@
         "lix": "lix",
         "marleyvim": "marleyvim",
         "nixgl": "nixgl",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "rofi-themes": "rofi-themes",
         "rose-pine": "rose-pine",
         "rose-pine-amfora": "rose-pine-amfora",
@@ -825,6 +908,28 @@
         "type": "github"
       }
     },
+    "treefmt-nix_2": {
+      "inputs": {
+        "nixpkgs": [
+          "marleyvim",
+          "nixd",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1734704479,
+        "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "unstable": {
       "locked": {
         "lastModified": 1735834308,
diff --git a/homes/x86_64-linux/marley@nyx/default.nix b/homes/x86_64-linux/marley@nyx/default.nix
index a9ed955..69e427e 100644
--- a/homes/x86_64-linux/marley@nyx/default.nix
+++ b/homes/x86_64-linux/marley@nyx/default.nix
@@ -54,6 +54,7 @@ in {
       man = enabled;
       ncmpcpp = enabled;
       neo = enabled;
+      neovim = enabled;
       nh = enabled;
       pidgin = enabled;
       rbw = enabled;
diff --git a/modules/home/programs/neovim/default.nix b/modules/home/programs/neovim/default.nix
index ed7e457..ad315b7 100644
--- a/modules/home/programs/neovim/default.nix
+++ b/modules/home/programs/neovim/default.nix
@@ -3,18 +3,16 @@
   config,
   pkgs,
   ...
-}:
-let
+}: let
   inherit (lib) mkEnableOption mkIf;
 
   cfg = config.marleyos.programs.neovim;
-in
-{
+in {
   options.marleyos.programs.neovim.enable = mkEnableOption "neovim";
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
-      marleyos.neovim
+      nvim-pkg
     ];
   };
 }