erebus theming, font size etc.

Use light-on-dark because there are real problems rendering dark text on a
light background.

4 files changed, 9 insertions, 69 deletions

diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini
index eb214222..d9550a63 100644
--- a/.config/foot/foot.ini
+++ b/.config/foot/foot.ini
@@ -1,30 +1,6 @@
-# size=6.5 is required for two 80-col Emacs windows on smaller screens.
-# size=7 for now because not using Sway on any machines with smaller screens.
-font = Hack:size=7
+font = Hack:size=15
 term = xterm-256color
 
-[colors]
-foreground = 000000
-background = FFFFF6
-
-# from themes/tango in foot.git
-regular0 = 2e3436
-regular1 = cc0000
-regular2 = 4e9a06
-regular3 = c4a000
-regular4 = 3465a4
-regular5 = 75507b
-regular6 = 06989a
-regular7 = d3d7cf
-bright0 = 555753
-bright1 = ef2929
-bright2 = 8ae234
-bright3 = fce94f
-bright4 = 729fcf
-bright5 = ad7fa8
-bright6 = 34e2e2
-bright7 = eeeeec
-
 [key-bindings]
 
 show-urls-launch = Mod4+l
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index 7e447047..d18fa50e 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -1,3 +1,3 @@
 [Settings]
 gtk-key-theme-name=Emacs
-gtk-application-prefer-dark-theme=0
+gtk-application-prefer-dark-theme=1
diff --git a/.config/sway/config b/.config/sway/config
index 981e01d5..550dbf00 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -2,15 +2,6 @@ include /etc/sway/config.d/*
 
 font pango:Hack 10
 
-# class                 border  bground text    indicator child_border
-client.focused          #000000 #B4EEB4 #000000 #B4EEB4   #000000
-client.focused_inactive #000000 #FFFFF6 #000000 #AA9E9F   #AA9E9F
-client.unfocused        #000000 #E5E5E5 #000000 #AA9E9F   #AA9E9F
-client.urgent           #000000 #702020 #FFFFF6 #AA9E9F   #AA9E9F
-client.placeholder      #000000 #000000 #FFFFF6 #AA9E9F   #AA9E9F
-
-client.background       #FFFFF6
-
 # Use Mouse+Mod4 to drag floating windows to their wanted position
 floating_modifier Mod4
 
@@ -307,18 +298,6 @@ bar {
         bindsym button4 nop
 	bindsym button5 nop
 
-        colors {
-            background #FFFFF6
-            statusline #000000
-            separator  #000000
-
-            focused_workspace  #000000 #B4EEB4 #000000
-            active_workspace   #000000 #FFFFF6 #000000
-            inactive_workspace #000000 #E5E5E5 #000000
-            urgent_workspace   #000000 #702020 #FFFFF6
-            binding_mode       #000000 #EECD82 #000000
-        }
-
 	# We don't set workspace_buttons to "no" even though we start off with
 	# a single workspace (see i3status-wrapper) because under Sway that
 	# can trigger a bug which means the button display doesn't get
@@ -379,8 +358,6 @@ exec emacsclient -sgdbmacs --spw/no-start --spw/update-environment
 
 exec_always fcitx5 -d --replace
 
-output * bg ~/src/dotfiles/lib-src/img/green_gobbler.png tile
-
 # Ideally we wouldn't try to call swaylock if the screen is already locked,
 # but discovering whether swaylock is already running in a way that avoids
 # races is difficult or impossible because swaylock doesn't have a mechanism
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)