From 4052fa898b1ade28f4bc279c146acdde972b21e7 Mon Sep 17 00:00:00 2001
From: Levi <lneely@pascom.net>
Date: Mon, 2 Sep 2024 15:40:16 +0200
Subject: [PATCH] extra magit keybinds

---
 emacs/init.el | 75 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 33 deletions(-)

diff --git a/emacs/init.el b/emacs/init.el
index 9a79e77..32e924c 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -1,6 +1,6 @@
 (require 'package)
 (add-to-list 'package-archives
-	     '("melpa" . "https://melpa.org/packages/") t)
+	         '("melpa" . "https://melpa.org/packages/") t)
 (package-initialize)
 (require 'use-package)
 
@@ -41,10 +41,10 @@
                      (get-text-property 0 'org-hd-marker item)))
          (line (when marker
                  (org-with-point-at marker
-                   (buffer-substring (line-beginning-position) (line-end-position)))))
+				   (buffer-substring (line-beginning-position) (line-end-position)))))
          (todo-keyword (when marker
                          (org-with-point-at marker
-                           (org-get-todo-state))))
+					       (org-get-todo-state))))
          (truncated-line (when line
                            (replace-regexp-in-string "^\\[#[A-Z]\\] " "" line))))
     (if truncated-line
@@ -116,26 +116,26 @@
   (require 'server)
   (unless (server-running-p) (server-start))
   (setq backup-by-copying t
-	completion-cycle-threshold 3
-	create-lockfiles nil
-	custom-file (concat user-emacs-directory "custom.el")
-	delete-old-versions t
-	enable-recursive-minibuffers t
-	focus-follows-mouse t
+	    completion-cycle-threshold 3
+	    create-lockfiles nil
+	    custom-file (concat user-emacs-directory "custom.el")
+	    delete-old-versions t
+	    enable-recursive-minibuffers t
+	    focus-follows-mouse t
         indent-tabs-mode nil
-	inhibit-startup-screen t
-	kept-new-versions 20
-	kept-old-versions 2
-	minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt)
-	mouse-autoselect-window t
-	read-extended-command-predicate #'command-completion-default-include-p
-	read-process-output-max (* 1024 1024)
-	tab-always-indent 'complete
+	    inhibit-startup-screen t
+	    kept-new-versions 20
+	    kept-old-versions 2
+	    minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt)
+	    mouse-autoselect-window t
+	    read-extended-command-predicate #'command-completion-default-include-p
+	    read-process-output-max (* 1024 1024)
+	    tab-always-indent 'complete
         tab-width 4
-	text-mode-ispell-word-completion nil
+	    text-mode-ispell-word-completion nil
         use-short-answers t
-	version-control t
-	warning-minimum-level :emergency
+	    version-control t
+	    warning-minimum-level :emergency
         backup-directory-alist `((".*" . ,(concat user-emacs-directory "backup")))
         read-extended-command-predicate #'command-completion-default-include-p
         text-mode-ispell-word-completion nil
@@ -191,9 +191,9 @@
 (use-package multiple-cursors :ensure t :defer t
   :init (multiple-cursors-mode 1)
   :bind (("C-x C-<" . 'mc/edit-lines)
-	 ("C->" . 'mc/mark-next-like-this)
-	 ("C-<" . 'mc/mark-previous-like-this)
-	 ("C-x C->" . 'mc/mark-all-like-this)))
+	     ("C->" . 'mc/mark-next-like-this)
+	     ("C-<" . 'mc/mark-previous-like-this)
+	     ("C-x C->" . 'mc/mark-all-like-this)))
 
 ;; minibuffer
 ;; ===
@@ -286,10 +286,19 @@
   :bind (("C-x g g" . #'magit-status)
 	     ("C-x g l l" . #'magit-log)
 	     ("C-x g l a" . #'magit-log-all)
-	     ("C-x g l f" . #'magit-log-buffer-file))
+	     ("C-x g l f" . #'magit-log-buffer-file)
+	     ("C-x g R s" . #'magit-reset-soft)
+	     ("C-x g R h" . #'magit-reset-hard)
+	     ("C-x g !" . #'magit-run)
+	     ("C-x g b b" . #'magit-branch)
+         ("C-x g b c" . #'magit-branch-create)
+         ("C-x g b s" . #'magit-branch-checkout)
+         ("C-x g m m" . #'magit-merge)
+         ("C-x g d d" . #'magit-diff))
+  
   :commands (magit-status-here magit-get-current-branch)
   :custom (magit-display-buffer-function
-	   #'magit-display-buffer-same-window-except-diff-v1))
+	       #'magit-display-buffer-same-window-except-diff-v1))
 
 ;; diagramming
 ;; ===
@@ -302,8 +311,8 @@
 (use-package plantuml-mode :ensure t 
   :config
   (setq plantuml-default-exec-mode 'jar
-	plantuml-jar-path "/usr/share/plantuml/plantuml.jar"
-	org-plantuml-jar-path (expand-file-name "/usr/share/plantuml/plantuml.jar"))
+	    plantuml-jar-path "/usr/share/plantuml/plantuml.jar"
+	    org-plantuml-jar-path (expand-file-name "/usr/share/plantuml/plantuml.jar"))
   (with-eval-after-load 'org
     (org-babel-do-load-languages
      'org-babel-load-languages '((plantuml . t)))))
@@ -367,7 +376,7 @@
 ;; ===
 (use-package ace-jump-mode :ensure t :defer t
   :bind (("C-c SPC" . ace-jump-mode)
-	 ("C-c DEL" . 'ace-jump-mode-pop-mark)))
+	     ("C-c DEL" . 'ace-jump-mode-pop-mark)))
 
 (use-package ace-mc :ensure t :defer t
   :bind (("C-c >" . 'ace-mc-add-multiple-cursors)))
@@ -581,7 +590,7 @@
   (use-package eshell-toggle :ensure t :defer t))
 
 (use-package dired-sidebar :ensure t :defer t)
-  
+
 (use-package surround :ensure t :defer t
   :bind-keymap ("M-'" . surround-keymap))
 
@@ -625,11 +634,11 @@
   (interactive "p")
   (let ((filename (dired-get-filename)))
     (setq target (concat (file-name-sans-extension filename)
-                   "-old"
-                   (if (> arg 1) (number-to-string arg))
-                   (file-name-extension filename t)))
+			             "-old"
+			             (if (> arg 1) (number-to-string arg))
+			             (file-name-extension filename t)))
     (if (file-directory-p filename)
-      (copy-directory filename target)
+	    (copy-directory filename target)
       (copy-file filename target))
     )
   )