From cce926d60f963ad9e45c0f0b642bcfb3eb86ee65 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Mon, 3 Feb 2020 10:54:15 +0000 Subject: Remove KBDs supporting undesired Ergodox configuration I mistakenly mapped one of my dual-function keys on my Ergodox to send Shift+CMD instead of CMD. When some of my Emacs keybindings weren't firing, I noticed that the key event they received was some like `C-S-s-` instead of say `C-s-`. As a quick fix, I duplicated each of my keybindings that relied on the CMD key to support Shift+CMD as well until I remapped the key on my Ergodox. This morning, I remapped the Shift+CMD key to CMD, so I'm bidding adieu to this code. --- emacs/.emacs.d/wpc/keybindings.el | 4 ---- emacs/.emacs.d/wpc/window-manager.el | 12 +----------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/emacs/.emacs.d/wpc/keybindings.el b/emacs/.emacs.d/wpc/keybindings.el index dfc124a469b6..53ea9683c8ec 100644 --- a/emacs/.emacs.d/wpc/keybindings.el +++ b/emacs/.emacs.d/wpc/keybindings.el @@ -41,10 +41,6 @@ (keybinding/exwm (kbd/raw 'x11 "s") #'scrot/select) -;; TODO: I need this because my Ergodox EZ sends super+shift instead of just -;; super. Remove this once I fix my Ergodox. -(keybinding/exwm "C-S-s-s" #'scrot/select) - (keybinding/exwm "" #'exwm/switch-to-exwm-buffer) (general-define-key (kbd/raw 'x11 "t") #'ts/switch-to-terminal) diff --git a/emacs/.emacs.d/wpc/window-manager.el b/emacs/.emacs.d/wpc/window-manager.el index 8eddce3555a6..51e4d49d6e7c 100644 --- a/emacs/.emacs.d/wpc/window-manager.el +++ b/emacs/.emacs.d/wpc/window-manager.el @@ -210,13 +210,8 @@ ;; Workspaces ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;; NOTE: Here I need to generate lowercase and uppercase - ;; variants of each because my Ergodox is sending capitalized - ;; variants of the keycodes to EXWM. (:key ,(kbd/raw 'workspace "l") :fn window-manager/logout) - (:key ,(kbd/raw 'workspace "L") :fn window-manager/logout) - (:key ,(kbd/raw 'workspace "i") :fn exwm/toggle-mode) - (:key ,(kbd/raw 'workspace "I") :fn exwm/toggle-mode)))) + (:key ,(kbd/raw 'workspace "i") :fn exwm/toggle-mode)))) (setq exwm-input-global-keys (->> kbds (-map (lambda (plist) @@ -428,11 +423,6 @@ Currently using super- as the prefix for switching workspaces." (key (exwm/named-workspace-kbd workspace))) (exwm-input-set-key (kbd/for 'workspace key) - handler) - ;; Note: We need to capitalize the KBD here because of the signals that my - ;; Ergodox is sending Emacs on my desktop. - (exwm-input-set-key - (kbd/for 'workspace (s-capitalize key)) handler))) (defun exwm/change-workspace (workspace) -- cgit 1.4.1