This commit is contained in:
Ivan Malison 2014-12-12 04:34:07 -08:00
parent 34b5b21f99
commit 5d0eca62d7

View File

@ -406,11 +406,12 @@ The current directory is assumed to be the project's root otherwise."
(use-package ace-isearch (use-package ace-isearch
:ensure t :ensure t
:disabled t ;; I just don't really use this much
:config :config
(progn (progn
(global-ace-isearch-mode +1) (global-ace-isearch-mode +1)
(setq ace-isearch-use-function-from-isearch nil) (setq ace-isearch-use-function-from-isearch nil)
(setq ace-isearch-input-idle-delay .25))) (setq ace-isearch-input-idle-delay 1)))
(use-package flycheck (use-package flycheck
:ensure t :ensure t
@ -436,6 +437,8 @@ The current directory is assumed to be the project's root otherwise."
(progn (progn
(add-hook 'prog-mode-hook (lambda () (rainbow-delimiters-mode t))))) (add-hook 'prog-mode-hook (lambda () (rainbow-delimiters-mode t)))))
(use-package diff-hl :ensure t)
(use-package magit (use-package magit
:ensure t :ensure t
:commands magit-status :commands magit-status
@ -462,8 +465,13 @@ The current directory is assumed to be the project's root otherwise."
(use-package company (use-package company
:ensure t :ensure t
:commands company-mode :commands company-mode
:bind (("C-\\" . company-complete))
:config :config
(diminish 'company-mode) (progn
(setq company-idle-delay .25)
(global-company-mode)
(add-to-list 'company-backends 'mu4e-contacts-company)
(diminish 'company-mode))
:init :init
(add-hook 'prog-mode-hook (lambda () (company-mode t)))) (add-hook 'prog-mode-hook (lambda () (company-mode t))))
@ -750,6 +758,20 @@ The current directory is assumed to be the project's root otherwise."
;; show images ;; show images
(setq mu4e-show-images t) (setq mu4e-show-images t)
(defun imalison:mu4e-startup ()
(let ((buffer-existed (get-buffer mu4e~main-buffer-name))
(inhibit-read-only t)
(buffer (get-buffer-create mu4e~main-buffer-name)))
(switch-to-buffer buffer)
(mu4e-main-mode)
(unless buffer-existed
(insert (format "mu4e: --- %s" (documentation major-mode))))))
;; Don't use the default mu4e start screen
(defun mu4e ()
(interactive)
(mu4e~start 'imalison:mu4e-startup))
;; use imagemagick, if available ;; use imagemagick, if available
(when (fboundp 'imagemagick-register-types) (when (fboundp 'imagemagick-register-types)
(imagemagick-register-types)) (imagemagick-register-types))
@ -974,6 +996,7 @@ The current directory is assumed to be the project's root otherwise."
:commands ido-mode :commands ido-mode
:config :config
(progn (progn
(setq ido-create-new-buffer 'always)
(ido-everywhere 1) (ido-everywhere 1)
(setq ido-enable-flex-matching t) (setq ido-enable-flex-matching t)
(use-package flx :ensure t) (use-package flx :ensure t)
@ -994,8 +1017,7 @@ The current directory is assumed to be the project's root otherwise."
(use-package ido-vertical-mode (use-package ido-vertical-mode
:ensure t :ensure t
:config (ido-vertical-mode 1)) :config (ido-vertical-mode 1))
(use-package flx-ido :ensure t) (use-package flx-ido :ensure t)))
(ido-ubiquitous-mode 1)))
(if (and (boundp 'use-ido) use-ido) (ido-mode)) (if (and (boundp 'use-ido) use-ido) (ido-mode))
@ -1005,6 +1027,8 @@ The current directory is assumed to be the project's root otherwise."
(setq edebug-trace t) (setq edebug-trace t)
(use-package macrostep :ensure t)
(use-package paredit (use-package paredit
:ensure t) :ensure t)