diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix
index aa6a003..0cd8cce 100644
--- a/home-manager/modules/neovim.nix
+++ b/home-manager/modules/neovim.nix
@@ -57,6 +57,8 @@
 
       vim-terraform
       goyo-vim
+
+      conflict-marker-vim
     ];
     extraConfig = ''
       set nocompatible
@@ -78,6 +80,7 @@
       set smartcase
       set colorcolumn=120
       set textwidth=120
+      set nowrap
 
       " Autosave when focus is lost
       :au FocusLost * :wa