diff --git a/init.el b/init.el index 28fe0e0..9a62a26 100644 --- a/init.el +++ b/init.el @@ -1,12 +1,14 @@ ;; -*- lexical-binding: t -*- (require 'init-better-default) +(require 'init-utils) (require 'init-completion) (require 'init-meow) (require 'init-edit) (require 'init-ui) (require 'init-bindings) + (require 'init-dired) ;; (require 'init-dashboard) diff --git a/lisp/init-bindings.el b/lisp/init-bindings.el index 94de0ba..7811ffe 100644 --- a/lisp/init-bindings.el +++ b/lisp/init-bindings.el @@ -14,7 +14,4 @@ (global-set-key (kbd "s-k") #'kill-current-buffer) (global-set-key (kbd "C-c q r") #'restart-emacs) -(when (eq system-type 'darwin) - (global-set-key (kbd "s-x") #'execute-extended-command)) - (provide 'init-bindings) diff --git a/lisp/init-dired.el b/lisp/init-dired.el index 7ab6f76..5ef1e21 100644 --- a/lisp/init-dired.el +++ b/lisp/init-dired.el @@ -4,6 +4,8 @@ :ensure nil :bind (:map dired-mode-map ("C-c C-p" . wdired-change-to-wdired-mode)) + :bind (:map dired-mode-map + ("b" . dired-up-directory)) :config ;; Always delete and copy recursively (setq dired-recursive-deletes 'always diff --git a/lisp/init-utils.el b/lisp/init-utils.el new file mode 100644 index 0000000..be3f2a6 --- /dev/null +++ b/lisp/init-utils.el @@ -0,0 +1,34 @@ +;; -*- lexical-binding: t; -*- + +(use-package which-key + :diminish + :functions childframe-completion-workable-p + :bind ("C-h M-m" . which-key-show-major-mode) + :hook (elpaca-after-init . which-key-mode) + :init (setq which-key-max-description-length 30 + which-key-lighter nil + which-key-show-remaining-keys t) + :config + (which-key-add-key-based-replacements "C-c n" "org-mode") + (which-key-add-key-based-replacements "C-c l" "llm") + (which-key-add-key-based-replacements "C-c s" "search") + (which-key-add-key-based-replacements "C-c f" "find") + (which-key-add-key-based-replacements "C-c p" "project") + (which-key-add-key-based-replacements "C-c q" "quit") + (which-key-add-key-based-replacements "C-c w" "windows")) + +(use-package grep + :ensure nil + :autoload grep-apply-setting + :init + (when (executable-find "rg") + (grep-apply-setting + 'grep-command "rg --color=auto --null -nH --no-heading -e ") + (grep-apply-setting + 'grep-template "rg --color=auto --null --no-heading -g '!*/' -e ") + (grep-apply-setting + 'grep-find-command '("rg --color=auto --null -nH --no-heading -e ''" . 38)) + (grep-apply-setting + 'grep-find-template "rg --color=auto --null -nH --no-heading -e "))) + +(provide 'init-utils)