diff options
| -rw-r--r-- | bard-emacs-modules/bard-emacs-package.el | 18 | ||||
| -rw-r--r-- | bard-emacs-modules/bard-emacs-ui.el | 34 |
2 files changed, 42 insertions, 10 deletions
diff --git a/bard-emacs-modules/bard-emacs-package.el b/bard-emacs-modules/bard-emacs-package.el index b5b7887..3a32a30 100644 --- a/bard-emacs-modules/bard-emacs-package.el +++ b/bard-emacs-modules/bard-emacs-package.el @@ -58,8 +58,8 @@ The exact color values are taken from the active Ef theme." (add-hook 'ef-themes-post-load-hook #'bard/ef-themes-hl-todo-faces) (define-key global-map (kbd "M-<f5>") #'ef-themes-toggle) - (setq ef-themes-to-toggle '(ef-melissa-dark ef-melissa-light)) - (load-theme 'ef-melissa-dark t)) + (setq ef-themes-to-toggle '(ef-winter ef-frost)) + (load-theme 'ef-winter t)) (use-package modus-themes :ensure t @@ -96,9 +96,12 @@ The exact color values are taken from the active Ef theme." ("DEPRECATED" . ,yellow))))) (add-hook 'modus-themes-post-load-hook #'bard/modus-themes-hl-todo-faces) - ;; (load-theme 'modus-vivendi t) (setq modus-themes-to-toggle '(modus-vivendi modus-operandi-tinted)) - (define-key global-map (kbd "<f5>") #'modus-themes-toggle)) + (define-key global-map (kbd "<f5>") #'modus-themes-toggle) + (load-theme 'modus-vivendi t)) + +(use-package fontaine + :ensure t) (use-package rainbow-mode :ensure t) @@ -152,7 +155,7 @@ The exact color values are taken from the active Ef theme." (global-set-key (kbd "C-x b") #'consult-buffer) (global-set-key (kbd "C-c s") #'consult-line) (global-set-key (kbd "C-c C-s") nil) - (global-set-key (kbd "C-c C-s") #'consult-ripgrep)) + (global-set-key (kbd "C-z s") #'consult-ripgrep)) (use-package orderless :ensure t) @@ -311,10 +314,13 @@ The exact color values are taken from the active Ef theme." :config (eshell-git-prompt-use-theme 'robbyrussell)) -(use-package shell-pop +(use-package tramp :ensure t) (use-package circe + :ensure t) + +(use-package shell-pop :ensure t :bind (("C-t" . shell-pop)) :config diff --git a/bard-emacs-modules/bard-emacs-ui.el b/bard-emacs-modules/bard-emacs-ui.el index 0964e5f..c49aed2 100644 --- a/bard-emacs-modules/bard-emacs-ui.el +++ b/bard-emacs-modules/bard-emacs-ui.el @@ -52,11 +52,37 @@ (display-time-mode 1) ;; Fonts -(set-face-attribute 'default nil :font "Iosevka Comfy" :height 140) -(set-face-attribute 'fixed-pitch nil :font "Iosevka Comfy" :height 140) -(set-face-attribute 'variable-pitch nil :font "Iosevka Comfy Motion" :height 140) -(add-to-list 'default-frame-alist '(font . "Iosevka Comfy-14.5")) +;; Removed in favour of fontaine package +;; (set-face-attribute 'default nil :font "Iosevka Comfy" :height 140) +;; (set-face-attribute 'fixed-pitch nil :font "Iosevka Comfy" :height 140) +;; (set-face-attribute 'variable-pitch nil :font "Iosevka Comfy Motion" :height 140) + +;; (add-to-list 'default-frame-alist '(font . "Iosevka Comfy-14.5")) +(setq fontaine-presets + '((regular + :default-height 140 + :default-family "Iosevka Comfy" + :variable-pitch-family "Iosevka Comfy Motion" + :variable-pitch-height 1.0 + :fixed-pitch-family "Iosevka Comfy" + :fixed-pitch-height 1.0 + :bold-weight bold + ) + (code-demo + :inherit regular + :default-height 170 + ) + (prose + :inherit regular ; copy the `code-demo' properties + :default-height 220) + (t + :default-family "Monospace" + ))) + +;; Mixed pitch on modus and ef themes +(setq modus-themes-mixed-fonts t) +(setq ef-themes-mixed-fonts t) ;; Switching themes ;; (defun bard/disable-all-themes () |