From fd17b02d35df8238dd8cb9afac269cd5daa24cfd Mon Sep 17 00:00:00 2001 From: Valentin Gehrke Date: Wed, 11 Oct 2017 12:54:14 +0200 Subject: [PATCH] Delight minor modes --- emacs/.emacs.d/init.el | 46 +++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 6162bfc..fb67176 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -134,6 +134,10 @@ ; :demand t ; :config '(my/shackle-rules)) +(use-package delight + :ensure t + :demand t) + (use-package let-alist :ensure t :demand t) @@ -236,25 +240,27 @@ (use-package projectile :ensure t :demand t - :config (progn - (projectile-global-mode t) - (setq projectile-completion-system 'ivy))) + :delight '(:eval (concat " Project[" (projectile-project-name) "]")) + :config + (projectile-global-mode t) + (setq projectile-completion-system 'ivy)) ;; Auto-Complete (use-package auto-complete :ensure t :demand t - :config (progn - (require 'auto-complete-config) - (setq ac-sources '(ac-source-filename - ac-source-functions - ac-source-yasnippet - ac-source-variables - ac-source-symbols - ac-source-features - ac-source-words-in-all-buffer - ac-source-dictionary)) - (global-auto-complete-mode))) + :delight + :config + (require 'auto-complete-config) + (setq ac-sources '(ac-source-filename + ac-source-functions + ac-source-yasnippet + ac-source-variables + ac-source-symbols + ac-source-features + ac-source-words-in-all-buffer + ac-source-dictionary)) + (global-auto-complete-mode)) ;; folding (use-package origami @@ -273,6 +279,7 @@ (use-package ivy :ensure t :demand t + :delight :config (ivy-mode 1) (setq ivy-use-virtual-buffers t) @@ -326,6 +333,7 @@ (use-package yasnippet :ensure t :demand t + :delight yas-minor-mode :config (yas-global-mode 1)) ;; avy - Disabled because it makes emacs laggy :( @@ -346,6 +354,10 @@ :config (evil-set-initial-state 'git-commit-mode 'insert)) +;; Undo-Tree +(use-package undo-tree + :delight) + ;; Easy terminal (setq my/default-shell (or (executable-find "zsh") (executable-find "bash"))) @@ -520,3 +532,9 @@ ; (setq p2 (point))) ; (setq hexStr (buffer-substring-no-properties p1 p2)) ; (message "The hex number is: '%s' '%d' '%d'" hexStr p1 p2))) + +;; Load local emacs settings + +(let ((local-config (concat user-emacs-directory "init.local"))) + (when (file-exists-p (concat local-config ".el")) + (load local-config)))