diff options
Diffstat (limited to '.config/emacs/init.el')
| -rw-r--r-- | .config/emacs/init.el | 48 |
1 files changed, 8 insertions, 40 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 99e99de..0f6f0ae 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -8,7 +8,7 @@ ;; Lord knows why this needs to be so complicated… ;; ;; The ‘eval’ is required in the case that this file is byte-compiled. -(if mm-darwin-p +(if mm-humanwave-p (eval '(setq inhibit-startup-echo-area-message "thomasvoss")) (eval '(setq inhibit-startup-echo-area-message "thomas"))) @@ -122,8 +122,9 @@ buffer suppressed." (setopt package-vc-register-as-project nil - package-gnupghome-dir (getenv "GNUPGHOME") package-user-dir (expand-file-name "pkg" mm-data-directory) + package-gnupghome-dir (or (getenv "GNUPGHOME") + (expand-file-name "gnupg" package-user-dir)) package-archives (cl-loop with proto = (if (gnutls-available-p) "https" "http") for (name . url) in '(("gnu" . "elpa.gnu.org/packages/") @@ -176,31 +177,23 @@ buffer suppressed." (echo-keystrokes 0.01) ; 0 disables echoing (echo-keystrokes-help nil) (extended-command-suggest-shorter nil) - (help-window-select t) (initial-buffer-choice t) (initial-scratch-message mm-initial-scratch-message) (kill-do-not-save-duplicates t) (large-file-warning-threshold nil) (make-backup-files nil) (mode-require-final-newline nil) - (next-error-recenter '(4)) ; ‘center of window’ + (next-error-recenter '(4)) ; ‘center of window’ (read-extended-command-predicate #'command-completion-default-include-p) (remote-file-name-inhibit-auto-save t) (remote-file-name-inhibit-delete-by-moving-to-trash t) - (require-final-newline nil) + (require-final-newline mm-humanwave-p) (save-interprogram-paste-before-kill t) - (scroll-conservatively 101) ; (info "(Emacs)Auto Scrolling") - (scroll-error-top-bottom t) - (scroll-margin 10) (user-full-name "Thomas Voss") (user-mail-address "mail@thomasvoss.com") - (vc-follow-symlinks t) - (vc-handled-backends '(Git)) :config (load custom-file :noerror) - (setq-default - fill-column 80 - truncate-partial-width-windows nil) + (setq-default fill-column 80) (dolist (mode '(text-mode emacs-lisp-mode lisp-mode)) (add-hook (mm-mode-to-hook mode) (defun mm-set-fill-column () @@ -216,12 +209,6 @@ buffer suppressed." (add-hook 'before-save-hook #'delete-trailing-whitespace) (prefer-coding-system 'utf-8) - ;; Show trailing whitespace but only in relevant buffers - (dolist (mode '(conf-mode prog-mode text-mode)) - (add-hook (mm-mode-to-hook mode) - (defun mm-show-trailing-whitespace () - (setopt show-trailing-whitespace t)))) - ;; Disabled modes (blink-cursor-mode -1) (line-number-mode -1) @@ -235,16 +222,6 @@ buffer suppressed." (show-paren-delay 0)) -;;; Display Line Numbers - -(use-package display-line-numbers - :hook prog-mode - :custom - (display-line-numbers-type 'relative) - (display-line-numbers-width-start 99) - (display-line-numbers-grow-only t)) - - ;;; Auto Revert Buffers (use-package autorevert @@ -265,17 +242,6 @@ buffer suppressed." (bookmark-save-flag 1)) -;;; Smoother Scrolling - -(use-package pixel-scroll - :init - (pixel-scroll-precision-mode) - :config - ;; Make it easier to use custom scroll functions - (dolist (binding '("<next>" "<prior>")) - (keymap-unset pixel-scroll-precision-mode-map binding :remove))) - - ;;; Automatically Create- and Delete Directories (defun mm-auto-create-directories (function filename &rest arguments) @@ -331,6 +297,7 @@ the buffer without saving it." ;;; Load Modules (require 'mm-abbrev) ; Text Expansion +(require 'mm-buffer-menu) ; Buffer Menu (require 'mm-calc) ; Emacs Calc (require 'mm-completion) ; Completions (require 'mm-dired) ; Dired @@ -345,6 +312,7 @@ the buffer without saving it." (require 'mm-tetris) ; Emacs Tetris (require 'mm-theme) ; Themeing (require 'mm-treesit) ; Tree-Sitter +(require 'mm-window) ; Windowing (when mm-darwin-p (require 'mm-darwin)) ; MacOS (when mm-lsp-p |