fix smtpmail and rearrange theme

This commit is contained in:
petrucci4prez 2018-07-15 20:51:57 -04:00
parent 0117a07b57
commit bbd68edc72
2 changed files with 35 additions and 35 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
!conf.org !conf.org
!README.org !README.org
conf.el conf.el
!init.el

View File

@ -50,40 +50,38 @@ work in progress
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(defalias 'yes-or-no-p 'y-or-n-p) ; eliminate yes or no prompt on killing procs (defalias 'yes-or-no-p 'y-or-n-p) ; eliminate yes or no prompt on killing procs
#+END_SRC #+END_SRC
** theme customizations ** theme
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
;; for spacemacs theme (use-package spacemacs-theme
(setq spacemacs-theme-custom-colors '((lnum . "#64707c"))) :defer t
#+END_SRC :custom
** theme color selection (spacemacs-theme-custom-colors '((lnum . "#64707c"))))
need this to:
a) apply the gui theme if gui is loaded as client and
b) ensure that the reloaded theme is only applied to the current frame
NOTE: this only works if we start term after gui, and term has light bg. not big deal for now since I hardly ever use term as client (defvar nd/theme 'spacemacs-dark)
#+BEGIN_SRC emacs-lisp (defvar nd/theme-window-loaded nil)
(defvar my:theme 'spacemacs-dark) (defvar nd/theme-terminal-loaded nil)
(defvar my:theme-window-loaded nil)
(defvar my:theme-terminal-loaded nil) ;; required for emacsclient/daemon setup
(if (daemonp) (if (daemonp)
(add-hook 'after-make-frame-functions(lambda (frame) (add-hook 'after-make-frame-functions
(select-frame frame) (lambda (frame)
(if (window-system frame) (select-frame frame)
(unless my:theme-window-loaded (if (window-system frame)
(if my:theme-terminal-loaded (unless nd/theme-window-loaded
(enable-theme my:theme) (if nd/theme-terminal-loaded
(load-theme my:theme t)) (enable-theme nd/theme)
(setq my:theme-window-loaded t)) (load-theme nd/theme t))
(unless my:theme-terminal-loaded (setq nd/theme-window-loaded t))
(if my:theme-window-loaded (unless nd/theme-terminal-loaded
(enable-theme my:theme) (if nd/theme-window-loaded
(load-theme my:theme t)) (enable-theme nd/theme)
(setq my:theme-terminal-loaded t))))) (load-theme nd/theme t))
(progn (setq nd/theme-terminal-loaded t)))))
(load-theme my:theme t) (progn
(if (display-graphic-p) (load-theme nd/theme t)
(setq my:theme-window-loaded t) (if (display-graphic-p)
(setq my:theme-terminal-loaded t)))) (setq nd/theme-window-loaded t)
(setq nd/theme-terminal-loaded t))))
#+END_SRC #+END_SRC
* printing * printing
** **
@ -1500,7 +1498,9 @@ only for gmail now
** smtp ** smtp
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(require 'smtpmail) (require 'smtpmail)
(setq message-send-mail-function 'smtpmail-send-it (setq send-mail-function 'smtpmail-send-it
message-send-mail-function 'smtpmail-send-it
user-mail-address "natedwarshuis@gmail.com" user-mail-address "natedwarshuis@gmail.com"
user-full-name "Nate Dwarshuis" user-full-name "Nate Dwarshuis"
@ -1508,8 +1508,7 @@ only for gmail now
starttls-use-gnutls t starttls-use-gnutls t
smtpmail-starttls-credentials '(("smtp.gmail.com" 587 nil nil)) smtpmail-starttls-credentials '(("smtp.gmail.com" 587 nil nil))
smtpmail-auth-credentials '(("smtp.gmail.com" 587 ;; authinfo.gpg for credentials
"natedwarshuis@gmail.com" nil))
smtpmail-default-smtp-server "smtp.gmail.com" smtpmail-default-smtp-server "smtp.gmail.com"
smtpmail-smtp-service 587 smtpmail-smtp-service 587
smtpmail-smtp-server "smtp.gmail.com") smtpmail-smtp-server "smtp.gmail.com")