[spacemacs] merge new template changes

diff --git a/spacemacs/.spacemacs b/spacemacs/.spacemacs
index 2529efe..2d927a2 100644 (file)
--- a/spacemacs/.spacemacs
+++ b/spacemacs/.spacemacs
@@ -1,4 +1,4 @@
-;; -*- mode: dotspacemacs -*-
+;; -*- mode: emacs-lisp -*-

 ;; This file is loaded by Spacemacs at startup.
 ;; It must be stored in your home directory.
 
 ;; This file is loaded by Spacemacs at startup.
 ;; It must be stored in your home directory.
 


@@ -12,31 +12,38 @@
    ;; of a list then all discovered layers will be installed.
    dotspacemacs-configuration-layers
    '(
    ;; of a list then all discovered layers will be installed.
    dotspacemacs-configuration-layers
    '(

-     ;; --------------------------------------------------------
-     ;; Example of useful layers you may want to use right away
-     ;; Uncomment a layer name and press C-c C-c to install it
-     ;; --------------------------------------------------------
+     ;; ----------------------------------------------------------------
+     ;; Example of useful layers you may want to use right away.
+     ;; Uncomment some layer names and press <SPC f e R> (Vim style) or
+     ;; <M-m f e R> (Emacs style) to install them.
+     ;; ----------------------------------------------------------------

      auto-completion
      better-defaults
      auto-completion
      better-defaults

+     emacs-lisp

      (git :variables
           git-gutter-use-fringe t)
      markdown
      org
      (git :variables
           git-gutter-use-fringe t)
      markdown
      org

+     shell

      syntax-checking
      mu4e
      syntax-checking
      mu4e

+     notmuch

      evil
      c-c++
      auctex
      evil
      c-c++
      auctex

-     html
-     clojure
-     (haskell :variables '(haskell-enable-hindent-style "chris-done"
-                                                        haskell-enable-shm-support t))
-     emacs-lisp
-     rust
-     rust-lang
+     ;; html
+     ;; clojure
+     ;; (haskell :variables '(haskell-enable-hindent-style "chris-done"
+     ;;                                                    haskell-enable-shm-support t))
+     ;; rust

      shell
      shell

-     themes-megapack
+     ;; themes-megapack

      )
      )

+   ;; List of additional packages that will be installed wihout being
+   ;; wrapped in a layer. If you need some configuration for these
+   ;; packages then consider to create a layer, you can also put the
+   ;; configuration in `dotspacemacs/config'.
+   dotspacemacs-additional-packages '()

    ;; A list of packages and/or extensions that will not be install and loaded.
    dotspacemacs-excluded-packages '()
    ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that
    ;; A list of packages and/or extensions that will not be install and loaded.
    dotspacemacs-excluded-packages '()
    ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that


@@ -54,25 +61,29 @@ before layers configuration."
    ;; Either `vim' or `emacs'. Evil is always enabled but if the variable
    ;; is `emacs' then the `holy-mode' is enabled at startup.
    dotspacemacs-editing-style 'vim
    ;; Either `vim' or `emacs'. Evil is always enabled but if the variable
    ;; is `emacs' then the `holy-mode' is enabled at startup.
    dotspacemacs-editing-style 'vim

-   ;; If non nil output loading progess in `*Messages*' buffer.
+   ;; If non nil output loading progress in `*Messages*' buffer.

    dotspacemacs-verbose-loading nil
    ;; Specify the startup banner. Default value is `official', it displays
    ;; the official spacemacs logo. An integer value is the index of text
    ;; banner, `random' chooses a random text banner in `core/banners'
    dotspacemacs-verbose-loading nil
    ;; Specify the startup banner. Default value is `official', it displays
    ;; the official spacemacs logo. An integer value is the index of text
    ;; banner, `random' chooses a random text banner in `core/banners'

-   ;; directory. A string value must be a path to a .PNG file.
+   ;; directory. A string value must be a path to an image format supported
+   ;; by your Emacs build.

    ;; If the value is nil then no banner is displayed.
    ;; If the value is nil then no banner is displayed.

-   ;; dotspacemacs-startup-banner 'official

    dotspacemacs-startup-banner 'official
    dotspacemacs-startup-banner 'official

-   ;; t if you always want to see the changelog at startup
-   dotspacemacs-always-show-changelog nil

    ;; List of items to show in the startup buffer. If nil it is disabled.
    ;; Possible values are: `recents' `bookmarks' `projects'."
    dotspacemacs-startup-lists '(recents projects)
    ;; 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)
    ;; List of items to show in the startup buffer. If nil it is disabled.
    ;; Possible values are: `recents' `bookmarks' `projects'."
    dotspacemacs-startup-lists '(recents projects)
    ;; 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 sanityinc-tomorrow-night solarized-dark solarized-light)
-   dotspacemacs-themes '(gotham)
+   dotspacemacs-themes '(leuven
+                         gotham
+                         solarized-light
+                         solarized-dark
+                         spacemacs-light
+                         spacemacs-dark
+                         monokai
+                         zenburn)

    ;; If non nil the cursor color matches the state color.
    dotspacemacs-colorize-cursor-according-to-state t
    ;; Default font. `powerline-scale' allows to quickly tweak the mode-line
    ;; If non nil the cursor color matches the state color.
    dotspacemacs-colorize-cursor-according-to-state t
    ;; Default font. `powerline-scale' allows to quickly tweak the mode-line


@@ -96,9 +107,12 @@ 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 ":"
    ;; 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 ":"

-   ;; If non nil the paste micro-state is enabled. While enabled pressing `p`
+   ;; If non nil then `ido' replaces `helm' for some commands. For now only
+   ;; `find-files' (SPC f f) is replaced.
+   dotspacemacs-use-ido t
+   ;; If non nil the paste micro-state is enabled. When enabled pressing `p`

    ;; several times cycle between the kill ring content.
    ;; several times cycle between the kill ring content.

-   dotspacemacs-enable-paste-micro-state t
+   dotspacemacs-enable-paste-micro-state nil

    ;; Guide-key delay in seconds. The Guide-key is the popup buffer listing
    ;; the commands bound to the current keystrokes.
    dotspacemacs-guide-key-delay 0.4
    ;; Guide-key delay in seconds. The Guide-key is the popup buffer listing
    ;; the commands bound to the current keystrokes.
    dotspacemacs-guide-key-delay 0.4


@@ -132,8 +146,14 @@ before layers configuration."
    dotspacemacs-smooth-scrolling t
    ;; If non-nil smartparens-strict-mode will be enabled in programming modes.
    dotspacemacs-smartparens-strict-mode nil
    dotspacemacs-smooth-scrolling t
    ;; If non-nil smartparens-strict-mode will be enabled in programming modes.
    dotspacemacs-smartparens-strict-mode nil

+   ;; Select a scope to highlight delimiters. Possible value is `all',
+   ;; `current' or `nil'. Default is `all'
+   dotspacemacs-highlight-delimiters 'all

    ;; If non nil advises quit functions to keep server open when quitting.
    dotspacemacs-persistent-server nil
    ;; If non nil advises quit functions to keep server open when quitting.
    dotspacemacs-persistent-server nil

+   ;; List of search tool executable names. Spacemacs uses the first installed
+   ;; tool of the list. Supported tools are `ag', `pt', `ack' and `grep'.
+   dotspacemacs-search-tools '("ag" "pt" "ack" "grep")

    ;; The default package repository used if no explicit repository has been
    ;; specified with an installed package.
    ;; Not used for now.
    ;; The default package repository used if no explicit repository has been
    ;; specified with an installed package.
    ;; Not used for now.