Updating .spacemacs for the new release.

master
Dustin Swan 8 years ago
parent 6be00ffea2
commit 2335126b1a

3
.gitmodules vendored

@ -1,3 +0,0 @@
[submodule "tmux/plugins/tpm"]
path = tmux/plugins/tpm
url = https://github.com/tmux-plugins/tpm

@ -11,13 +11,27 @@ values."
;; `+distribution'. For now available distributions are `spacemacs-base' ;; `+distribution'. For now available distributions are `spacemacs-base'
;; or `spacemacs'. (default 'spacemacs) ;; or `spacemacs'. (default 'spacemacs)
dotspacemacs-distribution 'spacemacs dotspacemacs-distribution 'spacemacs
;; Lazy installation of layers (i.e. layers are installed only when a file
;; with a supported type is opened). Possible values are `all', `unused'
;; and `nil'. `unused' will lazy install only unused layers (i.e. layers
;; not listed in variable `dotspacemacs-configuration-layers'), `all' will
;; lazy install any layer that support lazy installation even the layers
;; listed in `dotspacemacs-configuration-layers'. `nil' disable the lazy
;; installation feature and you have to explicitly list a layer in the
;; variable `dotspacemacs-configuration-layers' to install it.
;; (default 'unused)
dotspacemacs-enable-lazy-installation 'unused
;; If non-nil then Spacemacs will ask for confirmation before installing
;; a layer lazily. (default t)
dotspacemacs-ask-for-lazy-installation t
;; If non-nil layers with lazy install support are lazy installed.
;; List of additional paths where to look for configuration layers. ;; List of additional paths where to look for configuration layers.
;; Paths must have a trailing slash (i.e. `~/.mycontribs/') ;; Paths must have a trailing slash (i.e. `~/.mycontribs/')
dotspacemacs-configuration-layer-path '() dotspacemacs-configuration-layer-path '()
;; List of configuration layers to load. If it is the symbol `all' instead ;; List of configuration layers to load.
;; of a list then all discovered layers will be installed.
dotspacemacs-configuration-layers dotspacemacs-configuration-layers
'(version-control '(ivy
version-control
git git
github github
perforce perforce
@ -111,13 +125,21 @@ values."
;; Maximum allowed time in seconds to contact an ELPA repository. ;; Maximum allowed time in seconds to contact an ELPA repository.
dotspacemacs-elpa-timeout 5 dotspacemacs-elpa-timeout 5
;; If non nil then spacemacs will check for updates at startup ;; If non nil then spacemacs will check for updates at startup
;; when the current branch is not `develop'. (default t) ;; when the current branch is not `develop'. Note that checking for
dotspacemacs-check-for-update t ;; new versions works via git commands, thus it calls GitHub services
;; One of `vim', `emacs' or `hybrid'. Evil is always enabled but if the ;; whenever you start Emacs. (default nil)
;; variable is `emacs' then the `holy-mode' is enabled at startup. `hybrid' dotspacemacs-check-for-update nil
;; uses emacs key bindings for vim's insert mode, but otherwise leaves evil ;; If non-nil, a form that evaluates to a package directory. For example, to
;; unchanged. (default 'vim) ;; use different package directories for different Emacs versions, set this
dotspacemacs-editing-style 'hybrid ;; to `emacs-version'.
dotspacemacs-elpa-subdirectory nil
;; One of `vim', `emacs' or `hybrid'.
;; `hybrid' is like `vim' except that `insert state' is replaced by the
;; `hybrid state' with `emacs' key bindings. The value can also be a list
;; with `:variables' keyword (similar to layers). Check the editing styles
;; section of the documentation for details on available variables.
;; (default 'vim)
dotspacemacs-editing-style 'vim
;; If non nil output loading progress in `*Messages*' buffer. (default nil) ;; If non nil output loading progress in `*Messages*' buffer. (default nil)
dotspacemacs-verbose-loading nil dotspacemacs-verbose-loading nil
;; Specify the startup banner. Default value is `official', it displays ;; Specify the startup banner. Default value is `official', it displays
@ -127,13 +149,16 @@ values."
;; by your Emacs build. ;; by your Emacs build.
;; If the value is nil then no banner is displayed. (default 'official) ;; If the value is nil then no banner is displayed. (default 'official)
dotspacemacs-startup-banner 'official dotspacemacs-startup-banner 'official
;; List of items to show in the startup buffer. If nil it is disabled. ;; List of items to show in startup buffer or an association list of
;; Possible values are: `recents' `bookmarks' `projects'. ;; the form `(list-type . list-size)`. If nil then it is disabled.
;; (default '(recents projects)) ;; Possible values for list-type are:
dotspacemacs-startup-lists '(recents bookmarks projects) ;; `recents' `bookmarks' `projects' `agenda' `todos'."
;; Number of recent files to show in the startup buffer. Ignored if ;; List sizes may be nil, in which case
;; `dotspacemacs-startup-lists' doesn't include `recents'. (default 5) ;; `spacemacs-buffer-startup-lists-length' takes effect.
dotspacemacs-startup-recent-list-size 5 dotspacemacs-startup-lists '((recents . 5)
(projects . 7))
;; True if the home buffer should respond to resize events.
dotspacemacs-startup-buffer-responsive t
;; Default major mode of the scratch buffer (default `text-mode') ;; Default major mode of the scratch buffer (default `text-mode')
dotspacemacs-scratch-mode 'emacs-lisp-mode dotspacemacs-scratch-mode 'emacs-lisp-mode
;; List of themes, the first of the list is loaded when spacemacs starts. ;; List of themes, the first of the list is loaded when spacemacs starts.
@ -162,6 +187,9 @@ values."
;; Major mode leader key accessible in `emacs state' and `insert state'. ;; Major mode leader key accessible in `emacs state' and `insert state'.
;; (default "C-M-m) ;; (default "C-M-m)
dotspacemacs-major-mode-emacs-leader-key "C-M-m" dotspacemacs-major-mode-emacs-leader-key "C-M-m"
;; The key used for Emacs commands (M-x) (after pressing on the leader key).
;; (default "SPC")
dotspacemacs-emacs-command-key "SPC"
;; These variables control whether separate commands are bound in the GUI to ;; These variables control whether separate commands are bound in the GUI to
;; the key pairs C-i, TAB and C-m, RET. ;; the key pairs C-i, TAB and C-m, RET.
;; Setting it to a non-nil value, allows for separate commands under <C-i> ;; Setting it to a non-nil value, allows for separate commands under <C-i>
@ -169,14 +197,17 @@ values."
;; In the terminal, these pairs are generally indistinguishable, so this only ;; In the terminal, these pairs are generally indistinguishable, so this only
;; works in the GUI. (default nil) ;; works in the GUI. (default nil)
dotspacemacs-distinguish-gui-tab nil dotspacemacs-distinguish-gui-tab nil
;; (Not implemented) dotspacemacs-distinguish-gui-ret nil ;; If non nil `Y' is remapped to `y$' in Evil states. (default nil)
;; The command key used for Evil commands (ex-commands) and dotspacemacs-remap-Y-to-y$ nil
;; Emacs commands (M-x). ;; If non-nil, the shift mappings `<' and `>' retain visual state if used
;; By default the command key is `:' so ex-commands are executed like in Vim ;; there. (default t)
;; with `:' and Emacs commands are executed with `<leader> :'. dotspacemacs-retain-visual-state-on-shift t
dotspacemacs-command-key ":" ;; If non-nil, J and K move lines up and down when in visual mode.
;; If non nil `Y' is remapped to `y$'. (default t) ;; (default nil)
dotspacemacs-remap-Y-to-y$ t dotspacemacs-visual-line-move-text nil
;; If non nil, inverse the meaning of `g' in `:substitute' Evil ex-command.
;; (default nil)
dotspacemacs-ex-substitute-global nil
;; Name of the default layout (default "Default") ;; Name of the default layout (default "Default")
dotspacemacs-default-layout-name "Default" dotspacemacs-default-layout-name "Default"
;; If non nil the default layout name is displayed in the mode-line. ;; If non nil the default layout name is displayed in the mode-line.
@ -185,6 +216,10 @@ values."
;; If non nil then the last auto saved layouts are resume automatically upon ;; If non nil then the last auto saved layouts are resume automatically upon
;; start. (default nil) ;; start. (default nil)
dotspacemacs-auto-resume-layouts nil dotspacemacs-auto-resume-layouts nil
;; Size (in MB) above which spacemacs will prompt to open the large file
;; literally to avoid performance issues. Opening a file literally means that
;; no major mode or minor modes are active. (default is 1)
dotspacemacs-large-file-size 1
;; Location where to auto-save files. Possible values are `original' to ;; 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 ;; 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. ;; file stored in the cache directory and `nil' to disable auto-saving.
@ -192,10 +227,6 @@ values."
dotspacemacs-auto-save-file-location 'cache dotspacemacs-auto-save-file-location 'cache
;; Maximum number of rollback slots to keep in the cache. (default 5) ;; Maximum number of rollback slots to keep in the cache. (default 5)
dotspacemacs-max-rollback-slots 5 dotspacemacs-max-rollback-slots 5
;; If non nil then `ido' replaces `helm' for some commands. For now only
;; `find-files' (SPC f f), `find-spacemacs-file' (SPC f e s), and
;; `find-contrib-file' (SPC f e c) are replaced. (default nil)
dotspacemacs-use-ido nil
;; If non nil, `helm' will try to minimize the space it uses. (default nil) ;; If non nil, `helm' will try to minimize the space it uses. (default nil)
dotspacemacs-helm-resize nil dotspacemacs-helm-resize nil
;; if non nil, the helm header is hidden when there is only one source. ;; if non nil, the helm header is hidden when there is only one source.
@ -204,9 +235,14 @@ values."
;; define the position to display `helm', options are `bottom', `top', ;; define the position to display `helm', options are `bottom', `top',
;; `left', or `right'. (default 'bottom) ;; `left', or `right'. (default 'bottom)
dotspacemacs-helm-position 'bottom dotspacemacs-helm-position 'bottom
;; Controls fuzzy matching in helm. If set to `always', force fuzzy matching
;; in all non-asynchronous sources. If set to `source', preserve individual
;; source settings. Else, disable fuzzy matching in all sources.
;; (default 'always)
dotspacemacs-helm-use-fuzzy 'always
;; If non nil the paste micro-state is enabled. When enabled pressing `p` ;; If non nil the paste micro-state is enabled. When enabled pressing `p`
;; several times cycle between the kill ring content. (default nil) ;; several times cycle between the kill ring content. (default nil)
dotspacemacs-enable-paste-micro-state nil dotspacemacs-enable-paste-transient-state nil
;; Which-key delay in seconds. The which-key buffer is the popup listing ;; Which-key delay in seconds. The which-key buffer is the popup listing
;; the commands bound to the current keystroke sequence. (default 0.4) ;; the commands bound to the current keystroke sequence. (default 0.4)
dotspacemacs-which-key-delay 0.4 dotspacemacs-which-key-delay 0.4
@ -237,24 +273,35 @@ values."
;; the transparency level of a frame when it's inactive or deselected. ;; the transparency level of a frame when it's inactive or deselected.
;; Transparency can be toggled through `toggle-transparency'. (default 90) ;; Transparency can be toggled through `toggle-transparency'. (default 90)
dotspacemacs-inactive-transparency 90 dotspacemacs-inactive-transparency 90
;; If non nil show the titles of transient states. (default t)
dotspacemacs-show-transient-state-title t
;; If non nil show the color guide hint for transient state keys. (default t)
dotspacemacs-show-transient-state-color-guide t
;; If non nil unicode symbols are displayed in the mode line. (default t) ;; If non nil unicode symbols are displayed in the mode line. (default t)
dotspacemacs-mode-line-unicode-symbols t dotspacemacs-mode-line-unicode-symbols t
;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth ;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth
;; scrolling overrides the default behavior of Emacs which recenters the ;; scrolling overrides the default behavior of Emacs which recenters point
;; point when it reaches the top or bottom of the screen. (default t) ;; when it reaches the top or bottom of the screen. (default t)
dotspacemacs-smooth-scrolling t dotspacemacs-smooth-scrolling t
;; If non nil line numbers are turned on in all `prog-mode' and `text-mode' ;; If non nil line numbers are turned on in all `prog-mode' and `text-mode'
;; derivatives. If set to `relative', also turns on relative line numbers. ;; derivatives. If set to `relative', also turns on relative line numbers.
;; (default nil) ;; (default nil)
dotspacemacs-line-numbers nil dotspacemacs-line-numbers nil
;; Code folding method. Possible values are `evil' and `origami'.
;; (default 'evil)
dotspacemacs-folding-method 'evil
;; If non-nil smartparens-strict-mode will be enabled in programming modes. ;; If non-nil smartparens-strict-mode will be enabled in programming modes.
;; (default nil) ;; (default nil)
dotspacemacs-smartparens-strict-mode nil dotspacemacs-smartparens-strict-mode nil
;; If non-nil pressing the closing parenthesis `)' key in insert mode passes
;; over any automatically added closing parenthesis, bracket, quote, etc…
;; This can be temporary disabled by pressing `C-q' before `)'. (default nil)
dotspacemacs-smart-closing-parenthesis nil
;; Select a scope to highlight delimiters. Possible values are `any', ;; Select a scope to highlight delimiters. Possible values are `any',
;; `current', `all' or `nil'. Default is `all' (highlight any scope and ;; `current', `all' or `nil'. Default is `all' (highlight any scope and
;; emphasis the current one). (default 'all) ;; emphasis the current one). (default 'all)
dotspacemacs-highlight-delimiters 'all dotspacemacs-highlight-delimiters 'all
;; If non nil advises quit functions to keep server open when quitting. ;; If non nil, advise quit functions to keep server open when quitting.
;; (default nil) ;; (default nil)
dotspacemacs-persistent-server nil dotspacemacs-persistent-server nil
;; List of search tool executable names. Spacemacs uses the first installed ;; List of search tool executable names. Spacemacs uses the first installed
@ -290,6 +337,11 @@ in `dotspacemacs/user-config'."
This function is called at the very end of Spacemacs initialization after This function is called at the very end of Spacemacs initialization after
layers configuration. You are free to put any user code." layers configuration. You are free to put any user code."
(spacemacs|define-custom-layout "@Mail"
:binding "m"
:body
(call-interactively 'mu4e))
(beacon-mode 1) (beacon-mode 1)
(setq ns-use-srgb-colorspace nil) (setq ns-use-srgb-colorspace nil)
@ -333,7 +385,7 @@ layers configuration. You are free to put any user code."
mu4e-attachment-dir "~/Downloads" mu4e-attachment-dir "~/Downloads"
mu4e-view-show-addresses t mu4e-view-show-addresses t
mu4e-view-show-images t mu4e-view-show-images t
mu4e-view-prefer-html t mu4e-view-prefer-html nil
;; mu4e-html2text-command 'mu4e-shr2text ;; mu4e-html2text-command 'mu4e-shr2text
mu4e-html2text-command "w3m -dump -T text/html" mu4e-html2text-command "w3m -dump -T text/html"
w3m-command "/usr/local/bin/w3m" w3m-command "/usr/local/bin/w3m"

@ -1 +0,0 @@
Subproject commit 527d12321108d52cc5b53cd251f2a058fd07bf0e
Loading…
Cancel
Save