diff --git a/spacemacs b/spacemacs index 9c23bb5..627d63e 100644 --- a/spacemacs +++ b/spacemacs @@ -25,6 +25,8 @@ shell-default-term-shell "/usr/local/bin/fish") shell-scripts ruby + php + python ;; syntax-checking themes-megapack version-control @@ -47,7 +49,7 @@ ;; List of additional packages that will be installed without 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'. + ;; configuration in `dotspacemacs/user-config'. dotspacemacs-additional-packages '() ;; A list of packages and/or extensions that will not be install and loaded. dotspacemacs-excluded-packages '() @@ -171,7 +173,7 @@ before layers configuration." (add-to-list 'default-frame-alist '(width . 115)) ) -(defun dotspacemacs/config () +(defun dotspacemacs/user-config () "Configuration function. This function is called at the very end of Spacemacs initialization after layers configuration." @@ -181,11 +183,16 @@ layers configuration." (modify-syntax-entry ?- "w" table) (with-syntax-table table ad-do-it))) + (evil-set-initial-state 'term-mode 'emacs) (add-hook 'term-mode-hook (lambda () (make-local-variable 'scroll-margin) (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 @@ -207,8 +214,9 @@ layers configuration." '(custom-safe-themes (quote ("614f8478963ec8caac8809931c9d00f670e4519388c02f71d9d27b66d5741a7f" default))) - '(fci-rule-color "#37474f" t) + '(fci-rule-color "#37474f") '(hl-sexp-background-color "#1c1f26") + '(python-indent-offset 2) '(ring-bell-function (quote ignore) t) '(shell-pop-autocd-to-working-dir nil) '(vc-annotate-background nil)