summaryrefslogtreecommitdiff
path: root/.emacs.d/init.el
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/init.el')
-rw-r--r--.emacs.d/init.el27
1 files changed, 7 insertions, 20 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index fae2b927..1e0055a5 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -88,29 +88,15 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- '(default ((t (:weight medium :height 105 :foundry "SRC" :family "Hack"))))
- '(comint-highlight-prompt ((t (:inherit minibuffer-prompt :weight bold))))
+ '(default ((t (:weight medium :height 128 :foundry "SRC" :family "Hack"))))
'(fill-column-indicator ((t (:background "light gray"))))
'(fixed-pitch ((t (:foundry "SRC" :family "Hack"))))
'(org-code ((t (:inherit (shadow fixed-pitch)))))
- '(org-date ((t (:inherit fixed-pitch :foreground "Purple" :underline t))))
+ '(org-date ((t (:inherit fixed-pitch))))
'(org-verbatim ((t (:inherit (shadow fixed-pitch)))))
- '(region ((t (:extend t :background "#EECD82"))) nil "Colour is from the Lucid build.")
- '(variable-pitch ((t (:weight regular :height 120 :foundry "bitstream" :family "Bitstream Charter"))))
- '(variable-pitch-text ((t (:inherit variable-pitch))) nil "Handled by `spw/maybe-scale-basic-faces' instead."))
-
-;; Set background colour but don't touch text terminals.
-(dolist (ws '(x pgtk w32 ns))
- (add-to-list
- 'window-system-default-frame-alist
- ;; If we were not started with --daemon or by 'emacsclient -a ""', then
- ;; we're probably a shortlived instance of Emacs just to test something.
- ;; Set a different background colour to more easily distinguish frames
- ;; belonging to shortlived instances from those belonging to main instance.
- `(,ws
- . ((background-color
- . ,(pcase (daemonp)
- ('nil "honeydew") ("gdbmacs" "linen") (_ "#FFFFF6")))))))
+ '(variable-pitch ((t (:weight regular :height 170 :foundry "bitstream" :family "Bitstream Charter")))))
+
+(load-theme 'modus-vivendi)
(defun spw/maybe-scale-basic-faces (frame)
"Entry for `window-size-change-functions' to increase font sizes
@@ -147,7 +133,7 @@ windows side-by-side in the frame."
frame)
(set-face-attribute 'variable-pitch frame
:height (if scale-up-p 151 120))))))))
-(add-to-list 'window-size-change-functions #'spw/maybe-scale-basic-faces)
+;; (add-to-list 'window-size-change-functions #'spw/maybe-scale-basic-faces)
;;; `frame--current-backround-mode' assumes that TERM=screen-256color means a
;;; dark background. But if we're in tmux then I can always have a light
@@ -330,6 +316,7 @@ windows side-by-side in the frame."
'(mml-secure-openpgp-encrypt-to-self t nil nil "So I can read copies in my sent mail directory.")
'(mml-secure-openpgp-sign-with-sender t)
'(mode-line-compact 'long)
+ '(modus-themes-region '(accented))
'(mouse-drag-copy-region t nil nil "X primary selection-like behaviour within Emacs even when not available outside.")
'(mouse-highlight 1 nil nil "See `make-pointer-invisible'.")
'(mouse-yank-at-point t)