From ad7d87c4c15ad9ecef90b24f8782aac25082dfe9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Oct 2016 12:12:18 -0400 Subject: [PATCH] update spacemacs --- emacs.d | 2 +- spacemacs | 45 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/emacs.d b/emacs.d index 9f9faa4..b7e51d7 160000 --- a/emacs.d +++ b/emacs.d @@ -1 +1 @@ -Subproject commit 9f9faa404e3dec3e08cc73cf7b5a0439fc309800 +Subproject commit b7e51d70aa3fb81df2da6dc16d9652a002ba5e6b diff --git a/spacemacs b/spacemacs index ea46f92..741b309 100644 --- a/spacemacs +++ b/spacemacs @@ -33,7 +33,6 @@ scala latex finance - lua ; for lean (mu4e :variables mu4e-installation-path "/var/run/current-system/sw/share/emacs/site-lisp/mu4e") ) ;; List of additional packages that will be installed without being @@ -191,12 +190,32 @@ before layers configuration." (when (fboundp 'imagemagick-register-types) (imagemagick-register-types)) (setq mu4e-html2text-command "elinks -dump") + + (setq evil-in-single-undo t) ) -(defun dotspacemacs/config () - "Configuration function. - This function is called at the very end of Spacemacs initialization after -layers configuration." + +(defun dotspacemacs/user-init () + "Initialization function for user code. +It is called immediately after `dotspacemacs/init', before layer configuration +executes. + This function is mostly useful for variables that need to be set +before packages are loaded. If you are unsure, you should try in setting them in +`dotspacemacs/user-config' first." + ) + +(defun dotspacemacs/user-config () + "Configuration function for user code. +This function is called at the very end of Spacemacs initialization after +layers configuration. +This is the place where most of your configurations should be done. Unless it is +explicitly specified that a variable should be set before a package is loaded, +you should place your code here." + + (setq lean-rootdir "/home/gebner/lean") + (when (file-exists-p lean-rootdir) + (setq load-path (cons (concat lean-rootdir "/src/emacs") load-path)) + (require 'lean-mode)) ) ;; Do not write anything past this comment. This is where Emacs will @@ -214,15 +233,19 @@ layers configuration." ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(ahs-case-fold-search nil) - '(ahs-default-range (quote ahs-range-whole-buffer)) - '(ahs-idle-interval 0.25) + '(ahs-case-fold-search nil t) + '(ahs-default-range (quote ahs-range-whole-buffer) t) + '(ahs-idle-interval 0.25 t) '(ahs-idle-timer 0 t) - '(ahs-inhibit-face-list nil) - '(browse-url-browser-function 'browse-url-xdg-open) + '(ahs-inhibit-face-list nil t) + '(browse-url-browser-function (quote browse-url-xdg-open)) + '(flycheck-display-errors-function (quote flycheck-display-error-messages-unless-error-list)) '(ledger-post-account-alignment-column 2) '(org-pretty-entities t) '(org-startup-with-latex-preview t) + '(package-selected-packages + (quote + (which-key vdirel use-package toc-org spaceline paradox org-plus-contrib neotree mwim ledger-mode hl-todo highlight-indentation helm-projectile helm-company helm-ag git-link expand-region evil-unimpaired ensime sbt-mode dumb-jump diff-hl column-enforce-mode aggressive-indent ace-window auctex anzu smartparens undo-tree flycheck yasnippet helm helm-core ht projectile magit magit-popup git-commit with-editor async dash ws-butler window-numbering volatile-highlights vi-tilde-fringe uuidgen spinner spacemacs-theme solarized-theme smeargle scala-mode restart-emacs rainbow-delimiters quelpa powerline popwin pkg-info pcre2el orgit org-vcard org-projectile org-present org-pomodoro org-download org-bullets open-junk-file noflet mu4e-alert move-text mmm-mode magit-gitflow macrostep lua-mode lorem-ipsum linum-relative link-hint info+ indent-guide ido-vertical-mode hydra hungry-delete htmlize highlight-parentheses highlight-numbers help-fns+ helm-themes helm-swoop helm-mode-manager helm-make helm-gitignore helm-flx helm-descbinds helm-c-yasnippet google-translate golden-ratio gnuplot gitconfig-mode gitattributes-mode git-timemachine git-messenger git-gutter-fringe git-gutter-fringe+ flycheck-pos-tip flycheck-ledger flx-ido fill-column-indicator fancy-battery f eyebrowse exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu elisp-slime-nav diminish define-word dash-functional company-statistics company-auctex clean-aindent-mode bind-key auto-yasnippet auto-highlight-symbol auto-compile auctex-latexmk adaptive-wrap ace-link ace-jump-helm-line ac-ispell))) '(paradox-github-token t) '(preview-default-preamble (quote @@ -230,7 +253,7 @@ layers configuration." ("," . preview-default-option-list) "]{preview}[2004/11/05]" "\\PreviewEnvironment{prooftree}"))) '(preview-scale-function 1.2) - '(ring-bell-function (quote ignore) t) + '(ring-bell-function (quote ignore)) '(scala-indent:align-forms t) '(scala-indent:align-parameters t) '(scala-indent:default-run-on-strategy scala-indent:operator-strategy))