From 96611976e652d23d88916be38c112d081d1f88aa Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sun, 8 Sep 2019 09:18:13 -0400 Subject: [PATCH] emacs,shell: back to tango(mod) and doom-one --- .Xresources.d/rxvt-unicode | 184 ++++++++++++++++++------------------- .emacs.d/init.el | 37 ++++---- 2 files changed, 110 insertions(+), 111 deletions(-) diff --git a/.Xresources.d/rxvt-unicode b/.Xresources.d/rxvt-unicode index 5ba0598..3953c58 100644 --- a/.Xresources.d/rxvt-unicode +++ b/.Xresources.d/rxvt-unicode @@ -92,98 +92,98 @@ URxvt.keysym.C-equal: font-size:reset !*color15: #EEEEEC -! Solarized -! Base16 Solarized Light -! Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized) - -#define base00 #fdf6e3 -#define base01 #eee8d5 -#define base02 #93a1a1 -#define base03 #839496 -#define base04 #657b83 -#define base05 #586e75 -#define base06 #073642 -#define base07 #002b36 -#define base08 #dc322f -#define base09 #cb4b16 -#define base0A #b58900 -#define base0B #859900 -#define base0C #2aa198 -#define base0D #268bd2 -#define base0E #6c71c4 -#define base0F #d33682 - -*foreground: base05 -#ifdef background_opacity -*background: [background_opacity]base00 -#else -*background: base00 -#endif -*cursorColor: base05 - -*color0: base00 -*color1: base08 -*color2: base0B -*color3: base0A -*color4: base0D -*color5: base0E -*color6: base0C -*color7: base05 - -*color8: base03 -*color9: base08 -*color10: base0B -*color11: base0A -*color12: base0D -*color13: base0E -*color14: base0C -*color15: base07 - -! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), -! use 'shell' template to set these if necessary -*color16: base09 -*color17: base0F -*color18: base01 -*color19: base02 -*color20: base04 -*color21: base06 +! ! Solarized +! ! Base16 Solarized Light +! ! Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized) + +! #define base00 #fdf6e3 +! #define base01 #eee8d5 +! #define base02 #93a1a1 +! #define base03 #839496 +! #define base04 #657b83 +! #define base05 #586e75 +! #define base06 #073642 +! #define base07 #002b36 +! #define base08 #dc322f +! #define base09 #cb4b16 +! #define base0A #b58900 +! #define base0B #859900 +! #define base0C #2aa198 +! #define base0D #268bd2 +! #define base0E #6c71c4 +! #define base0F #d33682 + +! *foreground: base05 +! #ifdef background_opacity +! *background: [background_opacity]base00 +! #else +! *background: base00 +! #endif +! *cursorColor: base05 + +! *color0: base00 +! *color1: base08 +! *color2: base0B +! *color3: base0A +! *color4: base0D +! *color5: base0E +! *color6: base0C +! *color7: base05 + +! *color8: base03 +! *color9: base08 +! *color10: base0B +! *color11: base0A +! *color12: base0D +! *color13: base0E +! *color14: base0C +! *color15: base07 + +! ! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), +! ! use 'shell' template to set these if necessary +! *color16: base09 +! *color17: base0F +! *color18: base01 +! *color19: base02 +! *color20: base04 +! *color21: base06 ! Tango colour theme for rxvt-unicode -! URxvt.background: #FFFFFF -! URxvt.foreground: #000000 - -! ! Black -! URxvt.color0: #2E3436 -! URxvt.color8: #757773 - -! ! Red -! URxvt.color1: #CC0000 -! URxvt.color9: #EF2929 - -! ! Green -! URxvt.color2: #4E9A06 -! URxvt.color10: #8AE234 - -! ! Yellow -! URxvt.color3: #C4A000 -! URxvt.color11: #FCE94F - -! ! Blue -! URxvt.color4: #3465A4 -! URxvt.color12: #729FCF - -! ! Magenta -! URxvt.color5: #75507B -! URxvt.color13: #AD7FA8 - -! !! Cyan -! !URxvt.color6: #06989A -! !URxvt.color14: #34E2E2 -! ! orange (replaces cyan) -! ,*color6: #ce5c00 -! ,*color14: #fcaf3e - -! ! White -! URxvt.color7: #D3D7CF -! URxvt.color15: #EEEEEC +URxvt.background: #FFFFFF +URxvt.foreground: #000000 + +! Black +URxvt.color0: #2E3436 +URxvt.color8: #757773 + +! Red +URxvt.color1: #CC0000 +URxvt.color9: #EF2929 + +! Green +URxvt.color2: #4E9A06 +URxvt.color10: #8AE234 + +! Yellow +URxvt.color3: #C4A000 +URxvt.color11: #FCE94F + +! Blue +URxvt.color4: #3465A4 +URxvt.color12: #729FCF + +! Magenta +URxvt.color5: #75507B +URxvt.color13: #AD7FA8 + +!! Cyan +!URxvt.color6: #06989A +!URxvt.color14: #34E2E2 +! orange (replaces cyan) +,*color6: #ce5c00 +,*color14: #fcaf3e + +! White +URxvt.color7: #D3D7CF +URxvt.color15: #EEEEEC diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 7805b28..9f5d07f 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1507,54 +1507,53 @@ This function is intended for use with `ivy-ignore-buffers'." :custom (doom-modeline-buffer-file-name-style 'relative-to-project)) -(use-package doom-themes - :disabled) +(use-package doom-themes) (use-package solarized-theme + :disabled + :config + (load-theme 'solarized-light t)) + +(use-package moody :demand :config - (load-theme 'solarized-light t) + (setq x-underline-at-descent-line t) (let ((line (face-attribute 'mode-line :underline))) (set-face-attribute 'mode-line nil :overline line) (set-face-attribute 'mode-line-inactive nil :overline line) (set-face-attribute 'mode-line-inactive nil :underline line) (set-face-attribute 'mode-line nil :box nil) (set-face-attribute 'mode-line-inactive nil :box nil) - (set-face-attribute 'mode-line-inactive nil :background "#f9f2d9"))) - -(use-package moody - :demand - :config - (setq x-underline-at-descent-line t) + (set-face-attribute 'mode-line-inactive nil :background "#eeeeee")) ; d3d7cf (moody-replace-mode-line-buffer-identification) (moody-replace-vc-mode)) (defvar b/org-mode-font-lock-keywords - "For use with the `doom-tomorrow-night' theme." '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)" (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind - (4 '(:foreground "#c5c8c6") t)))) ; title + (4 '(:foreground "#c5c8c6") t))) ; title + "For use with the `doom-tomorrow-night' theme.") (defun b/lights-on () "Enable my favourite light theme." (interactive) (mapc #'disable-theme custom-enabled-themes) - (load-theme 'solarized-light t) + (load-theme 'tangomod t) ;; (sml/apply-theme 'automatic) - ;; (font-lock-remove-keywords - ;; 'org-mode b/org-mode-font-lock-keywords) - (run-with-timer 0.01 nil 'exwm-systemtray--refresh)) + (font-lock-remove-keywords + 'org-mode b/org-mode-font-lock-keywords) + (exwm-systemtray--refresh)) (defun b/lights-off () "Go dark." (interactive) (mapc #'disable-theme custom-enabled-themes) - (load-theme 'solarized-dark t) + (load-theme 'doom-one t) ;; (sml/apply-theme 'automatic) - ;; (font-lock-add-keywords - ;; 'org-mode b/org-mode-font-lock-keywords t) - (run-with-timer 0.01 nil 'exwm-systemtray--refresh)) + (font-lock-add-keywords + 'org-mode b/org-mode-font-lock-keywords t) + (exwm-systemtray--refresh)) (bind-keys ("C-c t d" . b/lights-off) -- 2.20.1