summaryrefslogtreecommitdiff
path: root/.config/emacs
diff options
context:
space:
mode:
Diffstat (limited to '.config/emacs')
-rw-r--r--.config/emacs/init.el2
-rw-r--r--.config/emacs/modules/mm-abbrev.el2
-rw-r--r--.config/emacs/modules/mm-projects.el13
-rw-r--r--.config/emacs/modules/mm-theme.el4
4 files changed, 14 insertions, 7 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 7abe342..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")))
diff --git a/.config/emacs/modules/mm-abbrev.el b/.config/emacs/modules/mm-abbrev.el
index 3e9870e..66ca8d7 100644
--- a/.config/emacs/modules/mm-abbrev.el
+++ b/.config/emacs/modules/mm-abbrev.el
@@ -78,7 +78,7 @@ case-sensitive to avoid unexpected abbreviation expansions."
"sme" "save-mark-and-excursion"
"sr" "save-restriction")
-(when mm-darwin-p
+(when mm-humanwave-p
(with-eval-after-load 'python-ts-mode
(mm-define-abbreviations python-ts-mode-abbrev-table
"empb" "with emphasize.Block():"
diff --git a/.config/emacs/modules/mm-projects.el b/.config/emacs/modules/mm-projects.el
index 71006d5..017a88c 100644
--- a/.config/emacs/modules/mm-projects.el
+++ b/.config/emacs/modules/mm-projects.el
@@ -19,7 +19,7 @@ This is intended to be called interactively via
(project-find-file "Find File" ?f)
(mm-projects-project-magit-status "Git Status" ?s)))
:config
- (unless mm-darwin-p
+ (unless mm-humanwave-p
(if-let ((repo-directory (getenv "REPODIR")))
(let* ((list-dir
(lambda (path)
@@ -70,11 +70,18 @@ This is intended to be called interactively via
"push" "-v" args remote
(format "refs/heads/%s:refs/heads/%s" branch branch)))))
(transient-append-suffix #'magit-push '(1 -1)
- '("a" "all remotes" mm-projects-magit-push-current-to-all-remotes)))
+ '("a" "all remotes" mm-projects-magit-push-current-to-all-remotes))
+ (add-to-list 'magit-blame-styles
+ '(margin
+ (show-lines . t)
+ (margin-format . (" %C %a" " %s%f" " "))
+ (margin-width . 73)
+ (margin-face . magit-blame-margin)
+ (margin-body-face . (magit-blame-dimmed)))))
(use-package magit-repos
:ensure nil ; Part of ‘magit’
- :if (not mm-darwin-p)
+ :if (not mm-humanwave-p)
:commands (magit-list-repositories)
:init
(if-let ((directory (getenv "REPODIR")))
diff --git a/.config/emacs/modules/mm-theme.el b/.config/emacs/modules/mm-theme.el
index 90b89ba..0c4333f 100644
--- a/.config/emacs/modules/mm-theme.el
+++ b/.config/emacs/modules/mm-theme.el
@@ -8,7 +8,7 @@
;;; Fonts
-(defvar mm-theme-monospace-font `(,(if mm-darwin-p
+(defvar mm-theme-monospace-font `(,(if mm-humanwave-p
"Iosevka Custom"
"Iosevka Smooth")
:weight regular
@@ -224,7 +224,7 @@ See also the `mm-theme-background-opacity' variable."
;;; Indent Guides
-(when mm-darwin-p
+(when mm-humanwave-p
(use-package highlight-indent-guides
:ensure t
:hook ((jinja2-mode vue-ts-mode mhtml-mode) . highlight-indent-guides-mode)