Update spacemacs config

- Add PHP and Python layers
- Add indentation settings
This commit is contained in:
2015-12-03 11:55:13 -08:00
parent 10c901a405
commit 7d9b447f05

View File

@@ -25,6 +25,8 @@
shell-default-term-shell "/usr/local/bin/fish") shell-default-term-shell "/usr/local/bin/fish")
shell-scripts shell-scripts
ruby ruby
php
python
;; syntax-checking ;; syntax-checking
themes-megapack themes-megapack
version-control version-control
@@ -47,7 +49,7 @@
;; List of additional packages that will be installed without being ;; List of additional packages that will be installed without being
;; wrapped in a layer. If you need some configuration for these ;; wrapped in a layer. If you need some configuration for these
;; packages then consider to create a layer, you can also put the ;; packages then consider to create a layer, you can also put the
;; configuration in `dotspacemacs/config'. ;; configuration in `dotspacemacs/user-config'.
dotspacemacs-additional-packages '() dotspacemacs-additional-packages '()
;; A list of packages and/or extensions that will not be install and loaded. ;; A list of packages and/or extensions that will not be install and loaded.
dotspacemacs-excluded-packages '() dotspacemacs-excluded-packages '()
@@ -171,7 +173,7 @@ before layers configuration."
(add-to-list 'default-frame-alist '(width . 115)) (add-to-list 'default-frame-alist '(width . 115))
) )
(defun dotspacemacs/config () (defun dotspacemacs/user-config ()
"Configuration function. "Configuration function.
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." layers configuration."
@@ -181,11 +183,16 @@ layers configuration."
(modify-syntax-entry ?- "w" table) (modify-syntax-entry ?- "w" table)
(with-syntax-table table (with-syntax-table table
ad-do-it))) ad-do-it)))
(evil-set-initial-state 'term-mode 'emacs) (evil-set-initial-state 'term-mode 'emacs)
(add-hook 'term-mode-hook (add-hook 'term-mode-hook
(lambda () (lambda ()
(make-local-variable 'scroll-margin) (make-local-variable 'scroll-margin)
(setq scroll-margin 0))) (setq scroll-margin 0)))
(setq tab-width 2)
(setq c-basic-offset 2)
(setq indent-tabs-mode nil)
) )
;; Do not write anything past this comment. This is where Emacs will ;; Do not write anything past this comment. This is where Emacs will
@@ -207,8 +214,9 @@ layers configuration."
'(custom-safe-themes '(custom-safe-themes
(quote (quote
("614f8478963ec8caac8809931c9d00f670e4519388c02f71d9d27b66d5741a7f" default))) ("614f8478963ec8caac8809931c9d00f670e4519388c02f71d9d27b66d5741a7f" default)))
'(fci-rule-color "#37474f" t) '(fci-rule-color "#37474f")
'(hl-sexp-background-color "#1c1f26") '(hl-sexp-background-color "#1c1f26")
'(python-indent-offset 2)
'(ring-bell-function (quote ignore) t) '(ring-bell-function (quote ignore) t)
'(shell-pop-autocd-to-working-dir nil) '(shell-pop-autocd-to-working-dir nil)
'(vc-annotate-background nil) '(vc-annotate-background nil)