From 69dcd671bec577795faa17f5991ae1ba975ab0f3 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Mon, 6 Dec 2021 06:02:57 -0600 Subject: [PATCH] making a handful of evil and org changes --- README.org | 28 ++++++++++++++++++---------- init.el | 36 ++++++++++++++---------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/README.org b/README.org index 41660368..3fb8eb42 100644 --- a/README.org +++ b/README.org @@ -169,6 +169,11 @@ Let's make doc-view better #+RESULTS: : 192 +I need to fix evil-org and these seems about good as place as any to fix it. +#+BEGIN_SRC emacs-lisp +(fset 'evil-redirect-digit-argument 'ignore) +#+END_SRC + Also, real quick let's make sure that ~~ works as the same as ~~ #+begin_src emacs-lisp (global-set-key (kbd "") 'keyboard-escape-quit) @@ -909,7 +914,7 @@ It's probably smart to have markdown. *** QML I make some apps in Qt 5 so QML is a needed language although the support in Emacs is lacking. -#+begin_src emacs-lisp +#+begin_src emacs-lisp :tangle no (use-package qml-mode :mode ("\\.qml\\'" . qml-mode) :config @@ -918,11 +923,6 @@ I make some apps in Qt 5 so QML is a needed language although the support in Ema :config (add-to-list 'company-backends 'company-qml) - (setq company-qml-extra-qmltypes-files '("/home/chris/dev/Felgo/Felgo/gcc_64/import/VPlayPlugins/vplayplugins.qmltypes" - "/home/chris/dev/Felgo/Felgo/gcc_64/import/VPlayApps/vplayapps.qmltypes" - "/home/chris/dev/Felgo/Felgo/gcc_64/import/VPlay/vplay.qmltypes" - "/home/chris/dev/Felgo/Felgo/gcc_64/import/Felgo/felgo.qmltypes")) - (setq company-idle-delay 0.1))) (use-package qt-pro-mode @@ -1124,10 +1124,10 @@ Part of this config includes some special capture templates for my work as a you (setq org-capture-templates '(("t" "Personal todo" entry - (file+headline "todo/todo.org" "Inbox") + (file "todo/todo.org") (file ".templates/tasks.org") :prepend t) ("n" "Personal notes" entry - (file+headline "todo/notes.org" "Inbox") + (file "todo/notes.org") "* %u %?\n%i\n%a" :prepend t) ("j" "Journal" entry (file+olp+datetree +org-capture-journal-file) @@ -1290,7 +1290,15 @@ We are also going to make our config auto-tangle. This is so helpful on saving t We also need to add =evil-org= to make better keybindings. #+begin_src emacs-lisp (use-package evil-org - :after org) + :ensure t + :after org + :hook (org-mode . (lambda () evil-org-mode)) + :config + (add-to-list 'evil-digit-bound-motions 'evil-org-beginning-of-line) + (evil-define-key 'motion 'evil-org-mode + (kbd "0") 'evil-org-beginning-of-line) + (require 'evil-org-agenda) + (evil-org-agenda-set-keys)) #+end_src @@ -1393,7 +1401,7 @@ Org-Superstar makes the stars at the beginning of the line in =org-mode= a lot p :after org :config (org-superstar-mode +1) - (setq org-superstar-headline-bullets-list '("\u25c9" "\u25c8" "盛" "\u25ce" "\u272c" "\u25c7" "\u2749" "\u2719" "\u2756")) + (setq org-superstar-headline-bullets-list '("\u25c9" "\u25c8" "" "\u25ce" "\u272c" "\u25c7" "\u2749" "\u2719" "\u2756")) (setq org-superstar-item-bullet-alist '((?- . ?\u25b8) (?+ . ?\u2749) (?* . ?\u25c9))) diff --git a/init.el b/init.el index d100bc35..0c7c3ef2 100644 --- a/init.el +++ b/init.el @@ -70,6 +70,8 @@ (setq doc-view-resolution 192) +(fset 'evil-redirect-digit-argument 'ignore) + (global-set-key (kbd "") 'keyboard-escape-quit) (recentf-mode +1) @@ -520,24 +522,6 @@ vertically." :config (setq markdown-fontify-code-blocks-natively t)) -(use-package qml-mode - :mode ("\\.qml\\'" . qml-mode) - :config - (use-package company-qml - :after qml-mode - :config - (add-to-list 'company-backends 'company-qml) - - (setq company-qml-extra-qmltypes-files '("/home/chris/dev/Felgo/Felgo/gcc_64/import/VPlayPlugins/vplayplugins.qmltypes" - "/home/chris/dev/Felgo/Felgo/gcc_64/import/VPlayApps/vplayapps.qmltypes" - "/home/chris/dev/Felgo/Felgo/gcc_64/import/VPlay/vplay.qmltypes" - "/home/chris/dev/Felgo/Felgo/gcc_64/import/Felgo/felgo.qmltypes")) - - (setq company-idle-delay 0.1))) - -(use-package qt-pro-mode - :after qml-mode) - (use-package csv-mode :mode ("\\.csv\\'" . csv-mode)) @@ -686,10 +670,10 @@ vertically." (setq org-capture-templates '(("t" "Personal todo" entry - (file+headline "todo/todo.org" "Inbox") + (file "todo/todo.org") (file ".templates/tasks.org") :prepend t) ("n" "Personal notes" entry - (file+headline "todo/notes.org" "Inbox") + (file "todo/notes.org") "* %u %?\n%i\n%a" :prepend t) ("j" "Journal" entry (file+olp+datetree +org-capture-journal-file) @@ -842,7 +826,15 @@ vertically." :append :local))) (use-package evil-org - :after org) + :ensure t + :after org + :hook (org-mode . (lambda () evil-org-mode)) + :config + (add-to-list 'evil-digit-bound-motions 'evil-org-beginning-of-line) + (evil-define-key 'motion 'evil-org-mode + (kbd "0") 'evil-org-beginning-of-line) + (require 'evil-org-agenda) + (evil-org-agenda-set-keys)) (use-package org-super-agenda :after org @@ -922,7 +914,7 @@ vertically." :after org :config (org-superstar-mode +1) - (setq org-superstar-headline-bullets-list '("\u25c9" "\u25c8" "盛" "\u25ce" "\u272c" "\u25c7" "\u2749" "\u2719" "\u2756")) + (setq org-superstar-headline-bullets-list '("\u25c9" "\u25c8" "" "\u25ce" "\u272c" "\u25c7" "\u2749" "\u2719" "\u2756")) (setq org-superstar-item-bullet-alist '((?- . ?\u25b8) (?+ . ?\u2749) (?* . ?\u25c9)))