X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=emacs_el%2Fconfiguration%2Fdon-configuration.org;h=8c2e10c9c278b8a2aa8badcf67e32af75d2dee3e;hb=37e2da74cc17eb26f92b0913f3aab7d27fc63ec2;hp=cbb1cf0da35b84b65169b5cc95a73d30eae8ca01;hpb=f05bfc5994ac3b2b86cddedc0d4e90d8d56eecdc;p=lib.git

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index cbb1cf0..8c2e10c 100644
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -32,6 +32,7 @@ load  [[https://github.com/jwiegley/use-package/][use-package]] even faster
     ;; add /etc/ssl/ca-global/ca-certificates.crt so that we can
     ;; download packages when we're on Debian hosts which chop down the
     ;; list of available certificates
+    (require 'gnutls)
     (add-to-list 'gnutls-trustfiles "/etc/ssl/ca-global/ca-certificates.crt")
     (setq package-enable-at-startup nil)
     (setq package--init-file-ensured t)
@@ -106,13 +107,14 @@ load  [[https://github.com/jwiegley/use-package/][use-package]] even faster
 * 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)
-                )))
+(setq safe-local-variable-values
+      (quote ((auto-save-default)
+              (make-backup-files)
+              (cperl-indent-level . 4)
+              (indent-level . 4)
+              (indent-tabs-mode . f)
+              (vcl-indent-level . 4)
+              )))
 #+END_SRC
 * Memory
 #+BEGIN_SRC emacs-lisp
@@ -130,6 +132,14 @@ load  [[https://github.com/jwiegley/use-package/][use-package]] even faster
   (add-hook 'minibuffer-exit-hook #'don/minibuffer-exit-hook)
 #+END_SRC
 * Modules
+** Spacemacs theme
+#+BEGIN_SRC emacs-lisp
+(use-package spacemacs-theme
+  :ensure t
+  :init
+  (load-theme 'spacemacs-dark)
+  )
+#+END_SRC
 ** Hippie Expand
 #+BEGIN_SRC emacs-lisp
   (use-package hippie-exp
@@ -308,6 +318,7 @@ value, scrolling continues until there is no more output.
 *** Avy
 #+BEGIN_SRC emacs-lisp
   (use-package avy
+    :if (>= emacs-major-version 25)
     :ensure t
     :bind (("C-c C-<SPC>" . avy-goto-word-or-subword-1)
            ("C-c j j" . avy-goto-word-or-subword-1)
@@ -370,32 +381,31 @@ value, scrolling continues until there is no more output.
 #+END_SRC
 ** Company
 #+BEGIN_SRC emacs-lisp
-  (use-package company
-    :ensure t
-    :bind (("M-/" . company-complete))
-    :config
-    (setq company-echo-delay 0     ; remove blinking
-          company-show-numbers t   ; show numbers for easy selection
-          company-selection-wrap-around t
-          company-require-match nil
-          company-dabbrev-ignore-case t
-          company-dabbrev-ignore-invisible t
-          company-dabbrev-other-buffers t
-          company-dabbrev-downcase nil
-          company-dabbrev-code-everywhere t
-          company-tooltip-align-annotations t
-          company-minimum-prefix-length 1
-          company-global-modes '(not)
-          company-lighter-base "(C)")
-    (global-company-mode 1)
-  
-    (bind-key "C-n"   #'company-select-next company-active-map)
-    (bind-key "C-p"   #'company-select-previous company-active-map)
-    ; (bind-key "<tab>" #'company-complete company-active-map)
-    (bind-key "M-?"   #'company-show-doc-buffer company-active-map)
-    (bind-key "M-."   #'company-show-location company-active-map)
-    (bind-key "M-/"   #'company-complete-common org-mode-map)
-    )
+(use-package company
+  :ensure t
+  :bind (("M-/" . company-complete))
+  :config
+  (setq company-echo-delay 0     ; remove blinking
+        company-show-numbers t   ; show numbers for easy selection
+        company-selection-wrap-around t
+        company-require-match nil
+        company-dabbrev-ignore-case t
+        company-dabbrev-ignore-invisible t
+        company-dabbrev-other-buffers t
+        company-dabbrev-downcase nil
+        company-dabbrev-code-everywhere t
+        company-tooltip-align-annotations t
+        company-minimum-prefix-length 1
+        company-global-modes '(not)
+        company-lighter-base "(C)")
+  (global-company-mode 1)
+  :bind (:map company-active-map
+              ("C-n" . company-select-next)
+              ("C-p" . company-select-previous)
+              ("M-?" . company-show-doc-buffer)
+              ("M-." . company-show-location)
+              )
+  )
 #+END_SRC
 *** C/C++
 #+BEGIN_SRC emacs-lisp
@@ -680,6 +690,13 @@ value, scrolling continues until there is no more output.
     (setq ediff-window-setup-function 'ediff-setup-windows-plain)
   )
 #+END_SRC
+** Do the Right Thing Indenting
+Attempts to automatically identify the right indentation for a file
+#+BEGIN_SRC emacs-lisp
+(use-package dtrt-indent
+  :ensure t
+)  
+#+END_SRC
 ** VCL --editing varnish configuration files
 #+BEGIN_SRC emacs-lisp
   (use-package vcl-mode
@@ -1275,6 +1292,8 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 ** Web Mode
 #+BEGIN_SRC emacs-lisp
   (use-package web-mode
+    :load-path "/home/don/projects/web-mode/"
+    :mode ("\\.\\(tx|tmpl\\)\\'" . web-mode)
     :config
     (add-to-list 'auto-mode-alist '("\\.tmpl\\'" . web-mode))
     (setq web-mode-enable-engine-detection t)
@@ -1325,6 +1344,14 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
     (setq default-abbrev-mode t))
 #+END_SRC
 
+** Go language
+#+BEGIN_SRC emacs-lisp
+(use-package go-mode
+             :diminish "go"
+             :mode "\\.go"
+             )
+#+END_SRC
+
 * Email
 ** Mutt
 *** Message-mode
@@ -1692,6 +1719,16 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
   ;           (lambda ()
   ;             (add-hook 'before-save-hook 'my/org-add-ids-to-headlines-in-file nil 'local)))
 #+END_SRC
+** Org ID locations
+#+BEGIN_SRC emacs-lisp
+(use-package find-lisp
+  :ensure t)
+(setq org-agenda-text-search-extra-files
+      (append '(agenda-archives)
+              (find-lisp-find-files "~/projects/org-notes" "\.org$")
+              (find-lisp-find-files "~/projects/org-notes" "\.org_archive$")
+              ))
+#+END_SRC
 ** Keywords (TODO)
 #+BEGIN_SRC emacs-lisp
   (setq org-todo-keywords
@@ -1911,6 +1948,8 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
    (ditaa . t)
    (dot . t)
    ))
+;; set the right path to ditaa.jar
+(setq org-ditaa-jar-path "/usr/share/ditaa/ditaa.jar")
 ;; use graphviz-dot for dot things
 (add-to-list 'org-src-lang-modes '("dot" . graphviz-dot))
 ;; do not indent begin_src blocks
@@ -2318,18 +2357,19 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 #+END_SRC
 ** Org-Gcal
 #+BEGIN_SRC emacs-lisp
-  (use-package calfw
-    :ensure f
-    )
-  (use-package calfw-org
-    :ensure f
-    )
-  (use-package org-gcal
-    :ensure f
-    :config '((if (file-readable-p "~/.hide/org_gcal.el")
-                  (load-file "~/.hide/org_gcal.el"))
-              )
-    )
+(use-package calfw
+  :ensure f
+  )
+(use-package calfw-org
+  :ensure f
+  )
+(use-package org-gcal
+  :if (file-readable-p "~/.hide/org_gcal.el")
+  :ensure f
+  :config '((if (file-readable-p "~/.hide/org_gcal.el")
+                (load-file "~/.hide/org_gcal.el"))
+            )
+  )
 #+END_SRC
 ** appt integration
 #+BEGIN_SRC emacs-lisp