More emacs.d updates

7 files changed, 32 insertions, 17 deletions

diff --git a/emacs-prelude/personal/lisp/init-completion.el b/emacs-prelude/personal/lisp/init-completion.el
index bbc5e21..c43d1b4 100644
--- a/emacs-prelude/personal/lisp/init-completion.el
+++ b/emacs-prelude/personal/lisp/init-completion.el
@@ -175,6 +175,7 @@
          ("C-c c g" . consult-grep)
          ("C-c c G" . consult-git-grep)
          ("C-c c r" . consult-smart-ripgrep)
+         ("C-c r" . consult-smart-ripgrep)
          ("C-c c R" . consult-ripgrep-auto-preview)
          ("C-c c C-M-r" . consult-iripgrep)
          ("C-c c M-r" . consult-ripgrep-unrestricted)
@@ -283,8 +284,6 @@
   :bind (("M-A" . marginalia-cycle)
          :map minibuffer-local-map
          ("M-A" . marginalia-cycle))
-  ;:custom
-  ;(marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil))
   :init
   (marginalia-mode))
 
@@ -330,8 +329,10 @@
                          (symbol-name s))))
     (affe-grep dir initial))
   :bind
-  (("C-c c a g" . affe-grep)
-   ("C-c c a f" . affe-find)
-   ("C-c c a s" . my/affe-grep-symbol-at-point)))
+  (("C-#" . affe-grep)
+   ("C-~" . my/affe-grep-symbol-at-point)
+   ("C-c z" . affe-find))
+  :custom
+  (affe-find-command "fd --color never -t f"))
 
 (provide 'init-completion)
diff --git a/emacs-prelude/personal/lisp/init-git.el b/emacs-prelude/personal/lisp/init-git.el
index 041ff8e..c63de39 100644
--- a/emacs-prelude/personal/lisp/init-git.el
+++ b/emacs-prelude/personal/lisp/init-git.el
@@ -16,7 +16,8 @@
                 (vc-refresh-state)))))
   :config
   (key-chord-define-global "UU" 'my/magit-set-upstream)
-  (key-chord-define-global "RR" 'my/magit-refresh-state))
+  (key-chord-define-global "RR" 'my/magit-refresh-state)
+  :custom (magit-diff-refine-hunk 'all))
 
 (prelude-require-package 'forge)
 (use-package forge
@@ -33,4 +34,3 @@
   ("C-c j r" . git-gutter:revert-hunk))
 
 (provide 'init-git)
-
diff --git a/emacs-prelude/personal/lisp/init-lsp.el b/emacs-prelude/personal/lisp/init-lsp.el
index 6568229..9f8f1cd 100644
--- a/emacs-prelude/personal/lisp/init-lsp.el
+++ b/emacs-prelude/personal/lisp/init-lsp.el
@@ -21,7 +21,8 @@
         lsp-enable-indentation nil
         lsp-completion-enable nil)
   (key-chord-define-global "QQ" 'lsp-find-references)
-  (key-chord-define-global "GG" 'lsp-find-definition))
+  (key-chord-define-global "PP" 'lsp-peek-find-references)
+  (key-chord-define-global "GG" 'lsp-find-definition)
+  (key-chord-define-global "DD" 'lsp-peek-find-definition))
 
 (provide 'init-lsp)
-
diff --git a/emacs-prelude/personal/lisp/init-misc.el b/emacs-prelude/personal/lisp/init-misc.el
index 63edbcc..e25556d 100644
--- a/emacs-prelude/personal/lisp/init-misc.el
+++ b/emacs-prelude/personal/lisp/init-misc.el
@@ -28,4 +28,9 @@
                ("M-[" . multi-vterm-prev)
                ("M-]" . multi-vterm-next))))
 
+(use-package dired
+  :ensure nil
+  :custom
+  (dired-kill-when-opening-new-dired-buffer t))
+
 (provide 'init-misc)
diff --git a/emacs-prelude/personal/lisp/init-prelude.el b/emacs-prelude/personal/lisp/init-prelude.el
index d52b2ec..fa4895b 100644
--- a/emacs-prelude/personal/lisp/init-prelude.el
+++ b/emacs-prelude/personal/lisp/init-prelude.el
@@ -24,9 +24,13 @@
          :weight bold :height 2.5 :box (:line-width 10 :color "red"))))))
 
 (use-package crux
-  ;; allow other things to use C-c s
-  :init (unbind-key "C-c s" prelude-mode-map)
-  :bind (:map prelude-mode-map ("C-c S" . crux-swap-windows)))
+  ;; allow other things to use C-c s and C-c r
+  :init
+  (unbind-key "C-c s" prelude-mode-map)
+  (unbind-key "C-c r" prelude-mode-map)
+  :bind (:map prelude-mode-map
+              (("C-c C-s" . crux-swap-windows)
+               ("C-c C-r" . crux-rename-file-and-buffer))))
 
 (use-package key-chord
   :init
@@ -37,4 +41,3 @@
 (diminish 'prelude-mode)
 
 (provide 'init-prelude)
-
diff --git a/emacs-prelude/personal/lisp/init-ui.el b/emacs-prelude/personal/lisp/init-ui.el
index c382469..608591c 100644
--- a/emacs-prelude/personal/lisp/init-ui.el
+++ b/emacs-prelude/personal/lisp/init-ui.el
@@ -17,6 +17,11 @@
     (highlight-symbol-at-point)))
 (global-set-key (kbd "s-.") 'my/toggle-highlight-symbol-at-point)
 
+(unless (eq system-type 'darwin)
+  (prelude-require-package 'idle-highlight-mode)
+  (use-package idle-highlight-mode
+    :hook (prog-mode . idle-highlight-mode)))
+
 (use-package paren
   :config
   (show-paren-mode +1))
@@ -30,7 +35,10 @@
 (prelude-require-package 'ctrlf)
 (use-package ctrlf
   :config
-  (ctrlf-mode +1))
+  (ctrlf-mode +1)
+  :bind
+  ("C-*" . ctrlf-forward-symbol-at-point)
+  ("M-s M-s" . ctrlf-toggle-symbol))
 
 (prelude-require-package 'buffer-move)
 (use-package buffer-move
diff --git a/emacs-prelude/personal/personal.el b/emacs-prelude/personal/personal.el
index 514afe3..dd09228 100644
--- a/emacs-prelude/personal/personal.el
+++ b/emacs-prelude/personal/personal.el
@@ -15,9 +15,6 @@
 (require 'init-mac)
 (require 'init-misc)
 
-(setenv "AM_PROFILE" "staging")
-;(setenv "JAVA_HOME" "/usr/local/opt/openjdk@8/")
-
 (global-unset-key (kbd "<left>"))
 (global-unset-key (kbd "<right>"))
 (global-unset-key (kbd "<up>"))