wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

Fix breakage due to use-package.

Browse Source
This commit is contained in:
Ivan Malison 2015-03-25 19:37:55 -07:00
parent 4b16a6f7e8
commit 6739eb0601
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dotfiles/emacs.d/init.el
View File

@ -74,7 +74,10 @@
(package-initialize) (package-initialize)
(ensure-packages-installed '(epl use-package)) (ensure-packages-installed '(epl use-package))
(require 'use-package)
(eval-when-compile (require 'use-package)) ;; use-package is only needed at compile time.
(require 'diminish)
(require 'bind-key)
(use-package benchmark-init (use-package benchmark-init
:ensure t :ensure t
@ -394,8 +397,8 @@ The current directory is assumed to be the project's root otherwise."
(use-package yasnippet (use-package yasnippet
:ensure t :ensure t
:defer 5
:commands (yas-global-mode) :commands (yas-global-mode)
:idle (yas-global-mode)
:config :config
(progn (progn
(diminish 'yas-minor-mode) (diminish 'yas-minor-mode)
@ -555,12 +558,13 @@ The current directory is assumed to be the project's root otherwise."
(use-package smooth-scroll (use-package smooth-scroll
:ensure t :ensure t
:init :demand t
:commands (smooth-scroll-mode)
:config
(progn (progn
(smooth-scroll-mode) (smooth-scroll-mode)
(setq smooth-scroll/vscroll-step-size 8)) (setq smooth-scroll/vscroll-step-size 12)
:config (diminish 'smooth-scroll-mode)))
(diminish 'smooth-scroll-mode))
(use-package string-inflection (use-package string-inflection
:ensure t :ensure t
@ -593,10 +597,10 @@ The current directory is assumed to be the project's root otherwise."
(use-package edit-server (use-package edit-server
:ensure t :ensure t
:commands edit-server-start :commands edit-server-start
:idle (edit-server-start)
:config :config
(progn (progn
(setq edit-server-new-frame nil))) (setq edit-server-new-frame nil)
(edit-server-start)))
(use-package jabber (use-package jabber
:ensure t :ensure t
@ -634,14 +638,15 @@ The current directory is assumed to be the project's root otherwise."
(progn (progn
(unbind-key "C-c C-f" org-mode-map) (unbind-key "C-c C-f" org-mode-map)
(setq helm-org-headings-fontify t) (setq helm-org-headings-fontify t)
;; Enable appointment notifications. ;; Enable appointment notifications.
(defadvice org-agenda-to-appt (before wickedcool activate) ;; (defadvice org-agenda-to-appt (before wickedcool activate)
"Clear the appt-time-msg-list." ;; "Clear the appt-time-msg-list."
(setq appt-time-msg-list nil)) ;; (setq appt-time-msg-list nil))
(appt-activate) ;; (appt-activate)
(defun org-agenda-to-appt-no-message () ;; (defun org-agenda-to-appt-no-message ()
(suppress-messages (org-agenda-to-appt))) ;; (suppress-messages (org-agenda-to-appt)))
(run-at-time "00:00" 60 'org-agenda-to-appt-no-message) ;; (run-at-time "00:00" 60 'org-agenda-to-appt-no-message)
(defun org-archive-if (condition-function) (defun org-archive-if (condition-function)
(if (funcall condition-function) (if (funcall condition-function)
@ -1077,7 +1082,7 @@ marking if it still had that."
(use-package sauron (use-package sauron
:ensure t :ensure t
:defer t :defer 5
:commands (sauron-start sauron-start-hidden) :commands (sauron-start sauron-start-hidden)
:init :init
(progn (progn
@ -1089,6 +1094,7 @@ marking if it still had that."
(makunbound 'dbus-path-emacs))) (makunbound 'dbus-path-emacs)))
:config :config
(progn (progn
(sauron-start-hidden)
;; This should really check (featurep 'dbus) but for some reason ;; This should really check (featurep 'dbus) but for some reason
;; this is always true even if support is not there. ;; this is always true even if support is not there.
(setq sauron-prio-sauron-started 2) (setq sauron-prio-sauron-started 2)
@ -1114,9 +1120,7 @@ marking if it still had that."
(funcall handler origin priority message properties))) (funcall handler origin priority message properties)))
;; Prefering alert.el for now ;; (add-hook 'sauron-event-added-functions 'sauron:dispatch-notify) ;; Prefering alert.el for now ;; (add-hook 'sauron-event-added-functions 'sauron:dispatch-notify)
(sauron-start-hidden) (sauron-start-hidden)
(add-hook 'sauron-event-added-functions 'sauron-alert-el-adapter)) (add-hook 'sauron-event-added-functions 'sauron-alert-el-adapter)))
:idle (sauron-start-hidden)
:idle-priority 3)
(use-package screenshot :ensure t) (use-package screenshot :ensure t)