Clean up
This commit is contained in:
Henrik Lissner
parent
6b3c578792
commit
9fbb924592
2 changed files with 82 additions and 97 deletions
|
|
@ -40,7 +40,5 @@
|
||||||
(set-face-background 'git-gutter-fr:added "#448844")
|
(set-face-background 'git-gutter-fr:added "#448844")
|
||||||
))
|
))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
(provide 'init-git)
|
(provide 'init-git)
|
||||||
|
|
|
||||||
183
init/mod-org.el
183
init/mod-org.el
|
|
@ -30,12 +30,93 @@
|
||||||
|
|
||||||
;;
|
;;
|
||||||
(use-package org :ensure t
|
(use-package org :ensure t
|
||||||
:mode (("\\.org\\'" . org-mode)
|
|
||||||
("\\.opml\\'" . org-mode))
|
|
||||||
:config
|
|
||||||
(load-library "ox-opml")
|
|
||||||
:init
|
:init
|
||||||
(progn
|
(progn
|
||||||
|
(define-minor-mode evil-org-mode
|
||||||
|
"Buffer local minor mode for evil-org"
|
||||||
|
:init-value nil
|
||||||
|
:lighter " EvilOrg"
|
||||||
|
:keymap (make-sparse-keymap) ; defines evil-org-mode-map
|
||||||
|
:group 'evil-org)
|
||||||
|
|
||||||
|
;; Reset evil to ensure certain evil keybindings are prioritized
|
||||||
|
;; (add-hook 'org-mode-hook (lambda() (evil-mode nil) (evil-mode 1)))
|
||||||
|
(add-hook 'org-mode-hook 'evil-org-mode)
|
||||||
|
(add-hook 'org-mode-hook 'flyspell-mode)
|
||||||
|
(add-hook 'org-mode-hook 'my/enable-hard-wrap)
|
||||||
|
|
||||||
|
(load-library "ox-opml")
|
||||||
|
|
||||||
|
;; Formatting shortcuts
|
||||||
|
(vmap evil-org-mode-map
|
||||||
|
(kbd "s-b") "s*" ; bold
|
||||||
|
(kbd "s-i") "s/") ; italics
|
||||||
|
(imap evil-org-mode-map
|
||||||
|
(kbd "s-b") (λ (my/org-surround "*")) ; bold
|
||||||
|
(kbd "s-u") (λ (my/org-surround "_")) ; underline
|
||||||
|
(kbd "s-i") (λ (my/org-surround "/")) ; italics
|
||||||
|
(kbd "s-`") (λ (my/org-surround "+")) ; strikethrough
|
||||||
|
|
||||||
|
(kbd "<s-return>") 'org-insert-heading-after-current)
|
||||||
|
|
||||||
|
(nvmap evil-org-mode-map
|
||||||
|
",l" 'org-insert-link)
|
||||||
|
|
||||||
|
(nmap evil-org-mode-map
|
||||||
|
",d" 'org-time-stamp
|
||||||
|
",D" 'org-time-stamp-inactive
|
||||||
|
",s" 'org-schedule
|
||||||
|
",a" 'org-attach
|
||||||
|
",A" 'org-attach-open
|
||||||
|
",t" 'org-todo
|
||||||
|
",T" 'org-show-todo-tree
|
||||||
|
",/" 'org-match-sparse-tree
|
||||||
|
",?" 'org-tags-view
|
||||||
|
",+" 'org-align-all-tags
|
||||||
|
",r" 'org-refile
|
||||||
|
"gh" 'outline-up-heading
|
||||||
|
"gj" 'org-forward-heading-same-level
|
||||||
|
"gk" 'org-backward-heading-same-level
|
||||||
|
"gl" 'outline-next-visible-heading
|
||||||
|
"go" 'org-open-at-point
|
||||||
|
"ga" 'org-agenda
|
||||||
|
"H" 'org-beginning-of-line
|
||||||
|
"L" 'org-end-of-line
|
||||||
|
"$" 'org-end-of-line
|
||||||
|
"^" 'org-beginning-of-line
|
||||||
|
"<" 'org-metaleft
|
||||||
|
">" 'org-metaright
|
||||||
|
"-" 'org-cycle-list-bullet
|
||||||
|
(kbd ", SPC") 'org-archive-subtree
|
||||||
|
(kbd "<s-return>") (λ (org-insert-heading-after-current) (evil-insert-state))
|
||||||
|
(kbd "RET") (λ (org-todo 'done))
|
||||||
|
(kbd "TAB") 'org-cycle)
|
||||||
|
|
||||||
|
;; normal & insert state shortcuts.
|
||||||
|
(mapc (lambda (state)
|
||||||
|
(evil-define-key state evil-org-mode-map
|
||||||
|
(kbd "M--") 'my/org-insert-list-item
|
||||||
|
(kbd "M-l") 'org-metaright
|
||||||
|
(kbd "M-h") 'org-metaleft
|
||||||
|
(kbd "M-k") 'org-metaup
|
||||||
|
(kbd "M-j") 'org-metadown
|
||||||
|
(kbd "M-L") 'org-shiftmetaright
|
||||||
|
(kbd "M-H") 'org-shiftmetaleft
|
||||||
|
(kbd "M-K") 'org-shiftmetaup
|
||||||
|
(kbd "M-J") 'org-shiftmetadown
|
||||||
|
(kbd "<M-return>") '(lambda () (interactive)
|
||||||
|
(my/org-eol-call
|
||||||
|
'(lambda()
|
||||||
|
(org-insert-heading)
|
||||||
|
(org-metaright))))
|
||||||
|
(kbd "M-t") '(lambda () (interactive)
|
||||||
|
(my/org-eol-call
|
||||||
|
'(lambda()
|
||||||
|
(org-insert-todo-heading nil)
|
||||||
|
(org-metaright))))
|
||||||
|
))
|
||||||
|
'(normal insert))
|
||||||
|
|
||||||
(setq org-export-backends '(ascii html latex md opml))
|
(setq org-export-backends '(ascii html latex md opml))
|
||||||
(add-hook 'find-file-hooks 'set-buffer-file-format-to-opml)
|
(add-hook 'find-file-hooks 'set-buffer-file-format-to-opml)
|
||||||
(add-to-list 'auto-mode-alist '("\\.opml$" . org-mode))
|
(add-to-list 'auto-mode-alist '("\\.opml$" . org-mode))
|
||||||
|
|
@ -98,101 +179,7 @@
|
||||||
("tp" tags "+Projects")
|
("tp" tags "+Projects")
|
||||||
("tg" tags-todo "+gamedev")
|
("tg" tags-todo "+gamedev")
|
||||||
("tw" tags-tree "+webdev")))
|
("tw" tags-tree "+webdev")))
|
||||||
|
|
||||||
(define-minor-mode evil-org-mode
|
|
||||||
"Buffer local minor mode for evil-org"
|
|
||||||
:init-value nil
|
|
||||||
:lighter " EvilOrg"
|
|
||||||
:keymap (make-sparse-keymap) ; defines evil-org-mode-map
|
|
||||||
:group 'evil-org)
|
|
||||||
|
|
||||||
;; Keymaps
|
|
||||||
;; (emap org-agenda-mode-map
|
|
||||||
;; ...)
|
|
||||||
|
|
||||||
;; Formatting shortcuts
|
|
||||||
;; Bold
|
|
||||||
(vmap evil-org-mode-map (kbd "s-b") "s*")
|
|
||||||
(imap evil-org-mode-map (kbd "s-b") (λ (my/org-surround "*")))
|
|
||||||
;; Italics
|
|
||||||
(vmap evil-org-mode-map (kbd "s-i") "s/")
|
|
||||||
(imap evil-org-mode-map (kbd "s-i") (λ (my/org-surround "/")))
|
|
||||||
;; Underline
|
|
||||||
(imap evil-org-mode-map (kbd "s-u") (λ (my/org-surround "_")))
|
|
||||||
;; Strikethrough
|
|
||||||
(imap evil-org-mode-map (kbd "s-`") (λ (my/org-surround "+")))
|
|
||||||
|
|
||||||
(imap evil-org-mode-map
|
|
||||||
(kbd "<s-return>") 'org-insert-heading-after-current)
|
|
||||||
|
|
||||||
(nvmap evil-org-mode-map
|
|
||||||
",l" 'org-insert-link)
|
|
||||||
|
|
||||||
;; (vmap evil-org-mode-map
|
|
||||||
;; ",l" 'org-insert-link)
|
|
||||||
|
|
||||||
(nmap evil-org-mode-map
|
|
||||||
",d" 'org-time-stamp
|
|
||||||
",D" 'org-time-stamp-inactive
|
|
||||||
",s" 'org-schedule
|
|
||||||
",a" 'org-attach
|
|
||||||
",A" 'org-attach-open
|
|
||||||
",t" 'org-todo
|
|
||||||
",T" 'org-show-todo-tree
|
|
||||||
",/" 'org-match-sparse-tree
|
|
||||||
",?" 'org-tags-view
|
|
||||||
",+" 'org-align-all-tags
|
|
||||||
",r" 'org-refile
|
|
||||||
"gh" 'outline-up-heading
|
|
||||||
"gj" 'org-forward-heading-same-level
|
|
||||||
"gk" 'org-backward-heading-same-level
|
|
||||||
"gl" 'outline-next-visible-heading
|
|
||||||
"go" 'org-open-at-point
|
|
||||||
"ga" 'org-agenda
|
|
||||||
"H" 'org-beginning-of-line
|
|
||||||
"L" 'org-end-of-line
|
|
||||||
"$" 'org-end-of-line
|
|
||||||
"^" 'org-beginning-of-line
|
|
||||||
"<" 'org-metaleft
|
|
||||||
">" 'org-metaright
|
|
||||||
"-" 'org-cycle-list-bullet
|
|
||||||
(kbd ", SPC") 'org-archive-subtree
|
|
||||||
(kbd "<s-return>") (λ (org-insert-heading-after-current) (evil-insert-state))
|
|
||||||
(kbd "RET") (λ (org-todo 'done))
|
|
||||||
(kbd "TAB") 'org-cycle)
|
|
||||||
|
|
||||||
;; normal & insert state shortcuts.
|
|
||||||
(mapc (lambda (state)
|
|
||||||
(evil-define-key state evil-org-mode-map
|
|
||||||
(kbd "M--") 'my/org-insert-list-item
|
|
||||||
(kbd "M-l") 'org-metaright
|
|
||||||
(kbd "M-h") 'org-metaleft
|
|
||||||
(kbd "M-k") 'org-metaup
|
|
||||||
(kbd "M-j") 'org-metadown
|
|
||||||
(kbd "M-L") 'org-shiftmetaright
|
|
||||||
(kbd "M-H") 'org-shiftmetaleft
|
|
||||||
(kbd "M-K") 'org-shiftmetaup
|
|
||||||
(kbd "M-J") 'org-shiftmetadown
|
|
||||||
(kbd "<M-return>") '(lambda () (interactive)
|
|
||||||
(my/org-eol-call
|
|
||||||
'(lambda()
|
|
||||||
(org-insert-heading)
|
|
||||||
(org-metaright))))
|
|
||||||
(kbd "M-t") '(lambda () (interactive)
|
|
||||||
(my/org-eol-call
|
|
||||||
'(lambda()
|
|
||||||
(org-insert-todo-heading nil)
|
|
||||||
(org-metaright))))
|
|
||||||
))
|
))
|
||||||
'(normal insert))
|
|
||||||
|
|
||||||
;; Reset evil to ensure certain evil keybindings are prioritized
|
|
||||||
(add-hook 'org-mode-hook (lambda() (evil-mode nil) (evil-mode 1)))
|
|
||||||
|
|
||||||
(add-hook 'org-mode-hook 'evil-org-mode)
|
|
||||||
(add-hook 'org-mode-hook 'flyspell-mode)
|
|
||||||
(add-hook 'org-mode-hook 'my/enable-hard-wrap))
|
|
||||||
)
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
(provide 'mod-org)
|
(provide 'mod-org)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue