X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/9a5905d6b1cec2417777f66570466c81cd14a903..5b185efac27892a4c7bc567820442085045d2a8a:/.emacs.d/init.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 26d0a0f..6210f90 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -559,15 +559,19 @@ 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 g" . magit-status)
-         ("C-x g s" . magit-status)
-         ("C-x g b" . magit-blame-addition)
-         ("C-x g l" . magit-log-buffer-file))
+  :bind (("C-c g g" . magit-status)
+         ("C-c g s" . magit-status)
+         ("C-c g b" . magit-blame-addition)
+         ("C-c g l" . magit-log-buffer-file))
   :config
   (magit-add-section-hook 'magit-status-sections-hook
                           'magit-insert-modules
                           'magit-insert-stashes
                           'append)
+  ;; (magit-add-section-hook 'magit-status-sections-hook
+  ;;                         'magit-insert-ignored-files
+  ;;                         'magit-insert-untracked-files
+  ;;                         'append)
   (setq magit-repository-directories '(("~/" . 0)
                                        ("~/src/git/" . 1)))
   (nconc magit-section-initial-visibility-alist
@@ -1258,6 +1262,7 @@ This function is intended for use with `ivy-ignore-buffers'."
     "C-c e"   "eval"
     "C-c f"   "files"
     "C-c F"   "frames"
+    "C-c g"   "magit"
     "C-S-h"   "help(ful)"
     "C-c m"   "multiple-cursors"
     "C-c P"   "projectile"
@@ -1267,7 +1272,7 @@ This function is intended for use with `ivy-ignore-buffers'."
     "C-c q"   "boxquote"
     "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
@@ -1513,7 +1518,16 @@ This function is intended for use with `ivy-ignore-buffers'."
   (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t)
   (yas-reload-all)
   (setq yas-verbosity yas-verbosity-cur)
-  (define-key yas-minor-mode-map (kbd "SPC") yas-maybe-expand)
+
+  (defun b/yas--maybe-expand-key-filter (cmd)
+    (when (and (yas--maybe-expand-key-filter cmd)
+               (not (bound-and-true-p git-commit-mode)))
+      cmd))
+  (defconst b/yas-maybe-expand
+    '(menu-item "" yas-expand :filter b/yas--maybe-expand-key-filter))
+  (define-key yas-minor-mode-map
+    (kbd "SPC") b/yas-maybe-expand)
+
   (yas-global-mode))
 
 (use-package debbugs)