diff --git a/.emacs.d/init.el b/.emacs.d/init.el index dfb7577..b30679a 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -273,7 +273,10 @@ ("M-n" . forward-paragraph))) ;;;; external packages (required) +(use-package delight :ensure) + (use-package company :ensure :demand + :delight :bind ("" . company-manual-begin) :config (global-company-mode) @@ -305,8 +308,7 @@ ("^~/Programs/" ":Prog:") ("^:Doc:WPI/" ":WPI:") ("^/sshx:ccc:" ">ccc:") - ("^>ccc:/home/asgoldsmith" ":>ccc:~")) - rm-blacklist '(" company" " Undo-Tree" " ivy" " 80col"))) + ("^>ccc:/home/asgoldsmith" ":>ccc:~")))) (use-package avy :ensure :config @@ -322,13 +324,17 @@ :bind (("C-s" . swiper) ("C-r" . swiper) ("C-c C-r" . ivy-resume) - :map swiper-map ("C-r" . ivy-previous-line-or-history) + :map swiper-map (("C-r" . ivy-previous-line-or-history) + ("M-," . swiper-mc)) :map ivy-minibuffer-map ("C-'" . ivy-avy)) :init (bind-key "C-S-s" 'isearch-forward) (bind-key "C-S-r" 'isearch-backward) :config - (ivy-mode 1) + (use-package ivy :ensure + :delight + :config + (ivy-mode 1)) (defun ivy-backward-delete-char () "Forward to `backward-delete-char'. Do less dumb things with directories @@ -381,6 +387,7 @@ :bind ("M-S-p" . ace-window)) (use-package undo-tree :ensure + :delight :config (bind-key "M-/" 'undo-tree-visualize) (global-undo-tree-mode) @@ -424,6 +431,7 @@ :bind (:map outline-minor-mode-map ("M-" . outline-cycle))) (use-package column-enforce-mode :ensure + :delight :config :hook prog-mode) @@ -528,6 +536,7 @@ circe-default-part-message "")) (use-package dtrt-indent + :delight :config (dtrt-indent-global-mode 1)) @@ -561,12 +570,10 @@ (use-package projectile :bind (:map projectile-mode-map (("C-S-z" . projectile-compile-project) ("C-c p" . projectile-command-map))) - + :delight '(:eval (if (file-remote-p default-directory) + " P" + (format " P[%s]" (projectile-project-name)))) :config - (setq projectile-mode-line - '(:eval (if (file-remote-p default-directory) - " P" - (format " P[%s]" (projectile-project-name))))) (use-package counsel-projectile :ensure)) (use-package scad-mode @@ -660,6 +667,7 @@ (call-interactively 'company-yasnippet))) (use-package highlight-indent-guides + :delight :config :hook (prog-mode . highlight-indent-guides-mode))