diff --git a/.config/nvim/.github/README.md b/.config/nvim/.github/README.md
index a18152f2..55e77e49 100644
--- a/.config/nvim/.github/README.md
+++ b/.config/nvim/.github/README.md
@@ -601,6 +601,7 @@
 - hadolint
 - markdownlint
 - pylint
+- ruff
 - shellcheck
 - stylelint
 - terraform_validate
@@ -613,11 +614,10 @@
 - black
 - csharpier
 - fish_indent
-- flake8
 - gofumpt
 - goimports
-- isort
 - prettier
+- ruff
 - rustfmt
 - shfmt
 - stylua
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 57f03639..63259456 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -108,7 +108,7 @@
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
   "rainbow-delimiters.nvim": { "branch": "master", "commit": "739a034046465d2b100151037401c24c42cb09cf" },
   "refactoring.nvim": { "branch": "master", "commit": "28c5a33a0c489eb559396d9424b042ccfdb03b14" },
-  "rustaceanvim": { "branch": "master", "commit": "c8856f9ab078976422a04e857da3b6eadce7cd3d" },
+  "rustaceanvim": { "branch": "master", "commit": "207f2845f3cfb15840c8a94b2fb3077068ab25ac" },
   "satellite.nvim": { "branch": "main", "commit": "1a20861227eba8bf2d8282ab4ec5fc071e8b20e2" },
   "search-replace.nvim": { "branch": "main", "commit": "d92290a02d97f4e9b8cd60d28b56b403432158d5" },
   "semshi": { "branch": "master", "commit": "0182447e2ff4dfa04cd2dfe5f189e012c581ca45" },
diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index 1420872a..d3abf0bf 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -1,6 +1,5 @@
 {
   "extras": [
-    "lazyvim.plugins.extras.formatting.black",
     "lazyvim.plugins.extras.lang.python-semshi",
     "lazyvim.plugins.extras.lang.yaml",
     "lazyvim.plugins.extras.ui.edgy",
@@ -44,6 +43,7 @@
     "plugins.extras.editor.telescope.zoxide",
     "plugins.extras.editor.terminal.floaterm",
     "plugins.extras.formatting.prettier-extended",
+    "plugins.extras.formatting.ruff",
     "plugins.extras.formatting.rustfmt",
     "plugins.extras.formatting.trim_newlines",
     "plugins.extras.formatting.trim_whitespace",
@@ -92,4 +92,5 @@
     "NEWS.md": "2123"
   },
   "version": 2
-}
\ No newline at end of file
+}
+
diff --git a/.config/nvim/lua/plugins/extras/formatting/ruff.lua b/.config/nvim/lua/plugins/extras/formatting/ruff.lua
new file mode 100644
index 00000000..e6171725
--- /dev/null
+++ b/.config/nvim/lua/plugins/extras/formatting/ruff.lua
@@ -0,0 +1,17 @@
+return {
+  {
+    "stevearc/conform.nvim",
+    opts = function(_, opts)
+      opts.formatters_by_ft.python = opts.formatters_by_ft.python or {}
+      table.insert(opts.formatters_by_ft.python, "ruff_format")
+      return opts
+    end,
+  },
+  {
+    "williamboman/mason.nvim",
+    opts = function(_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      vim.list_extend(opts.ensure_installed, { "ruff-lsp" })
+    end,
+  },
+}