Spacemacs extra config.

2 files changed, 11 insertions, 8 deletions

diff --git a/spacemacs b/spacemacs
index 85223e5..ff95c6f 100644
--- a/spacemacs
+++ b/spacemacs
@@ -28,18 +28,20 @@ values."
      emacs-lisp
      shell
      c-c++
+     semantic
      haskell
      html
      javascript
      markdown
-     ;; git
+     haskell
+     git
      ;; markdown
      ;; org
      ;; (shell :variables
      ;;        shell-default-height 30
      ;;        shell-default-position 'bottom)
      ;; spell-checking
-     ;; syntax-checking
+     syntax-checking
      ;; version-control
      )
    ;; List of additional packages that will be installed without being
@@ -48,7 +50,7 @@ values."
    ;; configuration in `dotspacemacs/config'.
    dotspacemacs-additional-packages '(haskell-mode)
    ;; A list of packages and/or extensions that will not be install and loaded.
-   dotspacemacs-excluded-packages '()
+   dotspacemacs-excluded-packages '(smartparens)
    ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that
    ;; are declared in a layer which is not a member of
    ;; the list `dotspacemacs-configuration-layers'. (default t)
@@ -84,8 +86,7 @@ values."
    ;; 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)
-   dotspacemacs-themes '(base16-tomorrow-dark
-                         spacemacs-dark
+   dotspacemacs-themes '(spacemacs-dark
                          spacemacs-light
                          solarized-light
                          solarized-dark
@@ -141,7 +142,7 @@ values."
    dotspacemacs-enable-paste-micro-state nil
    ;; 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
+   dotspacemacs-which-key-delay 0.2
    ;; Which-key frame position. Possible values are `right', `bottom' and
    ;; `right-then-bottom'. right-then-bottom tries to display the frame to the
    ;; right; if there is insufficient space it displays it at the bottom.
@@ -214,7 +215,9 @@ user code."
  This function is called at the very end of Spacemacs initialization after
 layers configuration. You are free to put any user code."
   (add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
-  (setq-default vc-follow-symlinks nil)
+  (setq-default
+   vc-follow-symlinks nil
+   web-mode-code-indent-offset 2)
   )
 
 ;; Do not write anything past this comment. This is where Emacs will
diff --git a/zshrc b/zshrc
index 4856cd2..e936d78 100755
--- a/zshrc
+++ b/zshrc
@@ -52,7 +52,7 @@ setopt DVORAK
 # alias ls="ls --color"
 if which gvim >/dev/null; then
   alias vi="gvim --remote"
-  alias e="gvim --remote"
+  alias e="emacsclient -n"
 fi
 alias ff="fileutil --gfs_user=gfp-reporting"
 alias diff=colordiff