diff --git a/roles/neovim/files/lua/autocommands.lua b/roles/neovim/files/lua/autocommands.lua
index 4526c51..456edbb 100644
--- a/roles/neovim/files/lua/autocommands.lua
+++ b/roles/neovim/files/lua/autocommands.lua
@@ -1,12 +1,6 @@
 -- AUTOCOMMANDS
 
 local group = vim.api.nvim_create_augroup("configgroup", { clear = true })
--- Run Flake8 on write in python files
-vim.api.nvim_create_autocmd("BufWritePost", {
-  pattern = "*.py",
-  command = "call flake8#Flake8()",
-  group = group
-})
 -- Open pdf after entering .ly file for side-by-side
 vim.api.nvim_create_autocmd("VimEnter", {
   pattern = "*.ly",
@@ -28,17 +22,6 @@ vim.api.nvim_create_autocmd({ "BufLeave", "FocusLost", "InsertEnter" }, {
   command = "set norelativenumber",
   group = group
 })
--- FileType autocommands
-vim.api.nvim_create_autocmd("FileType", {
-  pattern = "rust",
-  command = "nnoremap <F9> :RustFmt<CR>",
-  group = group
-})
-vim.api.nvim_create_autocmd("FileType", {
-  pattern = "python",
-  command = "nnoremap <F9> :Black<CR>",
-  group = group
-})
 vim.api.nvim_create_autocmd("FileType", {
   pattern = { "lilypond", },
   command = "setlocal foldmethod=indent",
diff --git a/roles/neovim/files/lua/plugins/options/lsp.lua b/roles/neovim/files/lua/plugins/options/lsp.lua
index 3e87ee0..f261bef 100644
--- a/roles/neovim/files/lua/plugins/options/lsp.lua
+++ b/roles/neovim/files/lua/plugins/options/lsp.lua
@@ -6,6 +6,7 @@ local attach_fn = function()
   vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { buffer = 0, remap = false })
   vim.keymap.set('n', 'gT', vim.lsp.buf.type_definition, { buffer = 0, remap = false })
   vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename, { buffer = 0, remap = false })
+  vim.keymap.set('n', '<leader>f', vim.lsp.buf.formatting, { buffer = 0, remap = false })
   vim.keymap.set('n', '<leader>dj', vim.diagnostic.goto_next, { buffer = 0, remap = false })
   vim.keymap.set('n', '<leader>dk', vim.diagnostic.goto_prev, { buffer = 0, remap = false })
   vim.keymap.set('n', '<leader>vd', vim.diagnostic.open_float, { buffer = 0, remap = false })