diff --git a/flake.nix b/flake.nix
index ccb32019..e79822cf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,6 @@
     deploy-rs.url = "github:serokell/deploy-rs";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-master.url = "github:nixos/nixpkgs";
-    flake-utils.url = "github:numtide/flake-utils";
     fenix = {
       url = "github:nix-community/fenix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -15,10 +14,6 @@
       url = "github:nix-community/lanzaboote";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    bob = {
-      flake = false;
-      url = "github:MordechaiHadad/bob";
-    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -30,6 +25,7 @@
     };
     impermanence = {
       url = "github:nix-community/impermanence";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     disko = {
       url = "github:nix-community/disko";
@@ -42,7 +38,17 @@
     emacs-overlay = {
       url = "github:nix-community/emacs-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
+    };
+    neovim-src = {
+      url = "github:neovim/neovim";
+      flake = false;
+    };
+    neovim-nightly-overlay = {
+      url = "github:nix-community/neovim-nightly-overlay";
+      inputs = {
+        neovim-src.follows = "neovim-src";
+        nixpkgs.follows = "nixpkgs";
+      };
     };
     secrets = {
       url = "git+file:secrets?submodules=1";
@@ -93,6 +99,7 @@
               imports = [ inputs.agenix.homeManagerModules.default ];
               nixpkgs.overlays = [
                 inputs.emacs-overlay.overlays.default
+                inputs.neovim-nightly-overlay.overlays.default
                 inputs.fenix.overlays.default
                 self.overlays.modifications
                 self.overlays.additions
diff --git a/pkgs/bob-nvim.nix b/pkgs/bob-nvim.nix
deleted file mode 100644
index fa50d24a..00000000
--- a/pkgs/bob-nvim.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  installShellFiles,
-  rustPlatform,
-  fetchFromGitHub,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "bob";
-  version = "3.0.1";
-
-  buildInputs = [ installShellFiles ];
-  src = fetchFromGitHub {
-    owner = "MordechaiHadad";
-    repo = "bob";
-    rev = "v${version}";
-    hash = "sha256-Op/NXWssylgAOb1BccSOz7JqXFranzAsGICFMF3o/K8=";
-  };
-  cargoLock.lockFile = "${src}/Cargo.lock";
-
-  postInstall = # bash
-    ''
-      installShellCompletion --cmd bob \
-        --bash <($out/bin/bob complete bash) \
-        --zsh <($out/bin/bob complete zsh) \
-        --fish <($out/bin/bob complete fish)
-    '';
-}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 9f7793a4..71c248ca 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,9 +1,5 @@
 { pkgs, ... }:
 {
-  bob-nvim = pkgs.callPackage ./bob-nvim.nix {
-    rustPlatform = pkgs.rustPlatform;
-    fetchFromGitHub = pkgs.fetchFromGitHub;
-  };
   screen-cap = pkgs.callPackage ./screen-cap/default.nix { };
   Fmt = pkgs.writeShellApplication {
     name = "Fmt";
diff --git a/users/price/conf/nvim/default.nix b/users/price/conf/nvim/default.nix
new file mode 100644
index 00000000..01b6f135
--- /dev/null
+++ b/users/price/conf/nvim/default.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home = {
+    packages = with pkgs; [
+      neovide
+      neovim
+    ];
+  };
+}
diff --git a/users/price/home.nix b/users/price/home.nix
index ab4c0f5d..11f89b75 100644
--- a/users/price/home.nix
+++ b/users/price/home.nix
@@ -70,8 +70,6 @@ in
         nodePackages.prettier
         python3
         shfmt
-        bob-nvim
-        neovide
         wezterm
         kitty
         sqlite
@@ -148,10 +146,7 @@ in
         ninja
         ccache
         llvm
-        llvmPackages.libcxxStdenv
         pkg-config
-        openssl.dev
-        curl.dev
       ];
 
     file = softLinkDots ".config";
@@ -175,7 +170,9 @@ in
       GRADLE_USER_HOME = "${config.xdg.dataHome}/gradle";
       _JAVA_OPTIONS = "-Djava.util.prefs.userRoot='${config.xdg.configHome}/java'";
     };
-    sessionPath = [ "${config.xdg.dataHome}/bin" ];
+    sessionPath = [
+      "${config.home.homeDirectory}/.local/bin"
+    ];
   };
 
   xdg = {