From 06842692d5b3f629092fe9104cff6ba62eb625d8 Mon Sep 17 00:00:00 2001
From: David Morgan <djm_uk@protonmail.com>
Date: Wed, 1 Sep 2021 14:57:19 +0100
Subject: [PATCH] Remove most key-chords

---
 .emacs.d/lisp/init-clojure.el    | 3 ---
 .emacs.d/lisp/init-crux.el       | 3 ---
 .emacs.d/lisp/init-editor.el     | 1 -
 .emacs.d/lisp/init-kill.el       | 4 +---
 .emacs.d/lisp/init-lsp.el        | 5 -----
 .emacs.d/lisp/init-minibuffer.el | 2 --
 .emacs.d/lisp/init-navigation.el | 6 ------
 .emacs.d/lisp/init-ui.el         | 4 +---
 8 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/.emacs.d/lisp/init-clojure.el b/.emacs.d/lisp/init-clojure.el
index 0f19c15..719f2ca 100644
--- a/.emacs.d/lisp/init-clojure.el
+++ b/.emacs.d/lisp/init-clojure.el
@@ -30,7 +30,6 @@
 
 (use-package cider
   :diminish
-  :after key-chord
   :config
   (setq cider-repl-pop-to-buffer-on-connect 'display-only
         cider-repl-display-help-banner nil
@@ -44,8 +43,6 @@
         cider-repl-history-file "~/.emacs.d/cider-history"
         nrepl-log-messages t
         clojure-toplevel-inside-comment-form t)
-  (key-chord-define-global "??" 'cider-xref-fn-refs-select)
-  (key-chord-define-global "qq" 'cider-xref-fn-refs)
   (unbind-key "C-c C-l" cider-mode-map)
   :bind (:map cider-mode-map ("C-c M-l" . cider-load-file))
   :hook
diff --git a/.emacs.d/lisp/init-crux.el b/.emacs.d/lisp/init-crux.el
index 93e5802..df4ade1 100644
--- a/.emacs.d/lisp/init-crux.el
+++ b/.emacs.d/lisp/init-crux.el
@@ -3,9 +3,6 @@
 ;;; Code:
 
 (use-package crux
-  :after key-chord
-  :config
-  (key-chord-define-global "JJ" 'crux-switch-to-previous-buffer)
   :bind
   ("C-^" . crux-top-join-line)
   ("C-<backspace>" . crux-kill-line-backwards)
diff --git a/.emacs.d/lisp/init-editor.el b/.emacs.d/lisp/init-editor.el
index d1d80cb..1946b46 100644
--- a/.emacs.d/lisp/init-editor.el
+++ b/.emacs.d/lisp/init-editor.el
@@ -150,7 +150,6 @@ and file 'filename' will be opened and cursor set on line 'linenumber'"
 
 (use-package undo-tree
   :diminish
-  :after key-chord
   :config
   (global-undo-tree-mode)
   :custom
diff --git a/.emacs.d/lisp/init-kill.el b/.emacs.d/lisp/init-kill.el
index ceada0d..2cc5ac7 100644
--- a/.emacs.d/lisp/init-kill.el
+++ b/.emacs.d/lisp/init-kill.el
@@ -4,10 +4,8 @@
 ;;; Code:
 
 (use-package browse-kill-ring
-  :after key-chord
   :config
-  (browse-kill-ring-default-keybindings)
-  (key-chord-define-global "yy" 'browse-kill-ring))
+  (browse-kill-ring-default-keybindings))
 
 (use-package easy-kill
   :bind
diff --git a/.emacs.d/lisp/init-lsp.el b/.emacs.d/lisp/init-lsp.el
index 4b72759..ea4a850 100644
--- a/.emacs.d/lisp/init-lsp.el
+++ b/.emacs.d/lisp/init-lsp.el
@@ -8,7 +8,6 @@
 
 (use-package lsp-mode
   :diminish
-  :after key-chord
   :hook (clojure-mode . lsp)
   :config
   (if (eq system-type 'darwin)
@@ -34,10 +33,6 @@
         ;; user cider for indendation and completion instead
         lsp-enable-indentation nil
         lsp-completion-enable nil)
-  (key-chord-define-global "QQ" 'lsp-find-references)
-  (key-chord-define-global "PP" 'lsp-peek-find-references)
-  (key-chord-define-global "GG" 'lsp-find-definition)
-  (key-chord-define-global "DD" 'lsp-peek-find-definitions)
   :bind
   (:map lsp-ui-mode-map
         ([remap xref-find-definitions] . lsp-ui-peek-find-definitions)
diff --git a/.emacs.d/lisp/init-minibuffer.el b/.emacs.d/lisp/init-minibuffer.el
index e5c7ce6..f9d54e8 100644
--- a/.emacs.d/lisp/init-minibuffer.el
+++ b/.emacs.d/lisp/init-minibuffer.el
@@ -52,8 +52,6 @@
         (select-window (minibuffer-selected-window))
       (select-window (active-minibuffer-window))))
 
-  (key-chord-define-global "XX" 'to-and-fro-minibuffer)
-  ;(key-chord-define-global ">>" 'preview-from-outside)
   :bind (("C-M-<" . up-from-outside)
          ("C-M->" . down-from-outside)
          ("C-M-+" . preview-from-outside)
diff --git a/.emacs.d/lisp/init-navigation.el b/.emacs.d/lisp/init-navigation.el
index e483637..082a64d 100644
--- a/.emacs.d/lisp/init-navigation.el
+++ b/.emacs.d/lisp/init-navigation.el
@@ -42,15 +42,9 @@
 
 ;; TODO - which of these are useful?
 (use-package avy
-  :after key-chord
   :custom
   (avy-background t)
   (avy-style 'pre)
-  :config
-  (key-chord-define-global "LL" 'avy-goto-line)
-  (key-chord-define-global ",," 'avy-goto-char-in-line)
-  (key-chord-define-global "jj" 'avy-goto-word-1)
-  (key-chord-define-global "jk" 'avy-goto-char)
   :bind
   ("C-:" . avy-goto-char)
   ("C-'" . avy-goto-char-2)
diff --git a/.emacs.d/lisp/init-ui.el b/.emacs.d/lisp/init-ui.el
index f32e50b..c11bed4 100644
--- a/.emacs.d/lisp/init-ui.el
+++ b/.emacs.d/lisp/init-ui.el
@@ -92,11 +92,9 @@
   :diminish
   :config (which-key-mode +1))
 
-;; Other key-chords defined with in the relevant use-package calls
 (use-package key-chord
   :config
-  (key-chord-mode +1)
-  (key-chord-define-global "xx" 'execute-extended-command))
+  (key-chord-mode +1))
 
 (use-package rainbow-delimiters
   :config