diff --git a/vim/.vim/lua/config/dap.lua b/vim/.vim/lua/config/dap.lua
index a2a4f03..cb73620 100644
--- a/vim/.vim/lua/config/dap.lua
+++ b/vim/.vim/lua/config/dap.lua
@@ -49,8 +49,6 @@ local on_attach = function(client, bufnr)
     buf_set_keymap("n", "<leader>de", "<Cmd>lua require('jdtls').extract_variable()<CR>", opts)
     buf_set_keymap("v", "<leader>dm", "<Esc><Cmd>lua require('jdtls').extract_method(true)<CR>", opts)
 
-    buf_set_keymap("n", "<leader>cf", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
-
     vim.api.nvim_exec([[
     hi LspReferenceRead cterm=bold ctermbg=red guibg=LightYellow
     hi LspReferenceText cterm=bold ctermbg=red guibg=LightYellow
@@ -136,7 +134,7 @@ config.settings = {
         };
     };
 }
-config.cmd = {'java-lsp', workspace_folder}
+config.cmd = {'javalsp', workspace_folder}
 config.on_attach = on_attach
 config.on_init = function(client, _)
     client.notify('workspace/didChangeConfiguration', { settings = config.settings })
diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua
index bbb7901..5f8f8c8 100644
--- a/vim/.vim/lua/plugins.lua
+++ b/vim/.vim/lua/plugins.lua
@@ -42,8 +42,8 @@ require('packer').startup(function(use)
     use 'renerocksai/calendar-vim'
 
     use 'google/vim-searchindex'
-    use 'ray-x/go.nvim'
-    use 'ray-x/guihua.lua'
+    use { 'ray-x/go.nvim',ft='go' }
+    use { 'ray-x/guihua.lua',ft='go' }
 
     -- Pretty symbols
     use 'kyazdani42/nvim-web-devicons'
@@ -86,13 +86,17 @@ require('packer').startup(function(use)
         'jose-elias-alvarez/null-ls.nvim',
         config = [[ require("config.null-ls") ]]
     }
+
+    -- Rust
     use {
         'saecki/crates.nvim',
+        ft = 'rust',
         tag = 'v0.3.0',
         requires = { 'nvim-lua/plenary.nvim' },
         config = [[ require('crates').setup() ]]
     }
-    use 'simrat39/rust-tools.nvim'
+    use {'simrat39/rust-tools.nvim', ft = 'rust'}
+
     use {
         'folke/trouble.nvim',
         config = [[ require("config.trouble")]]
@@ -107,8 +111,8 @@ require('packer').startup(function(use)
     use {
         'mfussenegger/nvim-dap',
         'mfussenegger/nvim-jdtls',
+        ft = {'java','kotlin'},
         config = [[ require("config.dap")]],
-        ft = {'java','kotlin'}
     }
 
     use 'hrsh7th/vim-vsnip'
@@ -223,10 +227,8 @@ require('packer').startup(function(use)
     use 'preservim/nerdtree'
     use 'tiagofumo/vim-nerdtree-syntax-highlight'
 
-    use 'udalov/kotlin-vim'
+    use { 'udalov/kotlin-vim', ft='kotin' }
 
-    use 'tpope/vim-obsession'
-    -- use 'Valloric/MatchTagAlways'
     use {
         'wesQ3/vim-windowswap',
         setup = [[ vim.g.windowswap_map_keys = 0 ]]
diff --git a/vim/.vim/prefs/leader.vim b/vim/.vim/prefs/leader.vim
index fa337a7..a8608fa 100644
--- a/vim/.vim/prefs/leader.vim
+++ b/vim/.vim/prefs/leader.vim
@@ -122,4 +122,4 @@ function! <SID>SynStack()
   echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
 endfunc
 
-nnoremap <leader>s :SaveSession()<CR>
+nnoremap <leader>s :SaveSession<CR>