diff --git a/flakes/emacs/config/init.el b/flakes/emacs/config/init.el
index 5b5cd9c..5dfc4c1 100644
--- a/flakes/emacs/config/init.el
+++ b/flakes/emacs/config/init.el
@@ -30,7 +30,8 @@
 (use-package autorevert
   :config
   (setq auto-revert-check-vc-info t
-        auto-revert-interval 1)
+        auto-revert-avoid-polling t
+        auto-revert-interval 5)
   (global-auto-revert-mode))
 
 (use-package avy
@@ -199,20 +200,13 @@
 
 (use-package emacs
   :demand t
-  :preface
-  (defun to/toggle-delete-other-windows ()
-    "Delete other windows, or restore the previous window configuration."
-    (interactive)
-    (if (and winner-mode
-             (one-window-p t))
-        (winner-undo)
-      (delete-other-windows)))
   :bind (("C-x 1" . to/toggle-delete-other-windows)
          ("<C-wheel-up>" . ignore)
          ("<C-wheel-down>" . ignore)
          ("<pinch>" . ignore))
   :config
   (minibuffer-electric-default-mode)
+  (minibuffer-regexp-mode 1)
   (repeat-mode)
   (winner-mode)
   ;; (fset 'yes-or-no-p 'y-or-n-p)
@@ -222,6 +216,7 @@
   (setopt
    auto-save-file-name-transforms `((".*" ,temporary-file-directory t))
    backup-directory-alist `((".*" . ,temporary-file-directory))
+   confirm-kill-processes nil
    create-lockfiles nil
    delete-by-moving-to-trash t
    display-time-default-load-average nil
@@ -236,12 +231,14 @@
    isearch-allow-motion t
    isearch-lazy-count t
    kill-do-not-save-duplicates t
+   large-file-warning-threshold 100000000
    lazy-count-prefix-format "(%s/%s) "
    lazy-count-suffix-format nil
    minibuffer-prompt-properties
    '(read-only t cursor-intangible t face minibuffer-prompt)
    next-line-add-newlines nil
    read-extended-command-predicate #'command-completion-default-include-p
+   require-final-newline t
    save-interprogram-paste-before-kill t
    search-whitespace-regexp ".*?"
    sentence-end-double-space nil
@@ -254,6 +251,7 @@
    undo-outer-limit 1006632960 ;; x 10 (960mb)
    undo-strong-limit 100663296 ;; x 1.5 (96mb)
    use-dialog-box nil
+   use-short-answers t
    user-full-name "Tobias Ostner"
    user-mail-address "tobias.ostner@gmail.com"
    visible-bell t
@@ -283,6 +281,7 @@
    bidi-paragraph-direction 'left-to-right)
 
   (set-charset-priority 'unicode)
+  (set-default-coding-systems 'utf-8)
   (set-terminal-coding-system 'utf-8)
   (set-keyboard-coding-system 'utf-8)
   (set-selection-coding-system 'utf-8)
@@ -380,7 +379,9 @@
   :hook (prog-mode . hl-line-mode))
 
 (use-package jinx
-  :hook ((conf-mode prog-mode text-mode) . jinx-mode))
+  :hook ((conf-mode prog-mode text-mode) . jinx-mode)
+  :custom
+  (jinx-languages "en_US de_DE"))
 
 (use-package js2-mode
   :defer t
diff --git a/flakes/emacs/config/lisp/utils.el b/flakes/emacs/config/lisp/utils.el
index 5077c0e..0c18bd9 100644
--- a/flakes/emacs/config/lisp/utils.el
+++ b/flakes/emacs/config/lisp/utils.el
@@ -5,3 +5,11 @@
       (with-current-buffer buffer
         (view-mode +1)
         (select-window (get-buffer-window buffer)))))
+
+(defun to/toggle-delete-other-windows ()
+  "Delete other windows, or restore the previous window configuration."
+  (interactive)
+  (if (and winner-mode
+           (one-window-p t))
+      (winner-undo)
+    (delete-other-windows)))
diff --git a/flakes/emacs/home.nix b/flakes/emacs/home.nix
index 6e96716..2f43cb3 100644
--- a/flakes/emacs/home.nix
+++ b/flakes/emacs/home.nix
@@ -13,6 +13,13 @@ let
   };
 in
 {
+  home.packages = with pkgs; [
+    enchant
+    hunspell
+    hunspellDicts.de_DE
+    hunspellDicts.en_US
+  ];
+
   home.file =
     (lib.mapAttrs'
       (language: grammar: