Merge branch 'master' of tesuji.6.orbekk.com:/storage/projects/dotfiles

1 files changed, 3 insertions, 2 deletions

diff --git a/spacemacs b/spacemacs
index 3223e41..703f9af 100644
--- a/spacemacs
+++ b/spacemacs
@@ -28,13 +28,13 @@ values."
      emacs-lisp
      shell
      c-c++
-     semantic
+     ;; semantic
      haskell
      html
      javascript
      markdown
      haskell
-     git
+     ;; git
      markdown
      org
      ;; (shell :variables
@@ -220,6 +220,7 @@ layers configuration. You are free to put any user code."
    vc-follow-symlinks nil
    web-mode-code-indent-offset 2)
   (nyan-mode)
+  (load-file "~/.spacemacs.local")
   )
 ;; Do not write anything past this comment. This is where Emacs will
 ;; auto-generate custom variable definitions.