From e1988f937ae492976d98c40a38cc996496eca3f7 Mon Sep 17 00:00:00 2001 From: Ian Keane Date: Wed, 22 Nov 2023 22:51:40 -0500 Subject: [PATCH] Add evil-org, fix typos and missed binds --- guix/init.org | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/guix/init.org b/guix/init.org index 3249af9..2b2c74f 100644 --- a/guix/init.org +++ b/guix/init.org @@ -11,7 +11,6 @@ To get started, run =C-c C-v t= (org-babel-tangle)))) (add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'dotfiles/org-babel-tangle-config))) - #+end_src #+RESULTS: @@ -23,7 +22,7 @@ To get started, run =C-c C-v t= (use-package pinentry) (use-package pass) (use-package password-store) -(pinentry start) +(pinentry-start) (setq gptel-api-key (password-store-get "self/openai-alt")) #+end_src * AI @@ -524,6 +523,22 @@ I need to move this all over first before I do any organizing to make sure tangl :ensure t :config (evil-mode 1)) + (use-package evil-org + :ensure t + :after org + :hook (org-mode . (lambda () evil-org-mode)) + :config + (require 'evil-org-agenda) + (evil-org-agenda-set-keys)) +#+end_src +* Custom command controls +#+begin_src emacs-lisp +(defun custom/eval-region-or-buffer () + "Eval the region if anything is selected, otherwise eval the whole buffer." + (interactive) + (if mark-active + (eval-region (region-beginning) (region-end)) + (eval-buffer))) #+end_src * Mode-Specific Commands #+begin_src emacs-lisp @@ -615,7 +630,7 @@ I need to move this all over first before I do any organizing to make sure tangl "cC" '(recompile :which-key "Recompile") "cd" '(+lookup/definition :which-key "Goto definition") "cr" '(+lookup/references :which-key "Goto references") - "ce" '(+eval/buffer-or-region :which-key "Eval buffer/region") + "ce" '(custom/eval-region-or-buffer :which-key "Eval buffer/region") ;; "cf" '(NOT A COMMAND (re-do) :which-key "Format buffer/region") "ci" '(+lookup/implementations :which-key "Find implementations") "cj" '(lsp-ivy-workspace-symbol :which-key "Goto symbol (curr. workspace)") @@ -634,7 +649,7 @@ I need to move this all over first before I do any organizing to make sure tangl "f" '(:ignore t :which-key "File") ;; "fp" '(doom/open-private-config :which-key "Browse private config") "fr" '(counsel-recentf :which-key "Recent files") - "fR" '(reload-config :which-key "Recent files") + "fR" '(reload-config :which-key "Reload config") ;; "fm" '(doom/move-this-file :which-key "Move/rename file") ;; "fS" '(doom/sudo-find-file :which-key "Sudo find file") ;; "fs" '(doom/sudo-this-file :which-key "Sudo this file") @@ -694,12 +709,13 @@ I need to move this all over first before I do any organizing to make sure tangl "ha" '(counsel-apropos :which-key "Apropos") "hb" '(counsel-descbinds :which-key "Describe bindings") "he" '(view-echo-area-messages :which-key "View echo area messages") - "hf" '(counsel-describe-function :which-key "Describe function") + "hf" '(helpful-function :which-key "Describe function") "hi" '(info :which-key "Info") "hk" '(helpful-key :which-key "Describe key") "hl" '(view-lossage :which-key "View actions log") "hm" '(describe-mode :which-key "Describe mode") "ho" '(counsel-describe-symbol :which-key "Describe symbol") + "hv" '(helpful-variable :which-key "Describe variable") "hx" '(helpful-command :which-key "Describe command") "hA" '(apropos-documentation :which-key "Apropos(documentation)") "hF" '(counsel-faces :which-key "Describe Face") @@ -829,6 +845,8 @@ I need to move this all over first before I do any organizing to make sure tangl - improve which-key visibility - Fix escape in minibuffer - Open buffers in same window +- Winner undo +- How to format code blocks in org mode ** LSP stuff - look into treemacs integrations