diff --git a/nvim/init.lua b/nvim/init.lua
index fddf848..8bbe302 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -137,11 +137,6 @@ vim.keymap.set('v', '<Tab>', function()
     end
 end, { silent = true, expr = true })
 
--- Disable focus on infos
-vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
-  vim.lsp.handlers.hover, { focusable = false }
-)
-
 vim.api.nvim_create_autocmd("LspAttach", {
     callback = function(args)
         local client = vim.lsp.get_client_by_id(args.data.client_id)
@@ -178,21 +173,27 @@ vim.api.nvim_create_autocmd("LspAttach", {
         -- Some nice shortcuts
         map('n','gD','<cmd>lua vim.lsp.buf.declaration()<CR>')
         map('n','gd','<cmd>lua vim.lsp.buf.definition()<CR>')
-        map('n','K','<cmd>lua vim.lsp.buf.hover()<CR>')
+        map('n','K','<cmd>lua vim.lsp.buf.hover({ focusable = false })<CR>')
         map('n','gr','<cmd>lua vim.lsp.buf.references()<CR>')
         map('n','gs','<cmd>lua vim.lsp.buf.signature_help()<CR>')
         map('n','gi','<cmd>lua vim.lsp.buf.implementation()<CR>')
         map('n','gt','<cmd>lua vim.lsp.buf.type_definition()<CR>')
         map('n','<leader>gw','<cmd>lua vim.lsp.buf.document_symbol()<CR>')
         map('n','<leader>gW','<cmd>lua vim.lsp.buf.workspace_symbol()<CR>')
-        map('n','<leader>ah','<cmd>lua vim.lsp.buf.hover()<CR>')
+        map('n','<leader>ah','<cmd>lua vim.lsp.buf.hover({ focusable = false })<CR>')
         map('n','<leader>af','<cmd>lua vim.lsp.buf.code_action()<CR>')
         map('n','<leader>ee','<cmd>lua vim.lsp.util.show_line_diagnostics()<CR>')
         map('n','<leader>rn','<cmd>lua vim.lsp.buf.rename()<CR>')
-        map('n','<leader>=', '<cmd>lua vim.lsp.buf.formatting()<CR>')
+        map('n','<leader>=', '<cmd>lua vim.lsp.buf.format()<CR>')
         map('n','<leader>ai','<cmd>lua vim.lsp.buf.incoming_calls()<CR>')
         map('n','<leader>ao','<cmd>lua vim.lsp.buf.outgoing_calls()<CR>')
-    end,
+        vim.keymap.set("n", "<leader>jc", function()
+            vim.lsp.buf.code_action({ context = { only = { "source.organizeImports", } }, apply = true, })
+            vim.lsp.buf.code_action({ context = { only = { "source.generate.finalModifiers", } }, apply = true, })
+        end, { buffer = args.buf })
+
+    print("LSP server ready")
+    end
 });
 
 -- Rust
@@ -201,7 +202,6 @@ vim.lsp.config['rust'] = {
     filetypes = { 'rust' },
     root_markers = { 'Cargo.toml' },
 }
-
 vim.lsp.enable('rust')
 
 -- Elm
@@ -210,16 +210,21 @@ vim.lsp.config['elm'] = {
     filetypes = { 'elm' },
     root_markers = { 'elm.json' },
 }
-
 vim.lsp.enable('elm')
 
--- Python
-vim.lsp.config['python'] = {
-    cmd = { 'pylsp' },
+-- Ruff
+vim.lsp.config['ruff'] = {
+    cmd = { 'ruff', 'server' },
     filetypes = { 'python' },
 }
+vim.lsp.enable('ruff')
 
-vim.lsp.enable('python')
+-- Pyright
+vim.lsp.config['pyright'] = {
+    cmd = { 'pyright-langserver', '--stdio' },
+    filetypes = { 'python' },
+}
+vim.lsp.enable('pyright')
 
 -- Java
 vim.lsp.config['java'] = {
@@ -227,7 +232,6 @@ vim.lsp.config['java'] = {
     filetypes = { 'java' },
     root_markers = { 'Makefile' },
 }
-
 vim.lsp.enable('java')
 
 -- Import custom config