chore(keybinds): replace nearly all global-set-key with general

core/siren-core-editor.el

@@ -76,15 +76,9 @@
   (xterm-mouse-mode t)
   (defun track-mouse (e))
   (setq mouse-sel-mode t)
-  (global-set-key [mouse-4] (lambda ()
-                              (interactive)
-                              (scroll-down 1)))
-  (global-set-key [mouse-5] (lambda ()
-                              (interactive)
-                              (scroll-up 1)))
-  ;; (global-set-key [mouse-4] 'scroll-down-line)
-  ;; (global-set-key [mouse-5] 'scroll-up-line)
-  )
+  (siren-general-define-key
+   "<mouse-4>" 'scroll-down-line
+   "<mouse-5>" 'scroll-up-line))
 
 ;; enabled change region case commands
 (put 'upcase-region 'disabled nil)

core/siren-core-init.el

@@ -51,6 +51,7 @@
 (require 'siren-core-packages)
 (require 'siren-core-package-overrides)
 (require 'siren-core-performance)
+(require 'siren-core-keybinds)
 (require 'siren-core-env)
 (require 'siren-core-ui)
 (require 'siren-core-editor)

core/siren-core-keybinds.el

@@ -0,0 +1,19 @@
+;;; siren-core-keybinds.el --- jimeh's Emacs Siren: Core keybinds support
+
+;;; Commentary:
+
+;; Install and configure packages for working with and managing keybinds.
+
+;;; Code:
+
+(use-package general
+  :demand t
+
+  :preface
+  (defun siren-general-define-key (&rest args)
+    "Wrap `general-define-key' in `with-eval-after-load'."
+    (with-eval-after-load 'general
+      (apply #'general-define-key args))))
+
+(provide 'siren-core-keybinds)
+;;; siren-core-keybinds.el ends here

core/siren-core-linux.el

@@ -25,7 +25,8 @@
       (set-face-attribute 'default nil :family family :height 90)))
 
 ;; Keybindinds
-(global-set-key (kbd "s-<return>") 'toggle-frame-fullscreen)
+(siren-general-define-key
+ "s-<return>" 'toggle-frame-fullscreen)
 
 ;; Set initial frame to fullscreen when Emacs starts.
 (add-to-list 'initial-frame-alist '(fullscreen . maximized))

core/siren-core-macos.el

@@ -63,8 +63,9 @@ If FRAME is nil, it defaults to the currently selected frame."
               #'siren-toggle-frame-fullscreen-advice))
 
 ;; macOS Fullscreen (requires Emacs 24.4 or later)
-(global-set-key (kbd "s-<return>") 'toggle-frame-fullscreen)
-(global-set-key (kbd "C-s-<return>") 'toggle-frame-fullscreen)
+(siren-general-define-key
+ "s-<return>" 'toggle-frame-fullscreen
+ "C-s-<return>" 'toggle-frame-fullscreen)
 
 ;; modifier keys
 ;; (setq mac-command-modifier 'super)
@@ -91,8 +92,9 @@ minutes as it's trying to reach 100,000 font size or something
 crazy."
   (interactive (list last-input-event)))
 
-(global-set-key (kbd "C-<wheel-down>") 'siren-mouse-wheel-text-scale)
-(global-set-key (kbd "C-<wheel-up>") 'siren-mouse-wheel-text-scale)
+(siren-general-define-key
+ "C-<wheel-down>" 'siren-mouse-wheel-text-scale
+ "C-<wheel-up>" 'siren-mouse-wheel-text-scale)
 
 (provide 'siren-core-macos)
 ;;; siren-core-macos.el ends here

core/siren-core-packages.el

@@ -52,8 +52,5 @@
 (if (not (fboundp 'use-package))
     (straight-use-package 'use-package))
 
-;; Make general.el keybinding helpers available.
-(use-package general)
-
 (provide 'siren-core-packages)
 ;;; siren-core-packages.el ends here

modules/core/siren-global-keybindings.el

@@ -6,7 +6,7 @@
 
 ;;; Code:
 
-(general-define-key
+(siren-general-define-key
  ;; Enable alternative to M-x.
  "C-x C-m" 'execute-extended-command
 
@@ -47,9 +47,9 @@
  ;; Rename current file and buffer
  "C-c r"  'siren-rename-file-and-buffer)
 
-;; Mac OS X specific keybindings
+;; macOS specific keybindings
 (when (eq system-type 'darwin)
-  (general-define-key
+  (siren-general-define-key
    ;; Move to beginning/end of buffer
    "s-<up>" 'beginning-of-buffer
    "s-<down>" 'end-of-buffer

modules/debugging/siren-debug-map.el

@@ -8,7 +8,7 @@
 ;;; Code:
 
 (define-prefix-command 'siren-debug-map)
-(general-define-key "C-c -" 'siren-debug-map)
+(siren-general-define-key "C-c -" 'siren-debug-map)
 
 (provide 'siren-debug-map)
 ;;; siren-debug-map.el ends here

modules/navigation/siren-anzu.el

@@ -10,6 +10,8 @@
   :general
   ("C-x C-r" 'anzu-query-replace-regexp)
   ("M-%" 'anzu-query-replace)
+  ([remap query-replace] 'anzu-query-replace)
+  ([remap query-replace-regexp] 'anzu-query-replace-regexp)
 
   :custom
   (anzu-mode-lighter "")
@@ -22,9 +24,6 @@
   (set-face-attribute 'anzu-mode-line nil
                       :foreground "yellow" :weight 'bold)
 
-  (global-set-key [remap query-replace] 'anzu-query-replace)
-  (global-set-key [remap query-replace-regexp] 'anzu-query-replace-regexp)
-
   (global-anzu-mode +1))
 
 (provide 'siren-anzu)

modules/navigation/siren-goto-symbol.el

@@ -63,9 +63,10 @@
           (add-to-list 'name-and-pos (cons (substring-no-properties name)
                                            position))))))))
 
-(global-set-key (kbd "C-t") 'siren-goto-symbol)
-(global-set-key (kbd "C-c C-t") 'siren-flush-cache-and-goto-symbol)
-(global-set-key (kbd "C-c t") #'imenu-anywhere)
+(siren-general-define-key
+ "C-t" 'siren-goto-symbol
+ "C-c C-t" 'siren-flush-cache-and-goto-symbol
+ "C-c t" #'imenu-anywhere)
 
 (provide 'siren-goto-symbol)
 ;;; siren-goto-symbol ends here.

modules/navigation/siren-move-beginning-of-line.el

@@ -32,7 +32,7 @@ Borrowed from: http://emacsredux.com/blog/2013/05/22/smarter-navigation-to-the-b
       (move-beginning-of-line 1))))
 
 ;; Use siren-move-beginning-of-line
-(global-set-key (kbd "C-a") 'siren-move-beginning-of-line)
+(siren-general-define-key "C-a" 'siren-move-beginning-of-line)
 
 (provide 'siren-move-beginning-of-line)
 ;;; siren-move-beginning-of-line.el ends here

modules/projects/siren-ecb.el

@@ -39,8 +39,9 @@
       ("\\(^\\(#\\)\\|\\(~$\\|\\.\\(elc\\|obj\\|o\\|class\\|lib\\|dll\\|a\\|so\\|cache\\)$\\)\\)" "^Icon$")
       ("^\\.\\(emacs\\|gnus\\)$")))))
 
-  (if window-system (ecb-activate))
-  (global-set-key (kbd "C-x C-p") 'ecb-toggle-ecb-windows))
+  (when window-system
+    (ecb-activate)
+    (siren-general-define-key "C-x C-p" 'ecb-toggle-ecb-windows)))
 
 (provide 'siren-ecb)
 ;;; siren-ecb.el ends here

modules/text-editing/siren-safe-change-case.el

@@ -25,8 +25,9 @@ additional ARGS passed along to `upcase-region'."
   (when (region-active-p)
     (apply #'upcase-region beg end args)))
 
-(global-set-key (kbd "C-x C-l") 'downcase-region-only)
-(global-set-key (kbd "C-x C-u") 'upcase-region-only)
+(siren-general-define-key
+ "C-x C-l" 'downcase-region-only
+ "C-x C-u" 'upcase-region-only)
 
 (provide 'siren-safe-change-case)
 ;;; siren-safe-change-case.el ends here

modules/text-editing/siren-shift-text.el

@@ -21,10 +21,11 @@ A place is considered `tab-width' character columns."
   (interactive)
   (siren-shift-right (* -1 (or arg 1))))
 
-(global-set-key (kbd "C-c [") 'siren-shift-left)
-(global-set-key (kbd "C-c ]") 'siren-shift-right)
-(global-set-key (kbd "M-{") 'siren-shift-left)
-(global-set-key (kbd "M-}") 'siren-shift-right)
+(siren-general-define-key
+  "C-c [" 'siren-shift-left
+  "C-c ]" 'siren-shift-right
+  "M-{" 'siren-shift-left
+  "M-}" 'siren-shift-right)
 
 (provide 'siren-shift-text)
 ;;; siren-shift-text.el ends here

modules/ui/siren-transparency.el

@@ -48,9 +48,10 @@
                                         (t num))))
 
 ;; Keybindings
-(global-set-key (kbd "C-M-|") 'siren-transparency)
-(global-set-key (kbd "C-M-<") 'siren-transparency-decrease)
-(global-set-key (kbd "C-M->") 'siren-transparency-increase)
+(siren-general-define-key
+ "C-M-|" 'siren-transparency
+ "C-M-<" 'siren-transparency-decrease
+ "C-M->" 'siren-transparency-increase)
 
 (provide 'siren-transparency)
 ;;; siren-transparency.el ends here

modules/workspaces/siren-workspace-map.el

@@ -8,7 +8,7 @@
 ;;; Code:
 
 (define-prefix-command 'siren-workspace-map)
-(general-define-key "C-z" 'siren-workspace-map)
+(siren-general-define-key "C-z" 'siren-workspace-map)
 
 (provide 'siren-workspace-map)
 ;;; siren-workspace-map.el ends here