From e5cd843ecba42beb38a998b398b599cbefcbb4d2 Mon Sep 17 00:00:00 2001
From: Levi Neely <141506390+lneely@users.noreply.github.com>
Date: Sun, 1 Sep 2024 08:22:04 +0200
Subject: [PATCH] cleanup

---
 emacs/custom.el |  7 +------
 emacs/init.el   | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/emacs/custom.el b/emacs/custom.el
index 74cfecc..6deb348 100644
--- a/emacs/custom.el
+++ b/emacs/custom.el
@@ -7,13 +7,8 @@
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
    '("9fb561389e5ac5b9ead13a24fb4c2a3544910f67f12cfcfe77b75f36248017d0" "88f7ee5594021c60a4a6a1c275614103de8c1435d6d08cc58882f920e0cec65e" "aec7b55f2a13307a55517fdf08438863d694550565dee23181d2ebd973ebd6b8" "014cb63097fc7dbda3edf53eb09802237961cbb4c9e9abd705f23b86511b0a69" "81f53ee9ddd3f8559f94c127c9327d578e264c574cda7c6d9daddaec226f87bb" "3770d0ae70172461ee0a02edcff71b7d480dc54066e8960d8de9367d12171efb" "f64189544da6f16bab285747d04a92bd57c7e7813d8c24c30f382f087d460a33" "f079ef5189f9738cf5a2b4507bcaf83138ad22d9c9e32a537d61c9aae25502ef" "835d934a930142d408a50b27ed371ba3a9c5a30286297743b0d488e94b225c5f" default))
- '(indent-tabs-mode nil)
- '(mac-option-modifier '(:ordinary meta :function meta :mouse meta))
  '(package-selected-packages
-   '(consult kind-icon go-mode company-box company ivy-prescient flx counsel-projectile counsel ivy python-mode rainbow-mode language-detection jiralib2 request ox-jira ejira jirascope winner-mode fzf prescient doom-modeline emms denote-explore denote multi-vterm ox-hugo plz flycheck-projectile ob-go devil realgud projectile dash async yasnippet ace-jump ace-jump-mode async-status cape corfu dired-git dired-git-info embark eshell-toggle eshell-vterm fic-mode flycheck git-lens git-link go-projectile go-scratch graphviz-dot-mode json-mode kotlin-mode lsp-mode magit mmm-mode multi-web-mode multifiles multiple-cursors multishell nerd-icons-completion nerd-icons-corfu nerd-icons-dired nerd-icons-ibuffer orderless org-ai org-context org-dashboard persistent-scratch php-mode plantuml-mode project-explorer projectile-ripgrep protobuf-mode quelpa-use-package rego-mode unicode-fonts vertico vterm-toggle wgrep which-key yaml-mode))
- '(tab-width 4)
- '(tool-bar-mode nil)
- '(use-short-answers t))
+   '(vertico orderless plz ace-mc ace-jump-mode flycheck fic-mode kotlin-mode rego-mode protobuf-mode multi-web-mode mmm-mode python-mode php-mode json-mode yaml-mode go-mode plantuml-mode graphviz-dot-mode magit denote unicode-fonts nerd-icons-ibuffer nerd-icons-completion nerd-icons-dired doom-modeline which-key multiple-cursors dash async-status async consult-projectile)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/emacs/init.el b/emacs/init.el
index 8de4755..59e945c 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -121,6 +121,7 @@
 	    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
@@ -129,7 +130,9 @@
 	    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
+        use-short-answers t
 	    version-control t
 	    warning-minimum-level :emergency
         backup-directory-alist `((".*" . ,(concat user-emacs-directory "backup")))
@@ -187,10 +190,10 @@
 (use-package dash :ensure t :defer t)
 (use-package multiple-cursors :ensure t :defer t
   :init (multiple-cursors-mode 1)
-  :bind (("C-S-c C-S-c" . 'mc/edit-lines)
+  :bind (("C-x C-<" . 'mc/edit-lines)
 	     ("C->" . 'mc/mark-next-like-this)
 	     ("C-<" . 'mc/mark-previous-like-this)
-	     ("C-c C->" . 'mc/mark-all-like-this)))
+	     ("C-x C->" . 'mc/mark-all-like-this)))
 
 ;; minibuffer
 ;; ===
@@ -355,8 +358,11 @@
 ;; navigation
 ;; ===
 (use-package ace-jump-mode :ensure t :defer t
-  :bind (("C-x j j" . ace-jump-mode)
-	     ("C-x j p" . 'ace-jump-mode-pop-mark)))
+  :bind (("C-c SPC" . ace-jump-mode)
+	     ("C-c DEL" . 'ace-jump-mode-pop-mark)))
+
+(use-package ace-mc :ensure t :defer t
+  :bind (("C-c >" . 'ace-mc-add-multiple-cursors)))
 
 ;; api testing
 ;; ===
@@ -478,7 +484,6 @@
          ("C-c h" . consult-history)
          ("C-c m" . consult-mode-command)
          ("C-c k" . consult-kmacro)
-         ("C-c C-h" . consult-mode-histories)
          ;; Add keybindings for ripgrep-related commands
          ("C-c s" . consult-ripgrep)
          ("C-c C-s" . consult-ripgrep-multi))