X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=emacs_el%2Fconfiguration%2Fdon-configuration.org;h=25012bd3d7e4634966d00c9fa7f89b6767683ffb;hb=c71b1e01c75f8763d40da0fe388b1e4e8b93af11;hp=65b6e709b93d978c075d7514d2db59fc2d0e8d81;hpb=cac0af6c50cd42ea3dbd384f68e3a4bfaa241e66;p=lib.git

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index 65b6e70..25012bd 100644
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -30,6 +30,9 @@ load  [[https://github.com/jwiegley/use-package/][use-package]] even faster
 #+BEGIN_SRC emacs-lisp
   (setq package-enable-at-startup nil)
   (setq package--init-file-ensured t)
+  (setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/")
+                           ("melpa" . "https://melpa.org/packages/")
+                           ("org" . "http://orgmode.org/elpa/") ))
   (eval-and-compile
     (setq use-package-verbose (not (bound-and-true-p byte-compile-current-file))))
   (mapc #'(lambda (add) (add-to-list 'load-path add))
@@ -49,9 +52,6 @@ load  [[https://github.com/jwiegley/use-package/][use-package]] even faster
                        nil))
                      load-path))))))
 
-  (setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/")
-               ("melpa" . "https://melpa.org/packages/")
-               ("org" . "http://orgmode.org/elpa/") ))
   (require 'use-package)
   (require 'diminish)
   (require 'bind-key)
@@ -774,14 +774,16 @@ This can be used to link things pretty quickly if necessary
 
 ** Tramp
 #+BEGIN_SRC emacs-lisp
-  (add-to-list 'tramp-methods '("vcsh"
-                                (tramp-login-program "vcsh")
-                                (tramp-login-args
-                                 (("enter")
-                                  ("%h")))
-                                (tramp-remote-shell "/bin/sh")
-                                (tramp-remote-shell-args
-                                 ("-c"))))
+  (use-package tramp
+    :config
+    (add-to-list 'tramp-methods '("vcsh"
+                                  (tramp-login-program "vcsh")
+                                  (tramp-login-args
+                                   (("enter")
+                                    ("%h")))
+                                  (tramp-remote-shell "/bin/sh")
+                                  (tramp-remote-shell-args
+                                   ("-c")))))
 #+END_SRC
 ** Reftex
 #+BEGIN_SRC emacs-lisp
@@ -1059,7 +1061,7 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 ** Abbrev Mode
 #+BEGIN_SRC emacs-lisp
   (use-package abbrev
-    :diminish abbrev
+    :diminish abbrev-mode
     :config
     ;; load abbreviations from 
     (setq abbrev-file-name       
@@ -1132,10 +1134,13 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 * Base emacs
 ** Reverting buffers
 #+BEGIN_SRC emacs-lisp
-  (setq global-auto-revert-non-file-buffers t
-        global-auto-revert-ignore-modes '(pdf-view-mode)
-        auto-revert-verbose nil)
-  (global-auto-revert-mode 1)
+  (use-package autorevert
+    :diminish auto-revert-mode
+    :config
+    (setq global-auto-revert-non-file-buffers t
+          global-auto-revert-ignore-modes '(pdf-view-mode)
+          auto-revert-verbose nil)
+    (global-auto-revert-mode 1))
 #+END_SRC
 * Org Mode
 ** Use-package and load things
@@ -2211,8 +2216,8 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 If the envvar EMACS_SERVER_NAME is set, consider this a separate
 emacs, and use a different desktop file to restore history
 #+BEGIN_SRC emacs-lisp
-  (use-package desktop-save
-    :defer f
+  (use-package emacs
+    :demand
     :config
     (setq desktop-base-file-name
           (convert-standard-filename
@@ -2225,9 +2230,11 @@ emacs, and use a different desktop file to restore history
           (convert-standard-filename
            (concat desktop-base-file-name
                    ".lock")))
-    (desktop-save-mode 1)
     (setq desktop-auto-save-timeout 60)
-    (desktop-read)
+    (setq desktop-restore-eager 5)
+    (setq desktop-lazy-verbose nil)
+    (desktop-save-mode 1)
+    ; (desktop-read)
   )
 #+END_SRC
 ** Misc (Uncharacterized)
@@ -2386,7 +2393,7 @@ emacs, and use a different desktop file to restore history
     :config
     (setq server-name
           (or (getenv "EMACS_SERVER_NAME")
-              "emacs"))
+              "server"))
     (unless (server-running-p)
       (global-set-key "\C-xp" 'server-edit)
       (server-start)))