diff --git a/nix/config/emacs/init.el b/nix/config/emacs/init.el
index cabc68d..7e45eb9 100644
--- a/nix/config/emacs/init.el
+++ b/nix/config/emacs/init.el
@@ -195,41 +195,44 @@
 
   (setq
    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
-   coding-system-for-write 'utf-8
    create-lockfiles nil
    default-process-coding-system '(utf-8-unix . utf-8-unix)
    delete-by-moving-to-trash t
-   isearch-allow-motion t
-   locale-coding-system 'utf-8
-   next-line-add-newlines nil
-   sentence-end-double-space nil
-   user-full-name "Tobias Ostner"
-   user-mail-address "tobias.ostner@gmail.com"
-   undo-limit 6710886400 ;; 64mb
-   undo-strong-limit 100663296 ;; x 1.5 (96mb)
-   undo-outer-limit 1006632960 ;; x 10 (960mb)
-   truncate-string-ellipsis "..."
-   use-dialog-box nil
-   fast-but-imprecise-scrolling t
-   read-process-output-max (* 1024 1024)
-   ns-use-proxy-icon nil
-   frame-title-format nil
-   auto-window-vscroll nil
-   bookmark-fringe-mark nil
-   tab-always-indent 'complete
    echo-keystrokes 0.1
-   history-delete-duplicates t)
+   enable-recursive-minibuffers t
+   fast-but-imprecise-scrolling t
+   frame-title-format nil
+   history-delete-duplicates t
+   isearch-allow-motion t
+   isearch-lazy-count 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
+   read-process-output-max (* 1024 1024)
+   search-whitespace-regexp ".*?"
+   sentence-end-double-space nil
+   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)
+   use-dialog-box nil
+   user-full-name "Tobias Ostner"
+   user-mail-address "tobias.ostner@gmail.com")
 
-  (setq isearch-lazy-count t
-        lazy-count-prefix-format "(%s/%s) "
-        lazy-count-suffix-format nil
-        search-whitespace-regexp ".*?")
-
-  (setq-default indent-tabs-mode nil
-                bidi-paragraph-direction 'left-to-right
-                bidi-inhibit-bpa t)
+  (setq-default
+   indent-tabs-mode nil
+   bidi-paragraph-direction 'left-to-right
+   bidi-inhibit-bpa t)
 
   (set-charset-priority 'unicode)
   (set-terminal-coding-system 'utf-8)
@@ -262,7 +265,8 @@
       (exec-path-from-shell-initialize)))
 
   (add-hook 'after-save-hook #'executable-make-buffer-file-executable-if-script-p)
-  (add-hook 'package-menu-mode-hook #'hl-line-mode))
+  (add-hook 'package-menu-mode-hook #'hl-line-mode)
+  (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode))
 
 (use-package envrc
   :config