From 1f08a7776cb2fba23cae86937818b5d8e3494ec5 Mon Sep 17 00:00:00 2001 From: Miquel Sabaté Solà Date: Wed, 22 Mar 2017 15:08:00 +0100 Subject: emacs: fixed which-key configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miquel Sabaté Solà --- emacs/custom.el | 2 +- emacs/init.html | 109 +++++++++++++++++++++++++++++--------------------------- emacs/init.org | 7 ++-- 3 files changed, 62 insertions(+), 56 deletions(-) diff --git a/emacs/custom.el b/emacs/custom.el index 8a463a0..87fb543 100644 --- a/emacs/custom.el +++ b/emacs/custom.el @@ -15,7 +15,7 @@ '(markdown-command "/usr/bin/markdown-calibre") '(package-selected-packages (quote - (vue-mode coffee-mode json-reformat erc-hl-nicks emoji-cheat-sheet-plus helm-circe htmlize cmake-mode websocket markdown-mode go-mode magit evil-leader evil helm projectile writeroom-mode org-eldoc evil-commentary yasnippet yaml-mode which-key web-mode wc-mode use-package terraform-mode smart-tabs-mode slim-mode scss-mode rainbow-delimiters php-mode org-evil olivetti mu4e-alert mmm-jinja2 markdown-preview-mode helm-projectile helm-ag go-eldoc go-add-tags flycheck expand-region evil-surround evil-org evil-numbers evil-mu4e evil-magit evil-args dockerfile-mode disable-mouse default-text-scale crux cmake-font-lock ag)))) + (rust-mode vue-mode coffee-mode json-reformat erc-hl-nicks emoji-cheat-sheet-plus helm-circe htmlize cmake-mode websocket markdown-mode go-mode magit evil-leader evil helm projectile writeroom-mode org-eldoc evil-commentary yasnippet yaml-mode which-key web-mode wc-mode use-package terraform-mode smart-tabs-mode slim-mode scss-mode rainbow-delimiters php-mode org-evil olivetti mu4e-alert mmm-jinja2 markdown-preview-mode helm-projectile helm-ag go-eldoc go-add-tags flycheck expand-region evil-surround evil-org evil-numbers evil-mu4e evil-magit evil-args dockerfile-mode disable-mouse default-text-scale crux cmake-font-lock ag)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/emacs/init.html b/emacs/init.html index 233ad64..f64093b 100644 --- a/emacs/init.html +++ b/emacs/init.html @@ -4,7 +4,7 @@ mssola's GNU Emacs configuration - + @@ -776,7 +776,7 @@ require it here on the very top.
-
(use-package diminish
+
(use-package diminish
   :ensure t)
@@ -794,7 +794,7 @@ Ayo silver!
-
(use-package ag
+
(use-package ag
   :ensure t
   :config
 
@@ -816,12 +816,12 @@ Then, for keeping up with my projects I use the Projectile + Helm combination.
 
 

 
-
(use-package projectile
+
(use-package projectile
   :ensure t
   :config
   (projectile-mode 1))
 
-(use-package helm
+(use-package helm
   :ensure t
   :config
   (setq projectile-completion-system 'helm)
@@ -853,10 +853,10 @@ Then, for keeping up with my projects I use the Projectile + Helm combination.
   (define-key helm-map (kbd "C-j") 'helm-next-line)
   (define-key helm-map (kbd "C-k") 'helm-previous-line)
 
-  (use-package helm-ag
+  (use-package helm-ag
     :ensure t))
 
-(use-package helm-projectile
+(use-package helm-projectile
   :ensure t
   :config
   (helm-projectile-on)
@@ -969,10 +969,10 @@ extension. This works with lots of languages with proper glue code.
 
 

 
-
(use-package let-alist
+
(use-package let-alist
   :ensure t)
 
-(use-package flycheck
+(use-package flycheck
   :ensure t
   :diminish
   :config
@@ -995,7 +995,7 @@ with your editor, you have to increase/decrease the fonts. I use the
 
 

 
-
(use-package default-text-scale
+
(use-package default-text-scale
   :ensure t
   :config
   (global-set-key (kbd "C-+") 'default-text-scale-increase)
@@ -1012,7 +1012,7 @@ supports it).
 
 

 
-
(use-package rainbow-delimiters
+
(use-package rainbow-delimiters
   :ensure t)
 

 

@@ -1023,7 +1023,7 @@ I never use the mouse.
 
 

 
-
(use-package disable-mouse
+
(use-package disable-mouse
   :ensure t
   :config
   (global-disable-mouse-mode)
@@ -1039,8 +1039,11 @@ commands for the current chord as a list.
 
 

 
-
(use-package which-key
-  :ensure t)
+
(use-package which-key
+  :ensure t
+  :diminish which-key-mode
+  :config
+  (which-key-mode))
 

 

 
@@ -1051,7 +1054,7 @@ this, we have wc-mode.
 
 

 
-
(use-package wc-mode
+
(use-package wc-mode
   :ensure t)
 

 

@@ -1063,7 +1066,7 @@ that often, but it's cool to have a distraction-free screen from time to time.
 
 

 
-
(use-package writeroom-mode
+
(use-package writeroom-mode
   :ensure t)
 

 

@@ -1076,7 +1079,7 @@ most of my uses, it's convenient to have this tool anyways.
 
 

 
-
(use-package expand-region
+
(use-package expand-region
   :ensure t
   :config
 
@@ -1128,7 +1131,7 @@ remember some of these snippets, I've mapped , h to
 
 

 
-
(use-package yasnippet
+
(use-package yasnippet
   :ensure t
   :diminish yas-minor-mode
   :init (yas-global-mode)
@@ -1288,7 +1291,7 @@ Now make sure that Evil is installed, and call the relevant configuration functi
 
 

 
-
(use-package evil
+
(use-package evil
   :ensure t
   :config
 
@@ -1318,7 +1321,7 @@ Vim into Evil.
 
 

 
-
(use-package evil-leader
+
(use-package evil-leader
   :ensure t
   :config
   (global-evil-leader-mode)
@@ -1345,7 +1348,7 @@ having double quotes with single quotes in a single command).
 
 

 
-
(use-package evil-surround
+
(use-package evil-surround
   :ensure t
   :config
   (global-evil-surround-mode 1))
@@ -1361,7 +1364,7 @@ the current line, regardless of the programming language.
 
 

 
-
(use-package evil-commentary
+
(use-package evil-commentary
   :ensure t
   :config
   (evil-commentary-mode t))
@@ -1377,7 +1380,7 @@ respectively.
 
 

 
-
(use-package evil-args
+
(use-package evil-args
   :ensure t
   :config
   ; Configuration taken from the documentation of evil-args.
@@ -1403,7 +1406,7 @@ into Evil: C-a for increasing a number, and
 
 

 
-
(use-package evil-numbers
+
(use-package evil-numbers
   :ensure t
   :config
   (define-key evil-normal-state-map (kbd "C-a") 'evil-numbers/inc-at-pt)
@@ -1423,7 +1426,7 @@ certainly useful for some common tasks (I guess that I still need some learning)
 
 

 
-
(use-package magit
+
(use-package magit
   :ensure t
   :config
 

@@ -1476,7 +1479,7 @@ And repair some key bindings from Evil mode.
 
(with-eval-after-load 'evil-leader
   (evil-leader/set-key "s" 'magit-status)
 
-  (use-package evil-magit
+  (use-package evil-magit
     :ensure t
     :config
 
@@ -1824,7 +1827,7 @@ I want desktop notifications when receiving email.
 
 

 
-
(use-package mu4e-alert
+
(use-package mu4e-alert
   :ensure t
   :config
 
@@ -1840,7 +1843,7 @@ I want desktop notifications when receiving email.
 
 ; Evil mode in mu4e
 (with-eval-after-load 'evil
-  (use-package evil-mu4e
+  (use-package evil-mu4e
     :ensure t
     :config
 
@@ -1984,7 +1987,7 @@ blocks to be converted into HTML as well, so we can properly colorize it).
 
 

 
-
(use-package htmlize
+
(use-package htmlize
   :ensure t)
 

 

@@ -2191,7 +2194,7 @@ I'm giving ERC a chance. First of all, I'm setting up basic stuff.
 
 

 
-
(use-package erc
+
(use-package erc
   :config
 
   (erc-track-mode t)
@@ -2234,7 +2237,7 @@ Use the erc-hl-nicks package, so highlight support for nicknames is
 
 

 
-
(use-package erc-hl-nicks
+
(use-package erc-hl-nicks
   :ensure t
   :init
   (with-eval-after-load 'erc
@@ -2436,18 +2439,18 @@ And now my Go configuration. This includes stuff like the usage of goimpor
   (flyspell-prog-mode)
 
   ; eldoc support
-  (use-package go-eldoc
+  (use-package go-eldoc
     :ensure t
     :config
     (require 'go-eldoc))
 
-  (use-package go-add-tags
+  (use-package go-add-tags
     :ensure t
     :config
     (evil-leader/set-key "t" 'go-add-tags)))
 
 ;; Go
-(use-package go-mode
+(use-package go-mode
   :ensure t
   :pin melpa-stable
   :config
@@ -2471,7 +2474,7 @@ usings tabs for indentation (C, C++ and Go).
 
 

 
-
(use-package smart-tabs-mode
+
(use-package smart-tabs-mode
   :ensure t
   :config
   (smart-tabs-add-language-support golang go-mode-hook
@@ -2489,7 +2492,7 @@ usings tabs for indentation (C, C++ and Go).
 

 
 
;; Markdown mode with preview mode in the browser.
-(use-package markdown-mode
+(use-package markdown-mode
   :ensure t
   :config
 
@@ -2499,14 +2502,14 @@ usings tabs for indentation (C, C++ and Go).
 
   ; Preview mode does its things through websockets, so it's a requirement.
   ; After that, we can safely require it.
-  (use-package websocket
+  (use-package websocket
     :ensure t
     :config
-    (use-package markdown-preview-mode
+    (use-package markdown-preview-mode
       :ensure t)))
 
 ; YAML
-(use-package yaml-mode
+(use-package yaml-mode
   :ensure t
   :config
 
@@ -2525,17 +2528,17 @@ Slim and SCSS.
 
 

 
-
(use-package slim-mode
+
(use-package slim-mode
   :ensure t)
 
-(use-package scss-mode
+(use-package scss-mode
   :ensure t
   :config
 
   (setq scss-compile-at-save nil)
   (add-hook 'yaml-mode-hook 'warnings-mode-hook))
 
-(use-package coffee-mode
+(use-package coffee-mode
   :ensure t)
 

 

@@ -2547,10 +2550,10 @@ bundle of features which are interesting for web-related stuff.
 
 

 
-
(use-package php-mode
+
(use-package php-mode
   :ensure t)
 
-(use-package web-mode
+(use-package web-mode
   :ensure t
   :config
 
@@ -2569,7 +2572,7 @@ bundle of features which are interesting for web-related stuff.
               (setq js-indent-level 2)
               (rainbow-delimiters-mode 1)))
 
-  (use-package vue-mode
+  (use-package vue-mode
     :ensure t
     :config
     (setq mmm-submode-decoration-level 0))
@@ -2596,7 +2599,7 @@ can be frustrating without proper formatting.
 
 

 
-
(use-package json-reformat
+
(use-package json-reformat
   :ensure t)
 

 

@@ -2612,7 +2615,7 @@ CMake for y'all.
 
 

 
-
(use-package cmake-mode
+
(use-package cmake-mode
   :ensure t
   :config
 
@@ -2622,7 +2625,7 @@ CMake for y'all.
          '(("\\.cmake\\'" . cmake-mode))
          auto-mode-alist))
 
-  (use-package cmake-font-lock
+  (use-package cmake-font-lock
     :ensure t
     :config
 
@@ -2638,19 +2641,19 @@ now because it's buggy, but I still have hope.
 
 

 
-
(use-package dockerfile-mode
+
(use-package dockerfile-mode
   :ensure t
   :config
 
   (add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode)))
 
-(use-package terraform-mode
+(use-package terraform-mode
   :ensure t
   :config
 
   (terraform-format-on-save-mode))
 
-(use-package hcl-mode
+(use-package hcl-mode
   :ensure t)
 
 ;(use-package salt-mode
@@ -2724,7 +2727,7 @@ too many things into my leader and these shortcuts look sensible to me).
 
 

 
-
(use-package crux
+
(use-package crux
   :ensure t
   :config
 
@@ -2789,7 +2792,7 @@ along with this program.  If not, see <
 

 
diff --git a/emacs/init.org b/emacs/init.org
index 6a39209..07d1efe 100644
--- a/emacs/init.org
+++ b/emacs/init.org
@@ -649,8 +649,11 @@ chord. For this reason =which-key= was created. It will show the available
 commands for the current chord as a list.
 
 #+BEGIN_SRC elisp
-  (use-package which-key
-    :ensure t)
+(use-package which-key
+  :ensure t
+  :diminish which-key-mode
+  :config
+  (which-key-mode))
 #+END_SRC
 
 For some modes it is important to count the number of words in the text. For
-- 
cgit v1.2.3