[spacemacs] sync up with latest template

and move my 'evil' customizations into dotspacemacs

3 files changed, 95 insertions, 93 deletions

diff --git a/spacemacs/.emacs.d/private/evil/extensions.el b/spacemacs/.emacs.d/private/evil/extensions.el
deleted file mode 100644
index 81926bf..0000000
--- a/spacemacs/.emacs.d/private/evil/extensions.el
+++ /dev/null
@@ -1,33 +0,0 @@
-;;; extensions.el --- evil Layer extensions File for Spacemacs
-;;
-;; Copyright (c) 2012-2014 Sylvain Benner
-;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
-;;
-;; Author: Sylvain Benner <sylvain.benner@gmail.com>
-;; URL: https://github.com/syl20bnr/spacemacs
-;;
-;; This file is not part of GNU Emacs.
-;;
-;;; License: GPLv3
-
-(defvar evil-pre-extensions
-  '(
-    ;; pre extension evils go here
-    )
-  "List of all extensions to load before the packages.")
-
-(defvar evil-post-extensions
-  '(
-    ;; post extension evils go here
-    )
-  "List of all extensions to load after the packages.")
-
-;; For each extension, define a function evil/init-<extension-evil>
-;;
-;; (defun evil/init-my-extension ()
-;;   "Initialize my extension"
-;;   )
-;;
-;; Often the body of an initialize function uses `use-package'
-;; For more info on `use-package', see readme:
-;; https://github.com/jwiegley/use-package
diff --git a/spacemacs/.emacs.d/private/evil/packages.el b/spacemacs/.emacs.d/private/evil/packages.el
deleted file mode 100644
index 2b44788..0000000
--- a/spacemacs/.emacs.d/private/evil/packages.el
+++ /dev/null
@@ -1,40 +0,0 @@
-;;; packages.el --- evil Layer packages File for Spacemacs
-;;
-;; Copyright (c) 2012-2014 Sylvain Benner
-;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
-;; Copyright (c) 2015 Amin Bandali
-;;
-;; Authors: Amin Bandali <me@aminb.org>
-;;          Sylvain Benner <sylvain.benner@gmail.com>
-;; URL: https://github.com/aminb/dotfiles
-;;
-;; This file is not part of GNU Emacs; nor that of spacemacs.
-;;
-;;; License: GPLv3
-
-(defvar evil-packages
-  '(
-    ;; package evils go here
-    )
-  "List of all packages to install and/or initialize. Built-in packages
-which require an initialization must be listed explicitly in the list.")
-
-(defvar evil-excluded-packages '(
-                                 ;; evil-search-highlight-persist
-                                 )
-  "List of packages to exclude.")
-
-(define-key evil-motion-state-map ";" 'evil-ex)
-(define-key evil-motion-state-map ":" 'evil-repeat-find-char)
-
-(custom-set-faces '(evil-search-highlight-persist-highlight-face ((t (:background "#5F5F5F")))))
-
-;; For each package, define a function evil/init-<package-evil>
-;;
-;; (defun evil/init-my-package ()
-;;   "Initialize my package"
-;;   )
-;;
-;; Often the body of an initialize function uses `use-package'
-;; For more info on `use-package', see readme:
-;; https://github.com/jwiegley/use-package
diff --git a/spacemacs/.spacemacs b/spacemacs/.spacemacs
index 2d927a2..b14710b 100644
--- a/spacemacs/.spacemacs
+++ b/spacemacs/.spacemacs
@@ -20,24 +20,19 @@
      auto-completion
      better-defaults
      emacs-lisp
-     (git :variables
-          git-gutter-use-fringe t)
+     git
      markdown
      org
-     shell
+     (shell :variables
+            shell-default-height 30
+            shell-default-position 'bottom)
      syntax-checking
      mu4e
-     notmuch
-     evil
      c-c++
-     auctex
-     ;; html
-     ;; clojure
+     latex
      ;; (haskell :variables '(haskell-enable-hindent-style "chris-done"
      ;;                                                    haskell-enable-shm-support t))
-     ;; rust
-     shell
-     ;; themes-megapack
+     version-control
      )
    ;; List of additional packages that will be installed wihout being
    ;; wrapped in a layer. If you need some configuration for these
@@ -76,9 +71,9 @@ before layers configuration."
    ;; List of themes, the first of the list is loaded when spacemacs starts.
    ;; Press <SPC> T n to cycle to the next theme in the list (works great
    ;; with 2 themes variants, one dark and one light)
-   dotspacemacs-themes '(leuven
+   dotspacemacs-themes '(solarized-light
                          gotham
-                         solarized-light
+                         leuven
                          solarized-dark
                          spacemacs-light
                          spacemacs-dark
@@ -89,7 +84,7 @@ before layers configuration."
    ;; Default font. `powerline-scale' allows to quickly tweak the mode-line
    ;; size to make separators look not too crappy.
    dotspacemacs-default-font '("Source Code Pro"
-                               :size 14
+                               :size 13
                                :weight normal
                                :width normal
                                :powerline-scale 1.1)
@@ -107,6 +102,11 @@ before layers configuration."
    ;; By default the command key is `:' so ex-commands are executed like in Vim
    ;; with `:' and Emacs commands are executed with `<leader> :'.
    dotspacemacs-command-key ":"
+   ;; Location where to auto-save files. Possible values are `original' to
+   ;; auto-save the file in-place, `cache' to auto-save the file to another
+   ;; file stored in the cache directory and `nil' to disable auto-saving.
+   ;; Default value is `cache'.
+   dotspacemacs-auto-save-file-location 'cache
    ;; If non nil then `ido' replaces `helm' for some commands. For now only
    ;; `find-files' (SPC f f) is replaced.
    dotspacemacs-use-ido t
@@ -194,28 +194,103 @@ layers configuration."
   (advice-add #'magit-key-mode-popup-committing :after
               (lambda ()
                 (magit-key-mode-toggle-option (quote committing) "--verbose")))
+
+  ;; Suppress ad-handle-definition warnings
+  ;; (annoying "`tramp-read-passwd' got redefined" warning on startup)
+  (setq ad-redefinition-action 'accept)
+
+  (define-key evil-motion-state-map ";" 'evil-ex)
+
+  ;; not very effective because of dotspacemacs-command-key
+  ;; (define-key evil-motion-state-map ":" 'evil-repeat-find-char)
+
+  ;; enable when using zenburn
+  ;; (custom-set-faces '(evil-search-highlight-persist-highlight-face ((t (:background "#5F5F5F")))))
 )
 
 ;; Do not write anything past this comment. This is where Emacs will
 ;; auto-generate custom variable definitions.
-
-
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(ac-ispell-requires 4)
  '(ahs-case-fold-search nil)
  '(ahs-default-range (quote ahs-range-whole-buffer))
  '(ahs-idle-interval 0.25)
  '(ahs-idle-timer 0 t)
  '(ahs-inhibit-face-list nil)
- '(ring-bell-function (quote ignore) t)
- '(send-mail-function (quote smtpmail-send-it)))
+ '(ansi-color-faces-vector
+   [default default default italic underline success warning error])
+ '(ansi-color-names-vector
+   ["#272822" "#F92672" "#A6E22E" "#E6DB74" "#66D9EF" "#FD5FF0" "#A1EFE4" "#F8F8F2"])
+ '(compilation-message-face (quote default))
+ '(cua-global-mark-cursor-color "#2aa198")
+ '(cua-normal-cursor-color "#839496")
+ '(cua-overwrite-cursor-color "#b58900")
+ '(cua-read-only-cursor-color "#859900")
+ '(highlight-changes-colors ("#FD5FF0" "#AE81FF"))
+ '(highlight-symbol-colors
+   (--map
+    (solarized-color-blend it "#002b36" 0.25)
+    (quote
+     ("#b58900" "#2aa198" "#dc322f" "#6c71c4" "#859900" "#cb4b16" "#268bd2"))))
+ '(highlight-symbol-foreground-color "#93a1a1")
+ '(highlight-tail-colors
+   (quote
+    (("#49483E" . 0)
+     ("#67930F" . 20)
+     ("#349B8D" . 30)
+     ("#21889B" . 50)
+     ("#968B26" . 60)
+     ("#A45E0A" . 70)
+     ("#A41F99" . 85)
+     ("#49483E" . 100))))
+ '(hl-bg-colors
+   (quote
+    ("#7B6000" "#8B2C02" "#990A1B" "#93115C" "#3F4D91" "#00629D" "#00736F" "#546E00")))
+ '(hl-fg-colors
+   (quote
+    ("#002b36" "#002b36" "#002b36" "#002b36" "#002b36" "#002b36" "#002b36" "#002b36")))
+ '(magit-diff-use-overlays nil)
+ '(magit-use-overlays nil)
+ '(package-selected-packages
+   (quote
+    (company-auctex auctex company-c-headers cmake-mode clang-format toc-org smeargle shell-pop org-repo-todo org-present org-pomodoro org-bullets multi-term mmm-mode markdown-toc magit-svn magit-gitflow htmlize helm-gitignore helm-flyspell helm-c-yasnippet gitconfig-mode gitattributes-mode git-timemachine git-messenger flycheck-pos-tip evil-org company-statistics company-quickhelp auto-yasnippet ac-ispell auto-complete company flycheck yasnippet request gitignore-mode magit git-rebase-mode git-commit-mode markdown-mode alert log4e gntp zenburn-theme monokai-theme macrostep elisp-slime-nav diff-hl window-numbering volatile-highlights vi-tilde-fringe use-package smooth-scrolling rfringe rainbow-delimiters powerline popup pcre2el paradox page-break-lines open-junk-file neotree move-text linum-relative leuven-theme info+ indent-guide ido-vertical-mode hungry-delete hl-anything highlight-parentheses highlight-numbers highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-descbinds helm-ag guide-key-tip google-translate golden-ratio gh-md fringe-helper flx-ido fill-column-indicator fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-terminal-cursor-changer evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-matchit evil-lisp-state evil-jumper evil-indent-textobject evil-iedit-state evil-exchange evil-escape evil-args evil-anzu eval-sexp-fu clean-aindent-mode buffer-move auto-highlight-symbol auto-dictionary aggressive-indent adaptive-wrap ace-window ace-link ace-jump-mode)))
+ '(pos-tip-background-color "#073642")
+ '(pos-tip-foreground-color "#93a1a1")
+ '(ring-bell-function (quote ignore))
+ '(smartrep-mode-line-active-bg (solarized-color-blend "#859900" "#073642" 0.2))
+ '(term-default-bg-color "#002b36")
+ '(term-default-fg-color "#839496")
+ '(vc-annotate-background nil)
+ '(vc-annotate-color-map
+   (quote
+    ((20 . "#F92672")
+     (40 . "#CF4F1F")
+     (60 . "#C26C0F")
+     (80 . "#E6DB74")
+     (100 . "#AB8C00")
+     (120 . "#A18F00")
+     (140 . "#989200")
+     (160 . "#8E9500")
+     (180 . "#A6E22E")
+     (200 . "#729A1E")
+     (220 . "#609C3C")
+     (240 . "#4E9D5B")
+     (260 . "#3C9F79")
+     (280 . "#A1EFE4")
+     (300 . "#299BA6")
+     (320 . "#2896B5")
+     (340 . "#2790C3")
+     (360 . "#66D9EF"))))
+ '(vc-annotate-very-old-color nil)
+ '(weechat-color-list
+   (unspecified "#272822" "#49483E" "#A20C41" "#F92672" "#67930F" "#A6E22E" "#968B26" "#E6DB74" "#21889B" "#66D9EF" "#A41F99" "#FD5FF0" "#349B8D" "#A1EFE4" "#F8F8F2" "#F8F8F0")))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- )
+ '(company-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil))))
+ '(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil)))))