diff --git a/home/nvim/default.nix b/home/nvim/default.nix
index 62fcf82..6119b01 100644
--- a/home/nvim/default.nix
+++ b/home/nvim/default.nix
@@ -20,7 +20,7 @@
     # LSPs
     texlab
     ltex-ls
-    pyright
+    basedpyright
     cmake-language-server
     vscode-langservers-extracted
     yaml-language-server
diff --git a/home/nvim/files/lua/plugins/nvim-cmp.lua b/home/nvim/files/lua/plugins/nvim-cmp.lua
index 3c828e6..d4d5a3e 100644
--- a/home/nvim/files/lua/plugins/nvim-cmp.lua
+++ b/home/nvim/files/lua/plugins/nvim-cmp.lua
@@ -107,12 +107,13 @@ return {
         -- Setup lspconfig.
         local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
 
-        require('lspconfig').pyright.setup {
+        require('lspconfig').basedpyright.setup {
             capabilities = capabilities,
             settings = {
-                python = {
+                basedpyright = {
                     analysis = {
-                        typeCheckingMode = "off"
+                        typeCheckingMode = "basic",
+                        autoImportCompletions = true
                     }
                 }
             }