diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/emacs/init.el | 39 | ||||
| -rw-r--r-- | user/settings/emacs.nix | 3 |
2 files changed, 13 insertions, 29 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el index d7932e3c..487d93ad 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -67,36 +67,21 @@ (when (or (daemonp) window-system) - (use-package modus-themes + (use-package stimmung-themes :config (progn - (let ((light-mode-theme 'modus-operandi) - (dark-mode-theme 'modus-vivendi-tinted)) - (setq modus-themes-common-palette-overrides - `((builtin magenta) - (comment yellow-faint) - (constant magenta-cooler) - (docstring green-faint) - (docmarkup magenta-faint) - (fnname magenta-warmer) - (keyword cyan) - (preprocessor cyan-cooler) - (string green-cooler) - (type magenta-cooler) - (variable blue-warmer) - (rx-construct magenta-warmer) - (rx-backslash blue-cooler) - (border-mode-line-active unspecified) - (border-mode-line-inactive unspecified) - (bg-mode-line-active bg-blue-subtle) - (fg-mode-line-active fg-main) - (fg-line-number-inactive "gray50") - (fg-line-number-active fg-main) - (bg-line-number-active bg-dim) - ,@modus-themes-preset-overrides-faint) - modus-themes-to-toggle `(,light-mode-theme ,dark-mode-theme)) + (let ((light-mode-theme 'stimmung-themes-light) + (dark-mode-theme 'stimmung-themes-dark) + (original-stimmung-themes-string stimmung-themes-string)) (load-theme light-mode-theme :noconfirm :noenable) (load-theme dark-mode-theme :noconfirm :noenable) - (enable-theme light-mode-theme)))) + (enable-theme light-mode-theme) + (defun toggle-stimmung-string-highlighting () + (interactive) + (let ((current-theme (car custom-enabled-themes))) + (setq stimmung-themes-string (if (eq stimmung-themes-string original-stimmung-themes-string) + 'none + original-stimmung-themes-string)) + (load-theme current-theme :noconfirm)))))) (if (eq window-system 'x) (setq-default line-spacing 0.2))) diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index 89dedfa1..2917305e 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -80,7 +80,6 @@ in extraPackages = epkgs: (with epkgs; [ ace-link - almost-mono-themes apheleia avy capf-autosuggest @@ -138,7 +137,6 @@ in magit markdown-mode marginalia - modus-themes nerd-icons doom-modeline posframe @@ -146,6 +144,7 @@ in quickrun rainbow-mode rainbow-delimiters + stimmung-themes toml-mode tree-sitter tree-sitter-langs |