diff --git a/lua/pika/core/options.lua b/lua/pika/core/options.lua
index 3d78ec5..9e11994 100644
--- a/lua/pika/core/options.lua
+++ b/lua/pika/core/options.lua
@@ -8,6 +8,14 @@ o.number = true
 -- Minimal number of screen lines to keep above and below the cursor.
 o.scrolloff = 8
 
+o.formatoptions:append("c") -- Auto-wrap comments
+o.formatoptions:append("r") -- Auto-insert comment leader on Enter
+o.formatoptions:append("o") -- Auto-insert comment leader with 'o'/'O'
+o.formatoptions:append("q") -- Allow formatting of comments with 'gq'
+o.formatoptions:remove("t") -- Don't auto-wrap text (only comments)
+
+o.textwidth = 80
+
 -- tabs & indentation
 o.tabstop = 2 -- 2 spaces for tabs (prettier default)
 o.shiftwidth = 2 -- 2 spaces for indent width