about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2020-09-02T14·03+0100
committerWilliam Carroll <wpcarro@gmail.com>2020-09-02T14·03+0100
commitea274f924a637b3c32be0c19c961897ceacfae7c (patch)
tree27dfa2fa99ecf145bed6d5ed1e30d9af097ec585
parentd1ee51746111c2456cdd9b9f4416e2356db8e8dc (diff)
Remove KBD installations from more Elisp modules
I originally liked this pattern, but now I'd prefer to put everything in
keybindings.el.
-rw-r--r--emacs/.emacs.d/wpc/colorscheme.el16
-rw-r--r--emacs/.emacs.d/wpc/keyboard.el17
2 files changed, 0 insertions, 33 deletions
diff --git a/emacs/.emacs.d/wpc/colorscheme.el b/emacs/.emacs.d/wpc/colorscheme.el
index 8f1ad332ac69..69b3f1b153de 100644
--- a/emacs/.emacs.d/wpc/colorscheme.el
+++ b/emacs/.emacs.d/wpc/colorscheme.el
@@ -19,18 +19,10 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (require 'cycle)
-(require 'general)
 (require '>)
 (require 'cl-macs)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Constants
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defcustom colorscheme-install-kbds? t
-  "If non-nil, enable the keybindings.")
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Library
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -90,13 +82,5 @@ Cycle prev otherwise."
   (interactive)
   (colorscheme-cycle :forward? nil))
 
-;; Keybindings
-(when colorscheme-install-kbds?
-  (general-define-key
-   :prefix "<SPC>"
-   :states '(normal)
-   "Ft" #'colorscheme-next
-   "Pt" #'colorscheme-prev))
-
 (provide 'colorscheme)
 ;;; colorscheme.el ends here
diff --git a/emacs/.emacs.d/wpc/keyboard.el b/emacs/.emacs.d/wpc/keyboard.el
index 4b90b01a3385..51e53e984083 100644
--- a/emacs/.emacs.d/wpc/keyboard.el
+++ b/emacs/.emacs.d/wpc/keyboard.el
@@ -41,9 +41,6 @@
 (defcustom keyboard-install-preferences? t
   "When t, install keyboard preferences.")
 
-(defcustom keyboard-install-kbds? nil
-  "When t, install keybindings.")
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Functions
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -139,19 +136,5 @@ NOTE: This function exists because occasionally I unplug and re-plug in a
 (when keyboard-install-preferences?
   (keyboard-set-preferences))
 
-;; TODO: Define minor-mode for this.
-(when keyboard-install-kbds?
-  (general-unbind 'motion "C-i" "C-y")
-  (general-define-key
-   ;; TODO: Choose better KBDs for these that don't interfere with useful evil
-   ;; ones.
-   ;; Use C-y when you accidentally send the key-repeat too high or too low to
-   ;; be meaningful.
-   "C-y" #'keyboard-reset-key-repeat
-   "C-i" #'keyboard-inc-repeat-rate
-   "C-u" #'keyboard-dec-repeat-rate
-   "C-S-i" #'keyboard-inc-repeat-delay
-   "C-S-u" #'keyboard-dec-repeat-delay))
-
 (provide 'keyboard)
 ;;; keyboard.el ends here