we no longer have to require org-mode configuratino

[lib.git] / emacs_el / configuration / don-configuration.org

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index 46938a949cbcfec471d8c67b67a0f079e2a58902..aea3448e2b249a3d15ee729b3e70cb893100115c 100644 (file)
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -26,16 +26,20 @@
 #+END_SRC
 ** [[https://github.com/jwiegley/use-package/][use-package]]
 #+BEGIN_SRC emacs-lisp
-  (require 'use-package)
   (package-initialize)
+  (require 'use-package)
 #+END_SRC
 ** Paradox
 #+BEGIN_SRC emacs-lisp
-  (package-initialize)
   (use-package paradox
     :ensure paradox
   )
 #+END_SRC
+* Disable custom-vars
+#+BEGIN_SRC emacs-lisp
+  ;; Set the custom file to /dev/null and don't bother to load it
+  (setq custom-file "/dev/null")
+#+END_SRC
 * Misc functions
 ** with-library
 #+BEGIN_SRC emacs-lisp
@@ -47,7 +51,17 @@
 (put 'with-library 'lisp-indent-function 1)
 #+END_SRC
 
-
+* Variables
+** Safe Local Variables
+#+BEGIN_SRC emacs-lisp
+  (setq safe-local-variable-values 
+        (quote ((auto-save-default)
+                (make-backup-files)
+                (cperl-indent-level . 4)
+                (indent-level . 4)
+                (indent-tabs-mode . f)
+                )))
+#+END_SRC
 * Memory
 #+BEGIN_SRC emacs-lisp
   (setq global-mark-ring-max 128
@@ -239,7 +253,6 @@ value, scrolling continues until there is no more output.
 #+END_SRC
 
 ** Snippets
-
 *** Yasnippet
 #+BEGIN_SRC emacs-lisp
   (use-package yasnippet
@@ -251,9 +264,21 @@ value, scrolling continues until there is no more output.
               (define-key yas-minor-mode-map (kbd "<tab>") nil)
               (define-key yas-minor-mode-map (kbd "TAB") nil)
               (define-key yas-minor-mode-map (kbd "<backtab>") 'yas-expand)
-              ))
+              (setq yas-snippet-dirs '("~/lib/emacs_el/snippets/"
+                                       "~/lib/emacs_el/yasnippet-snippets/snippets/"))
+              (add-to-list 'hippie-expand-try-functions-list
+                               'yas-hippie-try-expand)
+              )
+    )
+#+END_SRC
+*** Auto-YASnippet
+#+BEGIN_SRC emacs-lisp
+  (use-package auto-yasnippet
+    :bind (("H-w" . aya-create)
+           ("H-y" . aya-expand)
+           )
+    )
 #+END_SRC
-
 ** Helm Flx
 
 [[https://github.com/PythonNut/helm-flx][helm-flx]] implements intelligent helm fuzzy sorting, provided by [[https://github.com/lewang/flx][flx]].
@@ -488,10 +513,6 @@ value, scrolling continues until there is no more output.
   )
 
 #+END_SRC
-** Org
-#+BEGIN_SRC emacs-lisp
-  (require 'org-mode-configuration)
-#+END_SRC
 *** Org-Gcal
 #+BEGIN_SRC emacs-lisp
   (use-package calfw
@@ -1523,7 +1544,6 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
   (setq ps-print-footer t)
   (setq ps-print-footer-frame nil)
   (setq ps-print-only-one-header t)
-  (setq safe-local-variable-values (quote ((auto-save-default) (make-backup-files))))
   (setq sentence-end "[.?!][]\"')]*\\($\\|   \\| \\)[    
   ]*")
   (setq sentence-end-double-space nil)