only start the server if it isn't already running

[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 878bdc8cb625be27e8fb25a4870e046715a0704c..e9d2b033ed7d7c8961311e1656fb3d32771ff0d5 100644 (file)
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -733,7 +733,8 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 ** GhostText/Atomic Chrome
 #+BEGIN_SRC emacs-lisp
   (use-package atomic-chrome
-    :config (atomic-chrome-start-server)
+    :config
+    (ignore-errors (atomic-chrome-start-server))
     (setq atomic-chrome-buffer-open-style 'full)
     )
 #+END_SRC
@@ -750,6 +751,16 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
            ("C-S-c C-S-c" . mc/edit-lines))
     )
 #+END_SRC
+** Web Mode
+#+BEGIN_SRC emacs-lisp
+  (use-package web-mode
+    :config
+    (add-to-list 'auto-mode-alist '("\\.tmpl\\'" . web-mode))
+    (setq web-mode-enable-engine-detection t)
+    (setq web-mode-engines-alist
+          '(("template-toolkit" . "\\.tmpl\\'")))
+    )
+#+END_SRC
 * Org Mode
 ** Use-package and load things
 #+BEGIN_SRC emacs-lisp
@@ -899,7 +910,7 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
   (setq org-columns-default-format "%40ITEM(Task) %6Effort{:} %CLOCKSUM %PRIORITY %TODO %13SCHEDULED %13DEADLINE %TAGS")
 
   (setq org-default-notes-file "~/projects/org-notes/notes.org")
-  (setq org-id-link-to-org-use-id t)
+  (setq org-id-link-to-org-use-id 'use-existing)
 #+END_SRC
 ** Capture Templates
 #+BEGIN_SRC emacs-lisp
@@ -1164,11 +1175,11 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
   (org-add-link-type "mutt" 'open-mail-in-mutt)
 
   (defun my-org-mode-setup ()
-    (load-library "reftex")
+    ; (load-library "reftex")
     (and (buffer-file-name)
          (file-exists-p (buffer-file-name))
          (progn
-           (reftex-parse-all)
+           ; (reftex-parse-all)
            (reftex-set-cite-format
             '((?b . "[[bib:%l][%l-bib]]")
               (?n . "[[notes:%l][%l-notes]]")
@@ -1246,7 +1257,7 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
   (setq org-icalendar-timezone "America/Los_Angeles")
   (setq org-icalendar-use-scheduled '(todo-start event-if-todo))
   ;; we already add the id manually
-  ;; (setq org-icalendar-store-UID t)
+  (setq org-icalendar-store-UID t)
 
 #+END_SRC
 ** General Org Babel Configuration
@@ -1877,8 +1888,6 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 
   (column-number-mode t)
 
-  (server-start)
-
   ; (require 'mode-compile)
 
   (defadvice server-process-filter (after post-mode-message first activate)
@@ -2155,6 +2164,14 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 
 #+END_SRC
 
+* Server
+#+BEGIN_SRC emacs-lisp
+  (unless (server-running-p)
+  (server-start))
+#+END_SRC
+
+
+
 * END
 #+BEGIN_SRC emacs-lisp
   (provide 'don-configuration)