diff options
| -rw-r--r-- | user/emacs/init.el | 25 | ||||
| -rw-r--r-- | user/settings/darwin.nix | 17 |
2 files changed, 21 insertions, 21 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el index d9faedb1..38bfc431 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -82,13 +82,7 @@ (use-package stimmung-themes :disabled t :config (progn - (require 'stimmung-themes-light-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) + (let ((original-stimmung-themes-string stimmung-themes-string)) (defun toggle-stimmung-string-highlighting () (interactive) (let ((current-theme (car custom-enabled-themes))) @@ -97,6 +91,23 @@ original-stimmung-themes-string)) (load-theme current-theme :noconfirm))))))) +(let ((light-mode-theme 'doom-one-light) + (dark-mode-theme 'doom-one)) + (load-theme light-mode-theme :noconfirm :noenable) + (load-theme dark-mode-theme :noconfirm :noenable) + (enable-theme light-mode-theme) + (defun my/switch-theme-variant (mode) + (interactive (list + (intern (completing-read "Make it: " '("light" "dark") nil t)))) + (cond + ((eq mode 'dark) + (disable-theme light-mode-theme) + (enable-theme dark-mode-theme)) + ((eq mode 'light) + (disable-theme dark-mode-theme) + (enable-theme light-mode-theme))) + (modify-all-frames-parameters '((ns-appearance mode))))) + (global-set-key (kbd "<pinch>") 'ignore) (global-set-key (kbd "<C-wheel-up>") 'ignore) (global-set-key (kbd "<C-wheel-down>") 'ignore) diff --git a/user/settings/darwin.nix b/user/settings/darwin.nix index 8af37d71..6c03852a 100644 --- a/user/settings/darwin.nix +++ b/user/settings/darwin.nix @@ -73,20 +73,9 @@ MODE="light" fi emacsclient="${config.programs.emacs.finalPackage}/bin/emacsclient" - emacsSwitchTheme () { - if pgrep -q Emacs; then - if [[ $MODE == "dark" ]]; then - $emacsclient \ - --eval "(toggle-theme)" \ - --eval "(modify-all-frames-parameters '((ns-appearance '$MODE)))" - elif [[ $MODE == "light" ]]; then - $emacsclient \ - --eval "(toggle-theme)" \ - --eval "(modify-all-frames-parameters '((ns-appearance '$MODE)))" - fi - fi - } - emacsSwitchTheme + if pgrep -q Emacs; then + $emacsclient --eval "(my/switch-theme-variant '$MODE)" + fi '' ) ) |