summaryrefslogtreecommitdiff
path: root/.config/emacs/modules/mm-theme.el
diff options
context:
space:
mode:
Diffstat (limited to '.config/emacs/modules/mm-theme.el')
-rw-r--r--.config/emacs/modules/mm-theme.el37
1 files changed, 32 insertions, 5 deletions
diff --git a/.config/emacs/modules/mm-theme.el b/.config/emacs/modules/mm-theme.el
index 3e14fe2..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
@@ -16,7 +16,9 @@
"The default monospace font.
This is a plist containing a font name, -weight, and -height.")
-(defvar mm-theme-proportional-font '("SF Pro" :weight regular :height 162)
+(defvar mm-theme-proportional-font
+ `(,(if mm-darwin-p "Microsoft Sans Serif" "OpenSans")
+ :weight regular :height 162)
"The default proportional font.
This is a plist containing a font name, -weight, and -height.")
@@ -38,7 +40,7 @@ _FRAME is ignored."
(prop-height (plist-get prop-props :height)))
;; Some characters in this font are larger than usual
(when (string= mono-family "Iosevka Smooth")
- (dolist (rune '(?… ?— ?← ?→ ?⇐ ?⇒ ?⇔))
+ (dolist (rune '(?․ ?‥ ?… ?— ?← ?→ ?⇐ ?⇒ ?⇔))
(set-char-table-range char-width-table rune 2)))
(set-face-attribute 'default nil
:font mono-family
@@ -74,7 +76,7 @@ _FRAME is ignored."
((mhtml-mode html-mode html-ts-mode vue-ts-mode)
. ("<!--" "-->" "/>"))
(prog-mode
- . ("<=" ">=" "==" "!=" "*=" "__")))
+ . ("<<=" "<=" ">=" "==" "!=" "*=" "__")))
"Ligatures to enable in specific modes.
Elements of this alist are of the form:
@@ -203,7 +205,32 @@ See also the `mm-theme-background-opacity' variable."
;;; More Intuiative UI for Certain Modes
+(defun mm-disable-line-selection-mode ()
+ (line-selection-mode -1))
+
(use-package line-selection-mode
- :hook ((bookmark-bmenu-mode dired-mode ibuffer-mode) . line-selection-mode))
+ :hook ((bookmark-bmenu-mode dired-mode ibuffer-mode magit-repolist-mode)
+ . line-selection-mode)
+ :config
+ (add-hook 'wdired-mode-hook #'mm-disable-line-selection-mode))
+
+
+;;; Line Highlighting
+
+(use-package hl-line
+ :custom
+ (hl-line-sticky-flag nil))
+
+
+;;; Indent Guides
+
+(when mm-humanwave-p
+ (use-package highlight-indent-guides
+ :ensure t
+ :hook ((jinja2-mode vue-ts-mode mhtml-mode) . highlight-indent-guides-mode)
+ :custom
+ (highlight-indent-guides-method 'fill)
+ (highlight-indent-guides-auto-even-face-perc 30)
+ (highlight-indent-guides-auto-odd-face-perc 0)))
(provide 'mm-theme) \ No newline at end of file