feat(core): use general.el for keybind definitions nearly everywhere

Primarily this replaces :bind with :general in all use-package calls.

modules/projects/siren-dired-sidebar.el

@@ -9,8 +9,8 @@
 (use-package dired-sidebar
   :commands dired-sidebar-toggle-sidebar
 
-  :bind
-  ("C-x C-p" . dired-sidebar-toggle-sidebar)
+  :general
+  ("C-x C-p" 'dired-sidebar-toggle-sidebar)
 
   :config
   (setq dired-sidebar-subtree-line-prefix " .")

modules/projects/siren-helm-projectile.el

@@ -11,11 +11,11 @@
 
 (use-package helm-projectile
   :after (helm-global-bindings)
-  :bind
-  ("C-x ;" . helm-projectile-find-file)
-  ("C-x C-;" . helm-projectile-find-file)
-  ("C-c ;" . helm-projectile-switch-project)
-  ("C-c C-;" . helm-projectile-switch-project))
+  :general
+  ("C-x ;" 'helm-projectile-find-file)
+  ("C-x C-;" 'helm-projectile-find-file)
+  ("C-c ;" 'helm-projectile-switch-project)
+  ("C-c C-;" 'helm-projectile-switch-project))
 
 (provide 'siren-helm-projectile)
 ;;; siren-helm-projectile.el ends here

modules/projects/siren-neotree.el

@@ -10,9 +10,9 @@
 (require 'siren-projectile)
 
 (use-package neotree
-  :bind
-  ("C-x C-p" . neotree-toggle)
-  ("C-x p" . neotree-project-dir)
+  :general
+  ("C-x C-p" 'neotree-toggle)
+  ("C-x p" 'neotree-project-dir)
 
   :custom
   (neo-autorefresh t)

modules/projects/siren-project-explorer.el

@@ -7,8 +7,8 @@
 ;;; Code:
 
 (use-package project-explorer
-  :bind
-  ("C-x C-p" . project-explorer-toggle)
+  :general
+  ("C-x C-p" 'project-explorer-toggle)
 
   :custom
   (pe/follow-current t)

modules/projects/siren-projectile.el

@@ -7,22 +7,20 @@
 ;;; Code:
 
 (use-package projectile
-  :bind
-  ("C-c p p" . projectile-switch-project)
-  ("C-c p k" . projectile-kill-buffers)
-  ("C-c p r" . projectile-replace)
-  ("C-c p S" . projectile-save-project-buffers)
-  ("C-c C-b" . projectile-ibuffer)
-  ("C-x C-t" . projectile-find-file)
-  ("C-x j" . projectile-dired)
-
-  ("C-x ;" . projectile-find-file)
-  ("C-x C-;" . projectile-find-file)
-  ("C-c ;" . projectile-switch-project)
-  ("C-c C-;" . projectile-switch-project)
-
-  (:map projectile-mode-map
-        ("C-c p" . projectile-command-map))
+  :general
+  ("C-c p p" 'projectile-switch-project)
+  ("C-c p k" 'projectile-kill-buffers)
+  ("C-c p r" 'projectile-replace)
+  ("C-c p S" 'projectile-save-project-buffers)
+  ("C-c C-b" 'projectile-ibuffer)
+  ("C-c ;" 'projectile-switch-project)
+  ("C-c C-;" 'projectile-switch-project)
+  ("C-x C-t" 'projectile-find-file)
+  ("C-x j" 'projectile-dired)
+  ("C-x ;" 'projectile-find-file)
+  ("C-x C-;" 'projectile-find-file)
+  (:keymaps 'projectile-mode-map
+            "C-c p" 'projectile-command-map)
 
   :custom
   (projectile-buffers-filter-function 'projectile-buffers-with-file-or-process)

modules/projects/siren-treemacs.el

@@ -7,9 +7,10 @@
 ;;; Code:
 
 (use-package treemacs
-  :bind
-  ("C-x C-p" . treemacs)
-  ("C-x p" . treemacs-select-window)
+  :general
+  ("C-x C-p" 'treemacs)
+  ("C-x p" 'treemacs-select-window)
+  (general-unbind :keymaps 'treemacs-mode-map "M-l")
 
   :hook
   (treemacs-mode . siren-treemacs-change-hl-line-mode)
@@ -58,10 +59,7 @@
   (treemacs-define-RET-action
    'file-node-open   #'treemacs-visit-node-in-most-recently-used-window)
   (treemacs-define-RET-action
-   'file-node-closed #'treemacs-visit-node-in-most-recently-used-window)
-
-  ;; Unbind keys which conflict with global keybindings I use.
-  (unbind-key "M-l" treemacs-mode-map))
+   'file-node-closed #'treemacs-visit-node-in-most-recently-used-window))
 
 (use-package treemacs-all-the-icons
   :defer t