1 files changed, 88 insertions, 82 deletions

@@ -29,61 +29,61 @@
   :ensure t :demand t
   :preface
   (setq-default no-littering-etc-directory etc/
-                no-littering-var-directory etc/))
+                no-littering-var-directory etc/))
 
 ;;; Settings
 
 ;; Async
 (setq-default async-shell-command-buffer 'new-buffer
-              async-shell-command-display-buffer nil)
+              async-shell-command-display-buffer nil)
 
 ;; Scrolling
 (setq-default  auto-hscroll-mode t
-               auto-window-vscroll nil
-               fast-but-imprecise-scrolling t
-               hscroll-margin 1
-               hscroll-step 1
-               scroll-conservatively 25
-               scroll-margin 0
-               scroll-preserve-screen-position 1
-               scroll-step 1)
+               auto-window-vscroll nil
+               fast-but-imprecise-scrolling t
+               hscroll-margin 1
+               hscroll-step 1
+               scroll-conservatively 25
+               scroll-margin 0
+               scroll-preserve-screen-position 1
+               scroll-step 1)
 (scroll-bar-mode -1)
 (horizontal-scroll-bar-mode -1)
 (pixel-scroll-precision-mode)
 
 ;; Cursor
 (setq-default cursor-in-non-selected-windows 'hollow
-              cursor-type 'bar
-              blink-cursor-blinks 1
-              blink-cursor-interval 0.25
-              blink-cursor-delay 0.25)
+              cursor-type 'bar
+              blink-cursor-blinks 1
+              blink-cursor-interval 0.25
+              blink-cursor-delay 0.25)
 (blink-cursor-mode)
 
 ;; Mouse
 (setq-default mouse-drag-copy-region t
-              mouse-wheel-progressive-speed nil
-              mouse-yank-at-point t)
+              mouse-wheel-progressive-speed nil
+              mouse-yank-at-point t)
 
 ;; Dialogs
 (unless (boundp 'use-short-answers)
   (fset 'yes-or-no-p 'y-or-n-p))
 
 (setq-default read-answer-short t
-              use-dialog-box nil
-              use-file-dialog nil
-              use-short-answers t)
+              use-dialog-box nil
+              use-file-dialog nil
+              use-short-answers t)
 
 ;; Minibuffer
 (setq-default completion-ignore-case t
-              read-buffer-completion-ignore-case t
-              read-file-name-completion-ignore-case t
-              completions-detailed t
-              enable-recursive-minibuffers t
-              file-name-shadow-properties '(invisible t intangible t)
-              minibuffer-eldef-shorten-default t
-              minibuffer-prompt-properties '( read-only t
-                                              cursor-intangible t
-                                              face minibuffer-prompt))
+              read-buffer-completion-ignore-case t
+              read-file-name-completion-ignore-case t
+              completions-detailed t
+              enable-recursive-minibuffers t
+              file-name-shadow-properties '(invisible t intangible t)
+              minibuffer-eldef-shorten-default t
+              minibuffer-prompt-properties '( read-only t
+                                              cursor-intangible t
+                                              face minibuffer-prompt))
 (file-name-shadow-mode)
 (minibuffer-electric-default-mode)
 
