diff --git a/.emacs b/.emacs
index f8b618b..fbeb439 100644
--- a/.emacs
+++ b/.emacs
@@ -26,6 +26,7 @@
  '(doom-modeline-indent-info t)
  '(doom-modeline-minor-modes t)
  '(doom-modeline-total-line-number t)
+ '(fill-column 80)
  '(global-auto-revert-mode t)
  '(global-display-line-numbers-mode t)
  '(global-subword-mode t)
@@ -156,6 +157,9 @@
 (use-package magit
   :commands (magit-status)
   :bind ("C-x g" . magit-status)
+  :hook
+  (magit-mode .
+    (lambda () (setq-local whitespace-style nil)))
   :custom
   (magit-credential-cache-daemon-socket nil)
   )