From: Amin Bandali <bandali@gnu.org>
Date: Tue, 27 Aug 2019 03:34:45 +0000 (-0400)
Subject: emacs: overhaul bindings to be more C-based rather than s-based
X-Git-Url: https://git.shemshak.org/~bandali/configs/commitdiff_plain/2e81c51ad88d5ea21b5f85fdf1ab6cf585e830ef?ds=sidebyside

emacs: overhaul bindings to be more C-based rather than s-based
---

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 4c69e2a..08af872 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -480,8 +480,7 @@ For disabling the behaviour for certain buffers and/or modes."
   (("C-c a o a" . org-agenda)
    :map org-mode-map
    ("M-L" . org-insert-last-stored-link)
-   ("M-O" . org-toggle-link-display)
-   ("s-T" . org-todo))
+   ("M-O" . org-toggle-link-display))
   :hook ((org-mode . org-indent-mode)
          (org-mode . auto-fill-mode)
          (org-mode . flyspell-mode))
@@ -560,9 +559,10 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; *the* right way to do git
 (use-package magit
   :defer 0.5
-  :bind (("C-x g" . magit-status)
-         ("s-g s" . magit-status)
-         ("s-g l" . magit-log-buffer-file))
+  :bind (("C-x g g" . magit-status)
+         ("C-x g s" . magit-status)
+         ("C-x g b" . magit-blame-addition)
+         ("C-x g l" . magit-log-buffer-file))
   :config
   (magit-add-section-hook 'magit-status-sections-hook
                           'magit-insert-modules
@@ -644,7 +644,6 @@ This function is intended for use with `ivy-ignore-buffers'."
          ("C-c f l"                        . counsel-find-library)
          ("C-c f r"                        . counsel-recentf)
          ("C-c x"                          . counsel-M-x)
-         ("s-."                            . counsel-find-file)
          :map minibuffer-local-map
          ("C-r" . counsel-minibuffer-history))
   :config
@@ -660,7 +659,6 @@ This function is intended for use with `ivy-ignore-buffers'."
            ("C-x C-b" . helm-buffers-list)
            ("C-x C-f" . helm-find-files)
            ("C-h r"   . helm-info-emacs)
-           ("s-r"     . helm-recentf)
            ("C-s-r"   . helm-resume)
            :map helm-map
            ("<tab>" . helm-execute-persistent-action)
@@ -777,6 +775,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
 
 (use-package outline
+  :disabled
   :hook (prog-mode . outline-minor-mode)
   :delight (outline-minor-mode " outl")
   :bind
@@ -1224,8 +1223,8 @@ This function is intended for use with `ivy-ignore-buffers'."
    'org-mode b/org-mode-font-lock-keywords t))
 
 (bind-keys
- ("s-t d" . b/lights-off)
- ("s-t l" . b/lights-on))
+ ("C-c t d" . b/lights-off)
+ ("C-c t l" . b/lights-on))
 
 
 ;;; Emacs enhancements & auxiliary packages
@@ -1254,11 +1253,7 @@ This function is intended for use with `ivy-ignore-buffers'."
     "C-c a e" "erc"
     "C-c a o" "org"
     "C-c a s" "shells"
-    "C-c p"   "package-management"
-    ;; "C-c p e" "package-management/epkg"
-    "C-c p s" "straight.el"
-    "C-c psa" "all"
-    "C-c psp" "package"
+    "C-c b"   "buffers"
     "C-c c"   "compile-and-comments"
     "C-c e"   "eval"
     "C-c f"   "files"
@@ -1270,9 +1265,9 @@ This function is intended for use with `ivy-ignore-buffers'."
     "C-c P x" "projectile/execute"
     "C-c P 4" "projectile/other-window"
     "C-c q"   "boxquote"
-    "s-g"     "magit"
-    "s-O"     "outline"
-    "s-t"     "themes")
+    "C-c t"   "themes"
+    ;; "s-O"     "outline"
+    "C-x g"   "magit")
 
   ;; prefixes for major modes
   (which-key-add-major-mode-key-based-replacements 'message-mode
@@ -1544,25 +1539,25 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-package window
   :bind
-  (("s-o"   . other-window)
-   ("s-/ ." . split-window-right)
-   ("s-/ ," . split-window-below)
-   ("s-/ 0" . delete-window)
-   ("s-q"   . delete-window))
+  (("C-c w <right>" . split-window-right)
+   ("C-c w <down>"  . split-window-below)
+   ("C-c w s l"     . split-window-right)
+   ("C-c w s j"     . split-window-below)
+   ("C-c w q"       . quit-window))
   :custom
   (split-width-threshold 150))
 
 (use-package windmove
   :defer 0.6
   :bind
-  (("s-h" . windmove-left)
-   ("s-j" . windmove-down)
-   ("s-k" . windmove-up)
-   ("s-l" . windmove-right)
-   ("s-H" . windmove-swap-states-left)
-   ("s-J" . windmove-swap-states-down)
-   ("s-K" . windmove-swap-states-up)
-   ("s-L" . windmove-swap-states-right)))
+  (("C-c w h" . windmove-left)
+   ("C-c w j" . windmove-down)
+   ("C-c w k" . windmove-up)
+   ("C-c w l" . windmove-right)
+   ("C-c w H" . windmove-swap-states-left)
+   ("C-c w J" . windmove-swap-states-down)
+   ("C-c w K" . windmove-swap-states-up)
+   ("C-c w L" . windmove-swap-states-right)))
 
 (use-package pass
   :commands pass
@@ -1607,8 +1602,10 @@ This function is intended for use with `ivy-ignore-buffers'."
  read-mail-command 'gnus)
 
 (use-package gnus
-  :bind (("s-m"   . gnus)
-         ("s-M"   . gnus-unplugged))
+  :bind (("s-m"     . gnus)
+         ("s-M"     . gnus-unplugged)
+         ("C-c a m" . gnus)
+         ("C-c a M" . gnus-unplugged))
   :init
   (setq
    gnus-select-method '(nnnil "")
@@ -2206,6 +2203,8 @@ updates of `erc-lurker-state'."
 
 (use-package erc-track
   :after erc
+  :bind (("C-c a e t d" . erc-track-disable)
+         ("C-c a e t e" . erc-track-enable))
   :custom
   (erc-track-enable-keybindings nil)
   (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"