diff --git a/.emacs.d/include/priime-edit.el b/.emacs.d/include/priime-edit.el index 9ca93c9..4bf3ac0 100644 --- a/.emacs.d/include/priime-edit.el +++ b/.emacs.d/include/priime-edit.el @@ -27,7 +27,7 @@ (kill-line) (meow-insert)) -(defvar-keymap meow-buffers +(defvar-keymap meow-buffers-keymap "b" #'bufler-switch-buffer "l" #'bufler-list "k" #'kill-buffer @@ -36,10 +36,17 @@ "r" #'rename-buffer "s" #'scratch-buffer) -(defvar-keymap meow-windows +(defvar-keymap meow-windows-keymap "k" #'delete-window "b" #'balance-windows) +(defvar-keymap meow-misc-keymap + "f" #'set-fill-column + "i" #'display-fill-column-indicator-mode + "a" #'auto-fill-mode + "n" #'priime-toggle-line-numbers + "t" #'toggle-truncate-lines) + ;;; Packages (use-package meow :straight t @@ -47,8 +54,9 @@ :custom (meow-cheatsheet-layout meow-cheatsheet-layout-dvp) :init - (keymap-global-set "C-c b" meow-buffers) - (keymap-global-set "C-c w" meow-windows) + (keymap-global-set "C-c b" meow-buffers-keymap) + (keymap-global-set "C-c w" meow-windows-keymap) + (keymap-global-set "C-c s" meow-misc-keymap) (meow-global-mode) (meow-setup-indicator) (meow-leader-define-key '("u" . "C-u")) diff --git a/.emacs.d/include/priime-general.el b/.emacs.d/include/priime-general.el index aaa8550..82ff0a4 100644 --- a/.emacs.d/include/priime-general.el +++ b/.emacs.d/include/priime-general.el @@ -101,12 +101,6 @@ (filepath (or filepath (read-file-name "filename: ")))) (url-copy-file url filepath 1))) -(defvar-keymap priime-fill-map - "f" #'set-fill-column - "i" #'display-fill-column-indicator-mode - "a" #'auto-fill-mode - "n" #'priime-toggle-line-numbers) - ;;; Configuration (use-package emacs @@ -196,8 +190,6 @@ (keymap-global-unset "C-z") (keymap-global-unset "C-x C-z") - (keymap-global-unset "C-x f") - (keymap-global-set "C-x f" priime-fill-map) (keymap-global-set "C-+" #'priime-font+) (keymap-global-unset "C--")