diff options
Diffstat (limited to 'emacs-init.el')
| -rw-r--r-- | emacs-init.el | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/emacs-init.el b/emacs-init.el index 635cf44d..bd48746e 100644 --- a/emacs-init.el +++ b/emacs-init.el @@ -8,31 +8,31 @@ (concat (string-trim-right name "/") "/") (expand-file-name "emacs/" (pcase type - ('cache (or (getenv "XDG_CACHE_HOME") "~/.cache/")) - ('config (or (getenv "XDG_CONFIG_HOME") "~/.config/")) - ('data (or (getenv "XDG_DATA_HOME") "~/.local/share/")) - ;; The following two are Guix/GuixSD extensions. - ('log (or (getenv "XDG_LOG_HOME") "~/.local/var/log/")) - ('state (or (getenv "XDG_STATE_HOME") "~/.local/var/lib/")) - (_ (error "Unknown XDG directory type: %S" type)))))) + ('cache (or (getenv "XDG_CACHE_HOME") "~/.cache/")) + ('config (or (getenv "XDG_CONFIG_HOME") "~/.config/")) + ('data (or (getenv "XDG_DATA_HOME") "~/.local/share/")) + ;; The following two are Guix/GuixSD extensions. + ('log (or (getenv "XDG_LOG_HOME") "~/.local/var/log/")) + ('state (or (getenv "XDG_STATE_HOME") "~/.local/var/lib/")) + (_ (error "Unknown XDG directory type: %S" type)))))) ;; Global/built-in Custom settings ;; Apply these as early as possible so that e.g. the native-comp files go to the right place. (mapc (apply-partially #'apply #'customize-set-variable) `((native-comp-async-report-warnings-errors silent "Don't pop up Warnings buffer for native compilation.") - (native-compile-target-directory ,(tw/xdg-emacs-subdir 'cache "eln") "Put native-compiled binaries in the cache.") - (inhibit-startup-screen t "Don't show the startup screen with help links.") - (indent-tabs-mode nil "Always use spaces to indent.") - (menu-bar-mode nil "Hide the menu bar globally.") - (tool-bar-mode nil "Hide the tool bar globally.") - (tooltip-mode nil "Show tooltips in the echo area instead.") - (global-hl-line-mode t "Highlight the current line in all buffers.") - (column-number-mode t "Show the column number in the statusline.") - (backup-directory-alist (("." . ,(tw/xdg-emacs-subdir 'data "backup"))) "Save all backup files in one place to avoid clutter.") - (scroll-up-aggressively 0.0 "Don't recenter the window if the point moves off the page.") - (scroll-down-aggressively 0.0 "Don't recenter the window if the point moves off the page.") - (package-archives nil "Don't fetch packages from the internet; only get them from Guix.") - (recentf-max-saved-items 10000 "Save lots of recently-opened files."))) + (native-compile-target-directory ,(tw/xdg-emacs-subdir 'cache "eln") "Put native-compiled binaries in the cache.") + (inhibit-startup-screen t "Don't show the startup screen with help links.") + (indent-tabs-mode nil "Always use spaces to indent.") + (menu-bar-mode nil "Hide the menu bar globally.") + (tool-bar-mode nil "Hide the tool bar globally.") + (tooltip-mode nil "Show tooltips in the echo area instead.") + (global-hl-line-mode t "Highlight the current line in all buffers.") + (column-number-mode t "Show the column number in the statusline.") + (backup-directory-alist (("." . ,(tw/xdg-emacs-subdir 'data "backup"))) "Save all backup files in one place to avoid clutter.") + (scroll-up-aggressively 0.0 "Don't recenter the window if the point moves off the page.") + (scroll-down-aggressively 0.0 "Don't recenter the window if the point moves off the page.") + (package-archives nil "Don't fetch packages from the internet; only get them from Guix.") + (recentf-max-saved-items 10000 "Save lots of recently-opened files."))) (defalias 'yes-or-no-p #'y-or-n-p "Always use `y-or-n-p' when asking for confirmation.") @@ -72,12 +72,12 @@ (defun tw/get-catppuccin-color (name) "Get the hex code of the Catppuccin color named NAME." (cl-loop for color in (autothemer--theme-colors autothemer-current-theme) - when (string= (autothemer--color-name color) name) - return (autothemer--color-value color))) + when (string= (autothemer--color-name color) name) + return (autothemer--color-value color))) (custom-set-faces `(cursor ((default :background ,(tw/get-catppuccin-color "rosewater"))) t - "Make the cursor \"rosewater\", as recommended by Catppuccin upstream, overriding catppuccin/emacs.")) + "Make the cursor \"rosewater\", as recommended by Catppuccin upstream, overriding catppuccin/emacs.")) (use-package smart-mode-line :commands (sml/setup) :demand t @@ -146,8 +146,8 @@ (use-package vc :after (which-key evil) :init (which-key-add-key-based-replacements - "<leader>g" '("vc" . "Version control") - "<leader>gM" '("merge" . "Version control merging")) + "<leader>g" '("vc" . "Version control") + "<leader>gM" '("merge" . "Version control merging")) :bind-keymap ("<leader>g" . vc-prefix-map)) (use-package company @@ -155,12 +155,12 @@ ;; Use TAB for selecting completions. Config from: ;; https://github.com/company-mode/company-mode/blob/master/company-tng.el :bind (:map company-active-map - ([tab] . company-select-next) - ([backtab] . company-select-previous)) + ([tab] . company-select-next) + ([backtab] . company-select-previous)) :custom (company-minimum-prefix-length 2 "Start showing completion candidates slightly earlier.") (company-idle-delay (lambda () (if (company-in-string-or-comment) nil 0.3)) - "Automatically show completions when editing non-comment parts of code.") + "Automatically show completions when editing non-comment parts of code.") :diminish company-mode) (use-package company-quickhelp @@ -299,9 +299,9 @@ (use-package environmentd-mode :load-path "include/" :mode (rx (or bos "/") - (or (: (? "etc/") "environment") - (: ".environment.d/" (1+ (not ?\/)) ".conf")) - eos)) + (or (: (? "etc/") "environment") + (: ".environment.d/" (1+ (not ?\/)) ".conf")) + eos)) (use-package org-latex-classes :after (ox-latex) @@ -377,7 +377,7 @@ "<leader>t" '("toggle" . "Toggles and quick settings") "<leader>w" '("window" . "Windows")) :functions (evil-define-key evil-set-leader - evil-define-key* evil-window-delete evil-delay) + evil-define-key* evil-window-delete evil-delay) :defines (evil-visual-state-map)) (use-package evil-collection @@ -437,7 +437,7 @@ (use-package evil-numbers :after (evil) :bind (("<leader>+" . evil-numbers/inc-at-pt) - ("<leader>-" . evil-numbers/dec-at-pt))) + ("<leader>-" . evil-numbers/dec-at-pt))) (use-package evil-goggles ; visual previews for edit operations :after (evil) @@ -472,10 +472,10 @@ ;; The CLOSE parameter is not used in this case, so it is nil. (sp-pair "`" nil :unless '(tw/sp-no-pair-single-quotes-p)) (sp-pair "'" nil :unless '(tw/sp-no-pair-single-quotes-p - sp-in-comment-p sp-in-string-p)) + sp-in-comment-p sp-in-string-p)) (sp-local-pair 'lisp-mode "`" "'" - :actions '(wrap insert autoskip) - :when '(sp-in-comment-p sp-in-string-p)) + :actions '(wrap insert autoskip) + :when '(sp-in-comment-p sp-in-string-p)) :functions (sp-pair sp-local-pair)) (use-package aggressive-indent @@ -485,8 +485,8 @@ (defun tw/lisp-evil-setup () "Set up evil in general `lisp-mode' buffers." (setq-local evil-symbol-word-search t - ;; https://github.com/wcsmith/evil-args#customization - evil-args-delimiters '(" "))) + ;; https://github.com/wcsmith/evil-args#customization + evil-args-delimiters '(" "))) (add-hook 'lisp-mode-hook #'tw/lisp-evil-setup) ;; `lisp-mode-hook' doesn't seem to apply to elisp buffers. |