1 files changed, 33 insertions, 22 deletions
diff --git a/nix/users/fcuny/configs/emacs/init.el b/nix/users/fcuny/configs/emacs/init.el
index aa38090..d677ae9 100644
--- a/nix/users/fcuny/configs/emacs/init.el
+++ b/nix/users/fcuny/configs/emacs/init.el
@@ -70,6 +70,9 @@
 ;;;; magit, the best git client
 (use-package magit
   :bind ("C-x g" . magit-status)
+  :init
+  (add-to-list 'project-switch-commands
+               '(?v "Magit" magit-project-status))
   :custom
   (magit-diff-refine-hunk t)
   (magit-repository-directories '(("~/workspace" . 1)))
@@ -105,6 +108,36 @@
   (add-to-list 'git-link-remote-alist '("github\\.rblx\\.com" git-link-github))
   (add-to-list 'git-link-commit-remote-alist '("github\\.rblx\\.com" git-link-commit-github)))
 
+;;;; navigate within a project
+(use-package project
+  :bind
+  (("C-x p ." . project-dired)
+   ("C-x p <return>" . project-dired))
+  :custom
+  (project-switch-commands '((?f "Find file" project-find-file)
+                             (?e "Eshell" project-eshell)
+			     (?d "Root dired" project-dired)))
+  (setq project-mode-line t)
+  (setq project-key-prompt-style t)) ; Emacs 30
+
+;;;; find stuff
+(use-package rg
+  :bind
+  (([remap project-find-regexp] . rg-project))
+  :init
+  (add-to-list 'project-switch-commands
+               '(?g "Find regexp" rg-project))
+  :custom
+  (rg-group-result t)
+  (rg-show-columns t)
+  (rg-align-line-number-field-length 3)
+  (rg-align-column-number-field-length 3)
+  (rg-align-line-column-separator "#")
+  (rg-align-position-content-separator "|")
+  (rg-hide-command nil)
+  (rg-align-position-numbers t)
+  (rg-command-line-flags '("--follow")))
+
 (require 'imenu)
 (require 'midnight)
 
@@ -192,28 +225,6 @@
                (set-buffer-modified-p nil)
                (message "File '%s' successfully renamed to '%s'" name (file-name-nondirectory new-name))))))))
 
-
-
-;;; rg
-(require 'rg)
-(setq rg-group-result t
-      rg-show-columns t
-      rg-align-line-number-field-length 3
-      rg-align-column-number-field-length 3
-      rg-align-line-column-separator "#"
-      rg-align-position-content-separator "|"
-      rg-hide-command nil
-      rg-align-position-numbers t
-      rg-command-line-flags '("--follow"))
-
-;;; project
-(require 'project)
-(setq project-mode-line t
-      project-switch-commands '((project-find-file "Find file" f)
-				(project-dired "Dired" d)
-				(project-eshell "Eshell" e)
-				(magit-project-status "Magit" ?m)))
-
 ;;; prog mode related
 (add-hook 'prog-mode-hook 'electric-pair-mode)
 (add-hook 'prog-mode-hook 'flymake-mode)