@@ -98,15 +98,15 @@
 
 (require 'savehist)
 (setq-default history-length 1024
-              history-delete-duplicates t
-              ;; savehist-file (etc/ "savehist.el")
-              savehist-save-minibuffer-history t
-              savehist-autosave-interval 30)
+              history-delete-duplicates t
+              ;; savehist-file (etc/ "savehist.el")
+              savehist-save-minibuffer-history t
+              savehist-autosave-interval 30)
 (savehist-mode)
 
 ;; Killing and yanking
 (setq-default kill-do-not-save-duplicates t
-              kill-read-only-ok t
+              kill-read-only-ok t
               ;; XXX: This setting causes an error message the first time it's
               ;; called: "Selection owner couldn't convert: TIMESTAMP".  I have
               ;; absolutely no idea why I get this error, but it's generated in
@@ -114,12 +114,12 @@
               ;; do anything else with it, so for now, I'll just live with the
               ;; message.
               save-interprogram-paste-before-kill t
-              yank-pop-change-selection t)
+              yank-pop-change-selection t)
 (delete-selection-mode)
 
 ;; Notifying the user
 (setq-default echo-keystrokes 0.01
-              ring-bell-function #'ignore)
+              ring-bell-function #'ignore)
 
 ;; Point and mark
 (setq-default set-mark-command-repeat-pop t)
@@ -129,8 +129,8 @@
 
 ;; Startup
 (setq-default inhibit-startup-screen t
-              initial-buffer-choice t
-              initial-scratch-message nil)
+              initial-buffer-choice t
+              initial-scratch-message nil)
 
 (define-advice startup-echo-area-message (:override ())
   (if (get-buffer "*Warnings*")
@@ -143,15 +143,15 @@
 
 ;; Text editing
 (setq-default fill-column 80
-              sentence-end-double-space t
-              tab-width 8
-              tab-always-indent 'complete)
+              sentence-end-double-space t
+              tab-width 8
+              tab-always-indent 'complete)
 (global-so-long-mode)
 
 (setq-default show-paren-delay 0.01
-              show-paren-style 'parenthesis
-              show-paren-when-point-in-periphery t
-              show-paren-when-point-inside-paren t)
+              show-paren-style 'parenthesis
+              show-paren-when-point-in-periphery t
+              show-paren-when-point-inside-paren t)
 (show-paren-mode)
 (electric-pair-mode)
 
@@ -177,33 +177,33 @@
 
 ;; Abbrev
 (setq-default abbrev-file-name (sync/ "abbrev.el")
-              save-abbrevs 'silently)
+              save-abbrevs 'silently)
 
 ;; Files
 (setq-default auto-revert-verbose nil
-              global-auto-revert-non-file-buffers t
-              create-lockfiles nil
-              find-file-visit-truename t
-              mode-require-final-newline t
-              view-read-only t
-              save-silently t)
+              global-auto-revert-non-file-buffers t
+              create-lockfiles nil
+              find-file-visit-truename t
+              mode-require-final-newline t
+              view-read-only t
+              save-silently t)
 (global-auto-revert-mode)
 
 (setq-default auto-save-default nil
-              auto-save-interval 1
-              auto-save-no-message t
-              auto-save-timeout 1
-              auto-save-visited-interval 1
+              auto-save-interval 1
+              auto-save-no-message t
+              auto-save-timeout 1
+              auto-save-visited-interval 1
               remote-file-name-inhibit-auto-save-visited t)
 (add-to-list 'auto-save-file-name-transforms
-             `(".*" ,(etc/ "auto-save/" t) t))
+             `(".*" ,(etc/ "auto-save/" t) t))
 (auto-save-visited-mode)
 
 (setq-default backup-by-copying t
-              version-control t
-              kept-new-versions 8
-              kept-old-versions 8
-              delete-old-versions t)
+              version-control t
+              kept-new-versions 8
+              kept-old-versions 8
+              delete-old-versions t)
 
 (require 'recentf)
 (setq-default ;; recentf-save-file (etc/ "recentf" t)
@@ -218,7 +218,7 @@
 (require 'saveplace)
 (setq-default ;; save-place-file (etc/ "places.el")
  save-place-forget-unreadable-files (eq system-type
-                                        'gnu/linux))
+                                        'gnu/linux))
 (save-place-mode)
 
 (require 'uniquify)
@@ -228,12 +228,18 @@
       uniquify-separator path-separator)
 
 (setq-local vc-follow-symlinks t
-            vc-make-backup-files t)
+            vc-make-backup-files t)
+
+;; Whitespace
+(require 'whitespace)
+(setq-default whitespace-style
+              '(face trailing tabs space-after-tab space-before-tab tab-mark))
+(global-whitespace-mode)
 
 ;; Native compilation
 (setq-default native-comp-async-report-warnings-errors 'silent
-              native-comp-deferred-compilation t
-              native-compile-target-directory (etc/ "eln" t))
+              native-comp-deferred-compilation t
+              native-compile-target-directory (etc/ "eln" t))
 (add-to-list 'native-comp-eln-load-path native-compile-target-directory)
 (when (fboundp 'startup-redirect-eln-cache)
   (startup-redirect-eln-cache native-compile-target-directory))
@@ -302,13 +308,13 @@ N spaces."
                 #'+lisp-comment-or-uncomment-sexp)))
 
 (define-key emacs-lisp-mode-map (kbd "C-c C-c")
-            #'eval-defun)
+            #'eval-defun)
 (define-key emacs-lisp-mode-map (kbd "C-c C-k")
-            #'elisp-eval-region-or-buffer)
+            #'elisp-eval-region-or-buffer)
 (define-key lisp-interaction-mode-map (kbd "C-c C-c")
-            #'eval-defun)
+            #'eval-defun)
 (define-key lisp-interaction-mode-map (kbd "C-c C-k")
-            #'elisp-eval-region-or-buffer)
+            #'elisp-eval-region-or-buffer)
 (define-advice eval-region (:around (orig start end &rest args) pulse)
   (apply orig start end args)
   (pulse-momentary-highlight-region start end))
@@ -320,17 +326,17 @@ N spaces."
 (add-hook 'after-save-hook #'executable-make-buffer-file-executable-if-script-p)
 
 (add-hook 'find-file-not-found-functions
-          (defun create-missing-directories ()
-            "Automatically create missing directories."
-            (let ((target-dir (file-name-directory buffer-file-name)))
-              (unless (file-exists-p target-dir)
-                (make-directory target-dir :parents)))))
+          (defun create-missing-directories ()
+            "Automatically create missing directories."
+            (let ((target-dir (file-name-directory buffer-file-name)))
+              (unless (file-exists-p target-dir)
+                (make-directory target-dir :parents)))))
 
 (add-hook 'find-file-hook
-          (defun vc-remote-off ()
-            "Turn VC off when remote."
-            (when (file-remote-p (buffer-file-name))
-              (setq-local vc-handled-backends nil))))
+          (defun vc-remote-off ()
+            "Turn VC off when remote."
+            (when (file-remote-p (buffer-file-name))
+              (setq-local vc-handled-backends nil))))
 
 ;;; Advice
 
@@ -555,15 +561,15 @@ See also `with-region-or-to-eol'."
   ;; Optionally make narrowing help available in the minibuffer.
   ;; You may want to use `embark-prefix-help-command' or which-key instead.
   (define-key consult-narrow-map (vconcat consult-narrow-key "?")
-              #'consult-narrow-help))
+              #'consult-narrow-help))
 
 (use-package orderless
   :ensure t :demand t
   :init
   (setopt completion-styles '(substring orderless basic)
-          completion-category-defaults nil
-          completion-category-overrides
-          '((file (styles basic partial-completion)))))
+          completion-category-defaults nil
+          completion-category-overrides
+          '((file (styles basic partial-completion orderless)))))
 
 (use-package marginalia
   :ensure t :demand t
@@ -593,8 +599,8 @@ See also `with-region-or-to-eol'."
   :ensure t
   :config
   (setq undo-fu-session-incompatible-files
-        '("/COMMIT_EDITMSG\\'"
-          "/git-rebase-todo\\'"))
+        '("/COMMIT_EDITMSG\\'"
+          "/git-rebase-todo\\'"))
   (global-undo-fu-session-mode))
 
 ;;; basics.el ends here