More common spacemacs changes

This commit is contained in:
Hunter Haugen 2016-04-07 13:05:23 -07:00
parent 627f82ab60
commit 00554428e4

View file

@ -26,26 +26,29 @@ values."
;; 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
(auto-completion :variables
auto-completion-enable-help-tooltip t
auto-completion-enable-snippets-in-popup t)
better-defaults
deft
emacs-lisp
(ruby :variables
ruby-enable-enh-ruby-mode t
ruby-version-manager 'rbenv)
git
github
markdown
org
puppet
(shell :variables
shell-default-height 30
shell-default-position 'bottom)
(ruby :variables
ruby-enable-enh-ruby-mode t
ruby-version-manager 'rbenv)
(shell :variables shell-default-term 'multi-term)
spacemacs-helm
spacemacs-layouts
spell-checking
syntax-checking
version-control
yaml
(rcirc :variables rcirc-enable-znc-support t)
themes-megapack
vagrant
yaml
)
;; List of additional packages that will be installed without being
;; wrapped in a layer. If you need some configuration for these
@ -102,7 +105,7 @@ values."
;; `dotspacemacs-startup-lists' doesn't include `recents'. (default 5)
dotspacemacs-startup-recent-list-size 5
;; Default major mode of the scratch buffer (default `text-mode')
dotspacemacs-scratch-mode 'text-mode
dotspacemacs-scratch-mode 'puppet-mode
;; 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)
@ -115,10 +118,6 @@ values."
;; size to make separators look not too crappy.
dotspacemacs-default-font '("Droid Sans Mono Dotted for Powerline"
:size 26
;;:size ,(if (eq window-system 'x)
;; 26
;; 13
;; )
:weight normal
:width normal
:powerline-scale 1.1)
@ -142,7 +141,7 @@ values."
;; and TAB or <C-m> and RET.
;; In the terminal, these pairs are generally indistinguishable, so this only
;; works in the GUI. (default nil)
dotspacemacs-distinguish-gui-tab t
dotspacemacs-distinguish-gui-tab nil
;; (Not implemented) dotspacemacs-distinguish-gui-ret nil
;; The command key used for Evil commands (ex-commands) and
;; Emacs commands (M-x).
@ -158,7 +157,7 @@ values."
dotspacemacs-display-default-layout nil
;; If non nil then the last auto saved layouts are resume automatically upon
;; start. (default nil)
dotspacemacs-auto-resume-layouts nil
dotspacemacs-auto-resume-layouts t
;; 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.
@ -171,7 +170,7 @@ values."
;; `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)
dotspacemacs-helm-resize t
dotspacemacs-helm-resize nil
;; if non nil, the helm header is hidden when there is only one source.
;; (default nil)
dotspacemacs-helm-no-header nil
@ -180,7 +179,7 @@ values."
dotspacemacs-helm-position 'bottom
;; If non nil the paste micro-state is enabled. When enabled pressing `p`
;; several times cycle between the kill ring content. (default nil)
dotspacemacs-enable-paste-transient-state nil
dotspacemacs-enable-paste-transient-state t
;; Which-key delay in seconds. The which-key buffer is the popup listing
;; the commands bound to the current keystroke sequence. (default 0.4)
dotspacemacs-which-key-delay 0.4
@ -252,7 +251,7 @@ values."
;; `trailing' to delete only the whitespace at end of lines, `changed'to
;; delete only whitespace for changed lines or `nil' to disable cleanup.
;; (default nil)
dotspacemacs-whitespace-cleanup nil
dotspacemacs-whitespace-cleanup 'changed
))
(defun dotspacemacs/user-init ()