diff --git a/flake.lock b/flake.lock
index f838378..7e6de40 100644
--- a/flake.lock
+++ b/flake.lock
@@ -67,11 +67,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759702766,
-        "narHash": "sha256-011pCUbIq/fhCiZ20AzqJYNjLzQ1oYkzYEgzcUYVTBg=",
+        "lastModified": 1760130406,
+        "narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5b45dcf4790bb94fec7e550d2915fc2540a3cdd6",
+        "rev": "d305eece827a3fe317a2d70138f53feccaf890a1",
         "type": "github"
       },
       "original": {
@@ -130,11 +130,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759632233,
-        "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=",
+        "lastModified": 1760103332,
+        "narHash": "sha256-BMsGVfKl4Q80Pr9T1AkCRljO1bpwCmY8rTBVj8XGuhA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10",
+        "rev": "870493f9a8cb0b074ae5b411b2f232015db19a65",
         "type": "github"
       },
       "original": {
@@ -146,11 +146,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1759381078,
-        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "lastModified": 1760038930,
+        "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
         "type": "github"
       },
       "original": {
@@ -170,11 +170,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1759670959,
-        "narHash": "sha256-OjvEGJEZDkAri6m1oUV0DE+pRKqh6KEcVuCIlmLN7QU=",
+        "lastModified": 1760201666,
+        "narHash": "sha256-We8VAiO7e8Vy0ptKTSxF5nR9pkm+FaGHkCsIzzsMNEQ=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "e45e9214dcc2ea770418fe407a43902b0438ce78",
+        "rev": "c66070248254d4efb619c3423d71ab3592b31234",
         "type": "github"
       },
       "original": {
@@ -189,11 +189,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1759696599,
-        "narHash": "sha256-GkGJdNkR9gnVQt9OXwhGrD72EpK185jNVT7qoCh/3q4=",
+        "lastModified": 1760211868,
+        "narHash": "sha256-94NlU7LUXuL2fnUoaPDF1Xu9kVOicO+4+DEjIAxggNU=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "dce08ba6904fcaad93c17ab65cf6b3e5dfc2d301",
+        "rev": "9e2d8216b3fb1d5963c162a17fe796c8d7f3d112",
         "type": "github"
       },
       "original": {
diff --git a/home.nix b/home.nix
index 99dba20..b08dcf3 100644
--- a/home.nix
+++ b/home.nix
@@ -40,6 +40,7 @@
       ast-grep
       basedpyright
       bash-language-server
+      bloop
       cachix
       cmake
       coursier
diff --git a/programs/nixvim/plugins/lsp/servers.nix b/programs/nixvim/plugins/lsp/servers.nix
index 5cd1de7..faee1ca 100644
--- a/programs/nixvim/plugins/lsp/servers.nix
+++ b/programs/nixvim/plugins/lsp/servers.nix
@@ -8,7 +8,7 @@
       # Python
       basedpyright = {
         enable = true;
-        settings.settings.basedpyright = {
+        config.settings.basedpyright = {
           analysis = {
             autoImportCompletions = true;
             autoSearchPaths = true;
@@ -45,7 +45,7 @@
       # Lua
       lua_ls = {
         enable = true;
-        settings.settings.diagnostics.globals = [ "vim" ];
+        config.settings.diagnostics.globals = [ "vim" ];
       };
 
       # Documentation
@@ -54,8 +54,7 @@
       # Scala
       metals = {
         enable = true;
-        settings.settings = {
-          bloopSbtAlreadyInstalled = true;
+        config.settings = {
           defaultBspToBuildTool = true;
           enableBestEffort = true;
           excludedPackages = [
@@ -90,7 +89,7 @@
       # Swift/iOS development
       sourcekit = {
         enable = true;
-        settings = {
+        config = {
           cmd = [
             "xcrun"
             "sourcekit-lsp"
diff --git a/programs/nixvim/plugins/neo-tree.nix b/programs/nixvim/plugins/neo-tree.nix
index 73c1ee6..0d36ad5 100644
--- a/programs/nixvim/plugins/neo-tree.nix
+++ b/programs/nixvim/plugins/neo-tree.nix
@@ -14,11 +14,13 @@
     plugins.neo-tree = {
       enable = true;
 
-      closeIfLastWindow = true;
-      window = {
-        width = 30;
-        autoExpandWidth = true;
-        position = "right";
+      settings = {
+        close_if_last_window = true;
+        window = {
+          width = 30;
+          autoExpandWidth = true;
+          position = "right";
+        };
       };
     };
   };