From 91155c30eae0ce91e6cd99b3233b4b1f539dab7e Mon Sep 17 00:00:00 2001
From: David Morgan <djm_uk@protonmail.com>
Date: Wed, 22 Dec 2021 12:57:21 +0000
Subject: Remove/replace keychord

---
 .emacs.d/lisp/init-git.el | 9 ++++++---
 .emacs.d/lisp/init-ui.el  | 4 ----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to '.emacs.d')

diff --git a/.emacs.d/lisp/init-git.el b/.emacs.d/lisp/init-git.el
index 63688f9..0107b3b 100644
--- a/.emacs.d/lisp/init-git.el
+++ b/.emacs.d/lisp/init-git.el
@@ -19,11 +19,16 @@
 (use-package git-timemachine)
 
 (use-package magit
-  :after key-chord
   :bind
   ("C-c g" . magit-file-dispatch)
   ("C-c M-g" . magit-dispatch)
+  ("C-c C-g u" . my/magit-set-upstream)
+  ("C-c C-g r" . my/magit-refresh-state)
   :config
+  ;; Requires the following gitconfig:
+  ;; [alias]
+  ;;   upstream = !git push -u origin HEAD
+  ;; TODO - this is useful after setting push remote, but is there a better way?
   (defun my/magit-set-upstream ()
     (interactive)
     (magit-shell-command-topdir "git upstream"))
@@ -37,8 +42,6 @@
                  (file-in-directory-p (buffer-file-name buf) (magit-toplevel)))
         (with-current-buffer buf
           (vc-refresh-state)))))
-  (key-chord-define-global "UU" 'my/magit-set-upstream)
-  (key-chord-define-global "RR" 'my/magit-refresh-state)
   :custom
   (magit-diff-refine-hunk 'all)
   (magit-diff-paint-whitespace-lines 'all)
diff --git a/.emacs.d/lisp/init-ui.el b/.emacs.d/lisp/init-ui.el
index c11bed4..cb93a7f 100644
--- a/.emacs.d/lisp/init-ui.el
+++ b/.emacs.d/lisp/init-ui.el
@@ -92,10 +92,6 @@
   :diminish
   :config (which-key-mode +1))
 
-(use-package key-chord
-  :config
-  (key-chord-mode +1))
-
 (use-package rainbow-delimiters
   :config
   (rainbow-delimiters-mode +1))
-- 
cgit 1.4.1-2-gfad0