diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua
new file mode 100644
index 0000000..e7aea02
--- /dev/null
+++ b/lua/plugins/conform.lua
@@ -0,0 +1,16 @@
+return {
+    "stevearc/conform.nvim",
+    config = function ()
+        vim.api.nvim_create_user_command("Format", function (args)
+            local range = nil
+            if args.count ~= -1 then
+                local end_line = vim.api.nvim_buf_get_lines(0, args.line2 - 1, args.line2, true)[1]
+                range = {
+                    start = { args.line1, 0},
+                    ["end"] = { args.line2, end_line:len() },
+                }
+            end
+            require("conform").format({ async = true, lsp_format = "fallback", range = range })
+        end, {range = true })
+    end
+}