jimeh/.emacs.d
1
0
Fork 0
mirror of https://github.com/jimeh/.emacs.d.git synced 2026-02-19 13:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Primarily this replaces :bind with :general in all use-package calls.
This commit is contained in:
Jim Myhrberg
2022-03-14 20:58:06 +00:00
parent 3fc0d2d77d
commit a8618938bf
91 changed files with 665 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/workspaces/siren-desktop.el
View File

@@ -11,6 +11,10 @@
(use-package desktop
:straight (:type built-in)
:general
(:keymaps 'siren-workspace-map
"C-z" 'siren-desktop-map)
:hook
(desktop-after-read . siren-desktop-after-read-hook)
@@ -60,7 +64,9 @@
(push '(zoom-window-buffers . :never) frameset-filter-alist)
(push '(zoom-window-enabled . :never) frameset-filter-alist)
:init
:preface
(define-prefix-command 'siren-desktop-map)
;; Enable restoring window configurations when running in terminal
;; - from: https://emacs.stackexchange.com/a/45829
(defun siren-desktop-after-read-hook ()
@@ -72,22 +78,22 @@
:force-onscreen desktop-restore-forces-onscreen)))
(use-package desktop+
:bind
(:map siren-workspace-map
("C-z c" . desktop+-create)
("C-z C-c" . desktop+-create)
("C-z n" . siren-desktop+-create-new)
("C-z C-n" . siren-desktop+-create-new)
("C-z s" . desktop+-load-or-create)
("C-z C-s" . desktop+-load-or-create)
("C-z l" . desktop+-load)
("C-z C-l" . desktop+-load))
:general
(:keymaps 'siren-desktop-map
"c" 'desktop+-create
"C-c" 'desktop+-create
"n" 'siren-desktop+-create-new
"C-n" 'siren-desktop+-create-new
"s" 'desktop+-load-or-create
"C-s" 'desktop+-load-or-create
"l" 'desktop+-load
"C-l" 'desktop+-load)
:config
(unless (file-exists-p desktop+-base-dir)
(make-directory desktop+-base-dir))
:init
:preface
(defvar desktop+-base-dir (expand-file-name "desktops" siren-dir)
"Base directory for desktop files.")

29
modules/workspaces/siren-elscreen.el
View File

@@ -8,24 +8,17 @@
(use-package elscreen
:demand
:bind (("s-}" . elscreen-next)
("s-{" . elscreen-previous)
:map elscreen-map
;; Prefix key.
("C-z" . elscreen-map)
;; Set screen nickname
("," . elscreen-screen-nickname)
("C-," . elscreen-screen-nickname)
;; Toggle screens.
("l" . elscreen-toggle)
("C-l" . elscreen-toggle)
;; Display list of screens.
(";" . elscreen-display-screen-name-list)
("C-;" . elscreen-display-screen-name-list))
:general
("s-}" 'elscreen-next)
("s-{" 'elscreen-previous)
(:keymaps 'elscreen-map
"C-z" 'elscreen-map
"," 'elscreen-screen-nickname
"C-," 'elscreen-screen-nickname
"l" 'elscreen-toggle
"C-l" 'elscreen-toggle
";" 'elscreen-display-screen-name-list
"C-;" 'elscreen-display-screen-name-list)
:config
(elscreen-start))

28
modules/workspaces/siren-escreen.el
View File

@@ -10,20 +10,20 @@
:straight (:type git :host github :repo "renard/escreen-el")
:demand
:bind
("s-}" . escreen-goto-next-screen)
("s-{" . escreen-goto-prev-screen)
(:map escreen-map
("C-z" . escreen-goto-last-screen)
("l" . escreen-goto-last-screen)
("C-l" . escreen-goto-last-screen)
(";" . siren-escreen-get-active-screen)
("C-;" . siren-escreen-get-active-screen)
("C-c" . escreen-create-screen)
("C-g" . escreen-goto-screen)
("C-k" . escreen-kill-screen)
("C-n" . escreen-goto-next-screen)
("C-p" . escreen-goto-prev-screen))
:general
("s-}" 'escreen-goto-next-screen)
("s-{" 'escreen-goto-prev-screen)
(:keymaps 'escreen-map
"C-z" 'escreen-goto-last-screen
"l" 'escreen-goto-last-screen
"C-l" 'escreen-goto-last-screen
";" 'siren-escreen-get-active-screen
"C-;" 'siren-escreen-get-active-screen
"C-c" 'escreen-create-screen
"C-g" 'escreen-goto-screen
"C-k" 'escreen-kill-screen
"C-n" 'escreen-goto-next-screen
"C-p" 'escreen-goto-prev-screen)
:hook
(escreen-goto-screen . siren-escreen-get-active-screen)

92
modules/workspaces/siren-persp-mode.el
View File

@@ -10,52 +10,52 @@
(require 'siren-workspace-map)
(use-package persp-mode
:bind
("s-}" . persp-next)
("s-{" . persp-prev)
(:map siren-workspace-map
("n" . persp-next)
("C-n" . persp-next)
("p" . persp-prev)
("C-p" . persp-prev)
("s" . persp-frame-switch)
("C-s" . persp-frame-switch)
("S" . persp-window-switch)
("r" . persp-rename)
("C-r" . persp-rename)
("c" . persp-copy)
("C-c" . persp-copy)
("C" . persp-kill)
("z" . persp-save-and-kill)
("a" . persp-add-buffer)
("C-a" . persp-add-buffer)
("b" . persp-switch-to-buffer)
("C-b" . siren-persp-mode-ibuffer)
("t" . persp-temporarily-display-buffer)
("i" . persp-import-buffers)
("I" . persp-import-win-conf)
("k" . persp-remove-buffer)
("C-k" . persp-remove-buffer)
("K" . persp-kill-buffer)
("w" . persp-save-state-to-file)
("W" . persp-save-to-file-by-names)
("C-l" . siren-persp-mode-switch-to-most-recent)
("l" . persp-load-state-from-file)
("L" . persp-load-from-file-by-names)
(";" . siren-persp-mode-show-current-perspective-name)
("C-;" . siren-persp-mode-show-current-perspective-name)
("e" . siren-persp-mode-edit-names-cache)
("C-e" . siren-persp-mode-edit-names-cache)
("0" . siren-persp-switch-to-index)
("1" . siren-persp-switch-to-index)
("2" . siren-persp-switch-to-index)
("3" . siren-persp-switch-to-index)
("4" . siren-persp-switch-to-index)
("5" . siren-persp-switch-to-index)
("6" . siren-persp-switch-to-index)
("7" . siren-persp-switch-to-index)
("8" . siren-persp-switch-to-index)
("9" . siren-persp-switch-to-index))
:general
("s-}" 'persp-next)
("s-{" 'persp-prev)
(:keymaps 'siren-workspace-map
"n" 'persp-next
"C-n" 'persp-next
"p" 'persp-prev
"C-p" 'persp-prev
"s" 'persp-frame-switch
"C-s" 'persp-frame-switch
"S" 'persp-window-switch
"r" 'persp-rename
"C-r" 'persp-rename
"c" 'persp-copy
"C-c" 'persp-copy
"C" 'persp-kill
"z" 'persp-save-and-kill
"a" 'persp-add-buffer
"C-a" 'persp-add-buffer
"b" 'persp-switch-to-buffer
"C-b" 'siren-persp-mode-ibuffer
"t" 'persp-temporarily-display-buffer
"i" 'persp-import-buffers
"I" 'persp-import-win-conf
"k" 'persp-remove-buffer
"C-k" 'persp-remove-buffer
"K" 'persp-kill-buffer
"w" 'persp-save-state-to-file
"W" 'persp-save-to-file-by-names
"C-l" 'siren-persp-mode-switch-to-most-recent
"l" 'persp-load-state-from-file
"L" 'persp-load-from-file-by-names
";" 'siren-persp-mode-show-current-perspective-name
"C-;" 'siren-persp-mode-show-current-perspective-name
"e" 'siren-persp-mode-edit-names-cache
"C-e" 'siren-persp-mode-edit-names-cache
"0" 'siren-persp-switch-to-index
"1" 'siren-persp-switch-to-index
"2" 'siren-persp-switch-to-index
"3" 'siren-persp-switch-to-index
"4" 'siren-persp-switch-to-index
"5" 'siren-persp-switch-to-index
"6" 'siren-persp-switch-to-index
"7" 'siren-persp-switch-to-index
"8" 'siren-persp-switch-to-index
"9" 'siren-persp-switch-to-index)
:custom
(persp-auto-save-num-of-backups 10)

51
modules/workspaces/siren-perspective.el
View File

@@ -8,31 +8,32 @@
(use-package perspective
:demand
:bind (:map persp-mode-map
("C-z z" . persp-switch)
("C-z C-z" . persp-switch)
("C-z c" . persp-switch)
("C-z C-c" . persp-switch)
("C-z s" . persp-switch)
("C-z C-s" . persp-switch)
("C-z b" . persp-switch)
("C-z C-b" . persp-switch)
("C-z l" . persp-switch-last)
("C-z C-l" . persp-switch-last)
("C-z c" . persp-remove-buffer)
("C-z C-c" . persp-remove-buffer)
("C-z k" . persp-kill)
("C-z C-k" . persp-kill)
("C-z r" . persp-rename)
("C-z C-r" . persp-rename)
("C-z a" . persp-add-buffer)
("C-z C-a" . persp-add-buffer)
("C-z i" . persp-import)
("C-z C-i" . persp-import)
("C-z n" . persp-next)
("C-z C-n" . persp-next)
("C-z p" . persp-prev)
("C-z C-p" . persp-prev))
:general
(:keymaps 'persp-mode-map
"C-z z" 'persp-switch
"C-z C-z" 'persp-switch
"C-z c" 'persp-switch
"C-z C-c" 'persp-switch
"C-z s" 'persp-switch
"C-z C-s" 'persp-switch
"C-z b" 'persp-switch
"C-z C-b" 'persp-switch
"C-z l" 'persp-switch-last
"C-z C-l" 'persp-switch-last
"C-z c" 'persp-remove-buffer
"C-z C-c" 'persp-remove-buffer
"C-z k" 'persp-kill
"C-z C-k" 'persp-kill
"C-z r" 'persp-rename
"C-z C-r" 'persp-rename
"C-z a" 'persp-add-buffer
"C-z C-a" 'persp-add-buffer
"C-z i" 'persp-import
"C-z C-i" 'persp-import
"C-z n" 'persp-next
"C-z C-n" 'persp-next
"C-z p" 'persp-prev
"C-z C-p" 'persp-prev)
:custom-face
;; (persp-selected-face ((t (:foreground "#d97a35" :weight bold))))

78
modules/workspaces/siren-tab-bar.el
View File

@@ -11,44 +11,44 @@
(use-package tab-bar
:straight (:type built-in)
:bind
("s-}" . tab-next)
("s-{" . tab-previous)
(:map siren-workspace-map
("C-n" . tab-next)
("C-p" . tab-previous)
("c" . tab-new)
("C-c" . tab-new)
("k" . tab-close)
("C-k" . tab-close)
("l" . tab-recent)
("C-l" . tab-recent)
("r" . tab-rename)
("C-r" . tab-rename)
("n" . siren-tab-bar-move-tab-right)
("p" . siren-tab-bar-move-tab-left)
("s" . siren-tab-bar-switch-to-or-create-tab)
("C-s" . siren-tab-bar-switch-to-or-create-tab)
("e" . tab-switcher)
("C-e" . tab-switcher)
("u" . tab-undo)
("C-u" . tab-undo)
(";" . siren-tab-bar-echo-tab-list)
("C-;" . siren-tab-bar-echo-tab-list)
("0" . siren-tab-bar-switch-to-index)
("1" . siren-tab-bar-switch-to-index)
("2" . siren-tab-bar-switch-to-index)
("3" . siren-tab-bar-switch-to-index)
("4" . siren-tab-bar-switch-to-index)
("5" . siren-tab-bar-switch-to-index)
("6" . siren-tab-bar-switch-to-index)
("7" . siren-tab-bar-switch-to-index)
("8" . siren-tab-bar-switch-to-index)
("9" . siren-tab-bar-switch-to-index)
("b" . tab-bar-history-back)
("C-b" . tab-bar-history-back)
("f" . tab-bar-history-forward)
("C-f" . tab-bar-history-forward))
:general
("s-}" 'tab-next)
("s-{" 'tab-previous)
(:keymaps 'siren-workspace-map
"C-n" 'tab-next
"C-p" 'tab-previous
"c" 'tab-new
"C-c" 'tab-new
"k" 'tab-close
"C-k" 'tab-close
"l" 'tab-recent
"C-l" 'tab-recent
"r" 'tab-rename
"C-r" 'tab-rename
"n" 'siren-tab-bar-move-tab-right
"p" 'siren-tab-bar-move-tab-left
"s" 'siren-tab-bar-switch-to-or-create-tab
"C-s" 'siren-tab-bar-switch-to-or-create-tab
"e" 'tab-switcher
"C-e" 'tab-switcher
"u" 'tab-undo
"C-u" 'tab-undo
";" 'siren-tab-bar-echo-tab-list
"C-;" 'siren-tab-bar-echo-tab-list
"0" 'siren-tab-bar-switch-to-index
"1" 'siren-tab-bar-switch-to-index
"2" 'siren-tab-bar-switch-to-index
"3" 'siren-tab-bar-switch-to-index
"4" 'siren-tab-bar-switch-to-index
"5" 'siren-tab-bar-switch-to-index
"6" 'siren-tab-bar-switch-to-index
"7" 'siren-tab-bar-switch-to-index
"8" 'siren-tab-bar-switch-to-index
"9" 'siren-tab-bar-switch-to-index
"b" 'tab-bar-history-back
"C-b" 'tab-bar-history-back
"f" 'tab-bar-history-forward
"C-f" 'tab-bar-history-forward)
:custom
(tab-bar-close-button-show nil)
@@ -63,7 +63,7 @@
:config
(siren-tab-bar-setup)
:init
:preface
(defun siren-tab-bar-setup ()
(tab-bar-mode)
(tab-bar-history-mode))

9
modules/workspaces/siren-workspace-map.el
View File

@@ -7,13 +7,8 @@
;;; Code:
(use-package siren-workspace-map
:straight (:type built-in)
:no-require t
:bind
(:prefix-map siren-workspace-map
:prefix "C-z"))
(define-prefix-command 'siren-workspace-map)
(general-define-key "C-z" 'siren-workspace-map)
(provide 'siren-workspace-map)
;;; siren-workspace-map.el ends here