diff --git a/flakes/emacs/config/init.el b/flakes/emacs/config/init.el
index f0d6a93..900bd3e 100644
--- a/flakes/emacs/config/init.el
+++ b/flakes/emacs/config/init.el
@@ -218,20 +218,14 @@
   (delete-selection-mode)
   (pixel-scroll-precision-mode)
 
-  (setq
+  (setopt
    auto-save-file-name-transforms `((".*" ,temporary-file-directory t))
-   auto-window-vscroll nil
    backup-directory-alist `((".*" . ,temporary-file-directory))
-   bookmark-fringe-mark nil
-   coding-system-for-read 'utf-8
    create-lockfiles nil
-   default-process-coding-system '(utf-8-unix . utf-8-unix)
    delete-by-moving-to-trash t
    echo-keystrokes 0.1
    enable-recursive-minibuffers t
    fast-but-imprecise-scrolling t
-   frame-title-format nil
-   global-auto-revert-non-file-buffers t
    help-window-select t
    highlight-nonselected-windows nil
    history-delete-duplicates t
@@ -240,13 +234,10 @@
    kill-do-not-save-duplicates t
    lazy-count-prefix-format "(%s/%s) "
    lazy-count-suffix-format nil
-   locale-coding-system 'utf-8
    minibuffer-prompt-properties
    '(read-only t cursor-intangible t face minibuffer-prompt)
    next-line-add-newlines nil
-   ns-use-proxy-icon nil
    read-extended-command-predicate #'command-completion-default-include-p
-   redisplay-skip-fontification-on-input t
    save-interprogram-paste-before-kill t
    search-whitespace-regexp ".*?"
    sentence-end-double-space nil
@@ -255,7 +246,6 @@
    scroll-margin 0
    scroll-preserve-screen-position t
    tab-always-indent 'complete
-   truncate-string-ellipsis "..."
    undo-limit 6710886400 ;; 64mb
    undo-outer-limit 1006632960 ;; x 10 (960mb)
    undo-strong-limit 100663296 ;; x 1.5 (96mb)
@@ -263,7 +253,19 @@
    user-full-name "Tobias Ostner"
    user-mail-address "tobias.ostner@gmail.com"
    visible-bell t
-   window-combination-resize t
+   window-combination-resize t)
+
+  (setq
+   auto-window-vscroll nil
+   bookmark-fringe-mark nil
+   coding-system-for-read 'utf-8
+   default-process-coding-system '(utf-8-unix . utf-8-unix)
+   frame-title-format nil
+   global-auto-revert-non-file-buffers t
+   locale-coding-system 'utf-8
+   ns-use-proxy-icon nil
+   redisplay-skip-fontification-on-input t
+   truncate-string-ellipsis "..."
    bidi-inhibit-bpa t)
 
   (setq-default