emacs: cleanup, no shelldon, default isearch regex

1 files changed, 17 insertions, 27 deletions

diff --git a/emacs/init.el b/emacs/init.el
index 8c0abd4..bccc58e 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -454,6 +454,13 @@ current layout."
   :config
   (recentf-mode))
 
+(progn ; basic isearch
+  ;; swap basic and regex binds
+  (keymap-set global-map "C-s" 'isearch-forward-regexp)
+  (keymap-set global-map "C-r" 'isearch-backward-regexp)
+  (keymap-set global-map "C-M-s" 'isearch-forward)
+  (keymap-set global-map "C-M-r" 'isearch-backward))
+
 (use-package consult ; more encompassing buffer switch and searching
   :demand t
   :custom
@@ -478,10 +485,6 @@ current layout."
   :hook
   (prog-mode . hl-todo-mode))
 
-(use-package hl-line ; make it easier to find your point
-  ;; TODO this doesn't work with buffers created after enabled
-  :bind ("M-s h SPC" . global-hl-line-mode))
-
 (use-package visible-mark ; make the mark visible
   ;; TODO make the attr list display dependent
   :demand t
@@ -543,25 +546,13 @@ current layout."
     (eat-update-semi-char-mode-map)
     (eat-eshell-update-semi-char-mode-map)))
 
-(use-package shelldon
-  :demand t
-  :config
-  ;; (setf shell-command-switch "-ic")
-  (setf enable-recursive-minibuffers t)
-
-  ;; command codes -> ansi colors in emacs
-  (add-hook 'shelldon-mode-hook 'ansi-color-for-comint-mode-on)
-  (autoload 'ansi-color-for-comint-mode-on "ansi-color" nil t)
 
-  (add-to-list 'display-buffer-alist
-               '("*shelldon:"
-                 (display-buffer-reuse-window display-buffer-in-previous-window display-buffer-in-side-window display-buffer-pop-up-window)
-                 (side . right)
-                 (slot . 0)
-                 (window-width . 80)))
-  :bind
-  ("M-&" . 'shelldon)
-  ("M-*" . 'shelldon-loop))
+;; (add-to-list 'display-buffer-alist
+;;              '("*shelldon:"
+;;                (display-buffer-reuse-window display-buffer-in-previous-window display-buffer-in-side-window display-buffer-pop-up-window)
+;;                (side . right)
+;;                (slot . 0)
+;;                (window-width . 80)))
 
 (progn ; comint, doesn't play with use-package
   (require 'comint)
@@ -585,7 +576,6 @@ current layout."
 (use-package pass ; password integration
   :demand t
   :init
-  ;; (pinentry-start)
   (use-package password-store)
   (use-package auth-source-pass :init (auth-source-pass-enable))
   :custom
@@ -697,6 +687,7 @@ current layout."
 
 (add-hook 'prog-mode-hook 'my/prog-buffer-setup)
 (electric-pair-mode 1)
+(setq enable-recursive-minibuffers t)
 
 (use-package haskell-mode
   :custom
@@ -841,7 +832,6 @@ current layout."
   (advice-add 'ispell-mode :before 'debug)
   (setq-default text-mode-hook (cons 'ispell-minor-mode (remove 'ispell-mode text-mode-hook))))
 
-
 (use-package time
   :custom
   (display-time-day-and-date t)
@@ -1054,9 +1044,9 @@ current layout."
          esh-help exwm-modeline fold-this free-keys haskell-mode
          hl-todo ibuffer-vc marginalia merlin minions ocp-indent
          opam-switch-mode orderless pass pinentry posframe pyvenv
-         racket-mode rustic sdcv shelldon sideline-flycheck
-         sideline-flymake tempel-collection tuareg vertico
-         vertico-posframe visible-mark vterm winum))
+         racket-mode rustic sdcv sideline-flycheck sideline-flymake
+         tempel-collection tuareg vertico vertico-posframe
+         visible-mark vterm winum))
  '(pyim-assistant-scheme 'cangjie)
  '(safe-local-variable-values '((LEXICAL-binding . t)))
  '(scroll-bar-mode nil)