diff --git a/lua/nvpunk/keymaps.lua b/lua/nvpunk/keymaps.lua
index d4a0339..8eccb86 100644
--- a/lua/nvpunk/keymaps.lua
+++ b/lua/nvpunk/keymaps.lua
@@ -16,20 +16,20 @@ M.set_keymaps = function()
     km.vkeymap('>', '>gv')
 
     -- move selection
-    km.vkeymap('<A-k>', ":m '<-2<CR>gv=gv")
-    km.vkeymap('<A-j>', ":m '>+1<CR>gv=gv")
+    -- km.vkeymap('<C-S-k>', ":m '<-2<CR>gv=gv")
+    -- km.vkeymap('<C-S-j>', ":m '>+1<CR>gv=gv")
 
     -- pasting in visual mode doesn't overwrite the clipboard content
-    km.vkeymap('p', '"_dP')
+    -- km.vkeymap('p', '"_dP')
 
     -- pressing esc twice goes to normal mode in terminal windows
-    km.tkeymap('<Esc><Esc>', '<C-\\><C-n>')
+    -- km.tkeymap('<Esc><Esc>', '<C-\\><C-n>')
 
     -- wrapped text movement
-    km.nkeymap('<A-j>', 'gj')
-    km.nkeymap('<A-k>', 'gk')
-    km.nkeymap('<A-Down>', 'gj')
-    km.nkeymap('<A-Up>', 'gk')
+    -- km.nkeymap('<A-j>', 'gj')
+    -- km.nkeymap('<A-k>', 'gk')
+    -- km.nkeymap('<A-Down>', 'gj')
+    -- km.nkeymap('<A-Up>', 'gk')
 
     -- Terminal splitter
     km.nkeymap('<leader>/s', '<cmd>vs<cr><cmd>terminal<cr>',
diff --git a/lua/nvpunk/lsp/base_conf.lua b/lua/nvpunk/lsp/base_conf.lua
index 46dc71f..72314fb 100644
--- a/lua/nvpunk/lsp/base_conf.lua
+++ b/lua/nvpunk/lsp/base_conf.lua
@@ -37,6 +37,7 @@ vim.g.rustaceanvim = {
             ['rust-analyzer'] = {
                 telemetry = { enable = false },
                 offset_encoding = 'utf-8',
+                check = { command = 'clippy' },
             }
         }
     },
diff --git a/lua/nvpunk/lsp/keymaps.lua b/lua/nvpunk/lsp/keymaps.lua
index 01af280..4915b00 100644
--- a/lua/nvpunk/lsp/keymaps.lua
+++ b/lua/nvpunk/lsp/keymaps.lua
@@ -63,8 +63,8 @@ M.set_lsp_keymaps = function(client, bufnr, extra_keymaps)
         'List folders'
     )
     -- bm.nkeymap('<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', 'Open definition')
-    bm.nkeymap('<leader>rn', vim.lsp.buf.rename, 'Rename')
-    bm.nkeymap('gr', vim.lsp.buf.references, 'References')
+    --bm.nkeymap('<leader>rn', vim.lsp.buf.rename, 'Rename')
+    --bm.nkeymap('gr', vim.lsp.buf.references, 'References')
     bm.nkeymap('<leader>e', vim.diagnostic.open_float, 'Show diagnostics')
     bm.nkeymap('[d', vim.diagnostic.goto_prev, 'Prev diagnostic')
     bm.nkeymap(']d', vim.diagnostic.goto_next, 'Next diagnostic')