diff --git a/.emacs.d/include/general.el b/.emacs.d/include/general.el index 6f0a070..3ce51ac 100644 --- a/.emacs.d/include/general.el +++ b/.emacs.d/include/general.el @@ -91,15 +91,15 @@ (setq sentence-end-double-space nil) ;; Keybindings -(global-set-key (kbd "C-M-j") (lambda () (interactive) (scroll-up 1))) -(global-set-key (kbd "C-M-k") (lambda () (interactive) (scroll-down 1))) -(global-unset-key (kbd "C-x f")) -(global-set-key (kbd "C-x f f") #'set-fill-column) -(global-set-key (kbd "C-x f i") #'display-fill-column-indicator-mode) -(global-set-key (kbd "C-x f a") #'auto-fill-mode) -(global-set-key (kbd "C-x f n") #'toggle-display-line-numbers) -(global-set-key (kbd "C-v") #'View-scroll-half-page-forward) -(global-set-key (kbd "M-v") #'View-scroll-half-page-backward) +(keymap-global-set "C-M-j" (lambda () (interactive) (scroll-up 1))) +(keymap-global-set "C-M-k" (lambda () (interactive) (scroll-down 1))) +(keymap-global-unset "C-x f") +(keymap-global-set "C-x f f" #'set-fill-column) +(keymap-global-set "C-x f i" #'display-fill-column-indicator-mode) +(keymap-global-set "C-x f a" #'auto-fill-mode) +(keymap-global-set "C-x f n" #'toggle-display-line-numbers) +(keymap-global-set "C-v" #'View-scroll-half-page-forward) +(keymap-global-set "M-v" #'View-scroll-half-page-backward) (defun toggle-display-line-numbers () "Toggle the display of line numbers." diff --git a/.emacs.d/include/misc.el b/.emacs.d/include/misc.el index fe88de0..655afb4 100644 --- a/.emacs.d/include/misc.el +++ b/.emacs.d/include/misc.el @@ -93,8 +93,8 @@ ("https://blog.cleancoder.com/atom.xml" blog))) ;; Magit -(global-set-key (kbd "C-c g g") #'magit) -(global-set-key (kbd "C-c g b") #'magit-blame) +(keymap-global-set "C-c g g" #'magit) +(keymap-global-set "C-c g b" #'magit-blame) (setq auth-sources '("~/.authinfo")) ;; Projectile @@ -114,7 +114,7 @@ (neotree-hide) (neotree-dir current-directory)))) -(global-set-key (kbd "C-c t") #'neotree-toggle-current-directory) +(keymap-global-set "C-c t" #'neotree-toggle-current-directory) (setq neo-theme 'icon) ;; Orderless diff --git a/.emacs.d/include/orgconfig.el b/.emacs.d/include/orgconfig.el index fbb1440..9c51583 100644 --- a/.emacs.d/include/orgconfig.el +++ b/.emacs.d/include/orgconfig.el @@ -36,8 +36,8 @@ (setq org-refile-targets '(("~/org/gtd.org" :maxlevel . 3) ("~/org/someday.org" :level . 1) ("~/org/tickler.org" :maxlevel . 2))) -(global-set-key (kbd "C-c a") #'org-agenda) -(global-set-key (kbd "C-c c") #'org-capture) +(keymap-global-set "C-c a" #'org-agenda) +(keymap-global-set "C-c c" #'org-capture) (setq org-todo-keywords '((sequence "TODO(t)" "WAITING(w)" "|" "DONE(d)" "CANCELLED(c)"))) (defmacro η (fnc)