diff --git a/flake.nix b/flake.nix
index 486c895..b738862 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,9 +53,6 @@
       # For development
       devShells.${system}.default = pkgs.mkShell {
         packages = with pkgs; [
-          nixd
-          nixfmt
-
           lua-language-server
           stylua
         ];
diff --git a/home/nvim/default.nix b/home/nvim/default.nix
index 464647f..644fb35 100644
--- a/home/nvim/default.nix
+++ b/home/nvim/default.nix
@@ -27,7 +27,7 @@
 
       (pkgs.vimUtils.buildVimPlugin {
         name = "PicVim";
-        src = builtins.fetchGit {
+        src = fetchGit {
           url = "https://github.com/SyedM-dev/PicVim";
           rev = "5114853ed8f24661e48b726135bf78860d9339d5";
         };
@@ -41,6 +41,11 @@
         p.cpp
       ]))
     ];
+
+    extraPackages = with pkgs; [
+      nixd
+      nixfmt
+    ];
   };
 
   home.file.".config/nvim".source = ./.;