                       version-control-diff-tool 'diff-hl
                       version-control-global-margin t)
      xkcd
+     yaml
      ;; Custom layers
      )
    ;; List of additional packages that will be installed without being

  (require 'my-org)
  (require 'my-mu4e)
  (require 'my-calendar)
  ;;
  ;; Set custom file location instead of using this file
  (setq custom-file "~/.spacemacs.d/custom.el")
  (if (file-readable-p custom-file)
      (load-file custom-file))
  ;;
  ;; END: `dotspacemacs/user-config'
  )


  It is called immediately after `dotspacemacs/init'.
  You are free to put almost any user code here.  The exception is
  org related code, which should be placed in `dotspacemacs/user-config'."

  ;; Helm uses Tramp which tries to figure out some SSH/DNS settings at
  ;; startup.  However, the ISP may redirect non-existing addresses to
  ;; their own servers, which causes long timeouts and blocks the startup.
