diff --git a/init.lua b/init.lua
index 4f85ac6..24bf393 100644
--- a/init.lua
+++ b/init.lua
@@ -157,6 +157,8 @@ vim.opt.cursorline = true
 -- Minimal number of screen lines to keep above and below the cursor.
 vim.opt.scrolloff = 10
 
+vim.opt.linebreak = true
+
 -- [[ Basic Keymaps ]]
 --  See `:help vim.keymap.set()`
 
@@ -693,7 +695,7 @@ require('lazy').setup({
         -- have a well standardized coding style. You can add additional
         -- languages here or re-enable it for the disabled ones.
         --local disable_filetypes = { c = true, cpp = true }
-        local disable_filetypes = {}
+        local disable_filetypes = { cpp = true }
         local lsp_format_opt
         if disable_filetypes[vim.bo[bufnr].filetype] then
           lsp_format_opt = 'never'