Make xterm-kitty into a real terminal initialization handler

1 files changed, 12 insertions, 14 deletions

diff --git a/init.el b/init.el
index 739b9b0..8f8b26f 100644
--- a/init.el
+++ b/init.el
@@ -82,22 +82,20 @@
 (use-package s)
 (use-package dash)
 
-(use-package xterm-kitty
+(use-package term/xterm-kitty
   :init
   (setq xterm-kitty-modifiers-alist '((1 . shift) (2 . alt) (4 . control) (32 . super) (16 . hyper) (8 . meta)))
-  :config
-  (xterm-kitty-add)
-  (when xterm-kitty-in-use
-    (defun ravi/get-rid-of-xterm-key-translations ()
-      (mapcar (lambda (k) (define-key local-function-key-map (vector k) nil))
-              '(tab delete return escape))
-      ;; Manually disambiguate between DEL=backspace and delete keys
-      (bind-key "C-DEL" #'backward-kill-word)
-      (bind-key "C-<delete>" #'kill-word)
-      (bind-key "<delete>" #'delete-forward-char))
-    (add-hook 'terminal-init-xterm-hook 'ravi/get-rid-of-xterm-key-translations))
-  :ensure nil
-  :load-path (lambda () (ravi/emacs-file "lisp")))
+  (defun ravi/get-rid-of-xterm-key-translations ()
+    (message "Getting rid of xterm key translations")
+    (mapcar (lambda (k) (define-key local-function-key-map (vector k) nil))
+            '(tab delete return escape))
+    ;; Manually disambiguate between DEL=backspace and delete keys
+    (define-key local-function-key-map (kbd "C-DEL") #'backward-kill-word)
+    (define-key local-function-key-map (kbd "C-<delete>") #'kill-word)
+    (define-key local-function-key-map (kbd "<delete>") #'delete-forward-char))
+  (add-hook 'terminal-init-xterm-kitty-hook #'ravi/get-rid-of-xterm-key-translations)
+  ;; Don't defer since we will use xterm-kitty-make-binding-sequence elsewhere
+  :ensure nil)
 
 (require 's)
 (require 'ravi-ergodox-mode)